bitty-tui 0.0.20 → 0.0.21

package/dist/clients/bw.js

@@ -86,12 +86,13 @@ class Bw {
      * The encryption key will be used to decrypt the user keys.
      */
     async deriveMasterKey(email, password, prelogin) {
+        const normalizedEmail = email.trim().toLowerCase();
         let masterKey;
         if (prelogin.kdf === KdfType.PBKDF2) {
-            masterKey = this.derivePbkdf2(password, email, prelogin.kdfIterations);
+            masterKey = this.derivePbkdf2(password, normalizedEmail, prelogin.kdfIterations);
         }
         else {
-            masterKey = await this.deriveArgon2(password, email, prelogin.kdfIterations, prelogin.kdfMemory, prelogin.kdfParallelism);
+            masterKey = await this.deriveArgon2(password, normalizedEmail, prelogin.kdfIterations, prelogin.kdfMemory, prelogin.kdfParallelism);
         }
         const masterPasswordHashBytes = this.derivePbkdf2(masterKey, password, 1);
         const masterPasswordHash = Buffer.from(masterPasswordHashBytes).toString("base64");
@@ -343,8 +344,9 @@ export class Client {
     }
     setUrls(uri) {
         if (uri.baseUrl) {
-            this.apiUrl = uri.baseUrl + "/api";
-            this.identityUrl = uri.baseUrl + "/identity";
+            const base = uri.baseUrl.replace(/\/+$/, "");
+            this.apiUrl = base + "/api";
+            this.identityUrl = base + "/identity";
         }
         else {
             this.apiUrl = uri.apiUrl;
@@ -437,12 +439,17 @@ export class Client {
             if (!this.refreshToken) {
                 throw new Error("No refresh token available. Please login first.");
             }
+            const bodyParams = new URLSearchParams();
+            bodyParams.append("refresh_token", this.refreshToken);
+            bodyParams.append("grant_type", "refresh_token");
+            bodyParams.append("client_id", "web");
+            bodyParams.append("scope", "api offline_access");
             const identityReq = await fetchApi(`${this.identityUrl}/connect/token`, {
                 method: "POST",
                 headers: {
                     "Content-Type": "application/x-www-form-urlencoded",
                 },
-                body: `refresh_token=${this.refreshToken}&grant_type=refresh_token&client_id=web&scope=api%20offline_access`,
+                body: bodyParams.toString(),
             }).then((r) => r.json());
             this.token = identityReq.access_token;
             this.refreshToken = identityReq.refresh_token;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitty-tui",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "license": "MIT",
   "repository": "https://github.com/mceck/bitty",
   "keywords": [