dexie-cloud-addon 4.0.1-beta.55 → 4.0.1-beta.57

package/dist/umd/service-worker.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.0.1-beta.55, Tue Jan 02 2024
+ * Version 4.0.1-beta.57, Wed Feb 14 2024
  *
  * https://dexie.org
  *
@@ -3332,7 +3332,7 @@
             const res = yield fetch(`${databaseUrl}/sync`, {
                 method: 'post',
                 headers,
-                credentials: 'include',
+                credentials: 'include', // For Arr Affinity cookie only, for better Rate-Limit counting only.
                 body: TSON.stringify(syncRequest),
             });
             //const contentLength = Number(res.headers.get('content-length'));
@@ -4241,6 +4241,19 @@
                         demo_user,
                         grant_type: 'demo',
                         scopes: ['ACCESS_DB'],
+                        public_key
+                    };
+                }
+                else if ((hints === null || hints === void 0 ? void 0 : hints.otpId) && hints.otp) {
+                    // User provided OTP ID and OTP code. This means that the OTP email
+                    // has already gone out and the user may have clicked a magic link
+                    // in the email with otp and otpId in query and the app has picked
+                    // up those values and passed them to db.cloud.login().
+                    tokenRequest = {
+                        grant_type: 'otp',
+                        otp_id: hints.otpId,
+                        otp: hints.otp,
+                        scopes: ['ACCESS_DB'],
                         public_key,
                     };
                 }
@@ -4250,7 +4263,6 @@
                         email,
                         grant_type: 'otp',
                         scopes: ['ACCESS_DB'],
-                        public_key,
                     };
                 }
                 const res1 = yield fetch(`${url}/token`, {
@@ -4274,28 +4286,27 @@
                     // Error can also be returned right away.
                     return response;
                 }
-                else if (tokenRequest.grant_type === 'otp') {
+                else if (tokenRequest.grant_type === 'otp' && 'email' in tokenRequest) {
                     if (response.type !== 'otp-sent')
                         throw new Error(`Unexpected response from ${url}/token`);
                     const otp = yield promptForOTP(userInteraction, tokenRequest.email);
-                    tokenRequest.otp = otp || '';
-                    tokenRequest.otp_id = response.otp_id;
+                    const tokenRequest2 = Object.assign(Object.assign({}, tokenRequest), { otp: otp || '', otp_id: response.otp_id, public_key });
                     let res2 = yield fetch(`${url}/token`, {
-                        body: JSON.stringify(tokenRequest),
+                        body: JSON.stringify(tokenRequest2),
                         method: 'post',
                         headers: { 'Content-Type': 'application/json' },
                         mode: 'cors',
                     });
                     while (res2.status === 401) {
                         const errorText = yield res2.text();
-                        tokenRequest.otp = yield promptForOTP(userInteraction, tokenRequest.email, {
+                        tokenRequest2.otp = yield promptForOTP(userInteraction, tokenRequest.email, {
                             type: 'error',
                             messageCode: 'INVALID_OTP',
                             message: errorText,
                             messageParams: {}
                         });
                         res2 = yield fetch(`${url}/token`, {
-                            body: JSON.stringify(tokenRequest),
+                            body: JSON.stringify(tokenRequest2),
                             method: 'post',
                             headers: { 'Content-Type': 'application/json' },
                             mode: 'cors',
@@ -5575,7 +5586,7 @@
                 retryPurpose = null;
                 syncIfPossible(db, cloudOptions, cloudSchema, {
                     cancelToken,
-                    retryImmediatelyOnFetchError: true,
+                    retryImmediatelyOnFetchError: true, // workaround for "net::ERR_NETWORK_CHANGED" in chrome.
                     purpose: combPurpose,
                 }).catch((e) => {
                     console.error('error in syncIfPossible()', e);
@@ -6249,7 +6260,7 @@
         const syncComplete = new rxjs.Subject();
         dexie.cloud = {
             // @ts-ignore
-            version: "4.0.1-beta.55",
+            version: "4.0.1-beta.57",
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -6526,7 +6537,7 @@
         }
     }
     // @ts-ignore
-    dexieCloud.version = "4.0.1-beta.55";
+    dexieCloud.version = "4.0.1-beta.57";
     Dexie.Cloud = dexieCloud;
 
     // In case the SW lives for a while, let it reuse already opened connections: