dexie-cloud-addon 4.0.1-beta.56 → 4.0.1-beta.58

package/dist/umd/service-worker.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.0.1-beta.56, Wed Jan 31 2024
+ * Version 4.0.1-beta.58, Tue Feb 20 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'));
@@ -4290,7 +4290,7 @@
                     if (response.type !== 'otp-sent')
                         throw new Error(`Unexpected response from ${url}/token`);
                     const otp = yield promptForOTP(userInteraction, tokenRequest.email);
-                    const tokenRequest2 = Object.assign(Object.assign({}, tokenRequest), { otp: otp || '', 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(tokenRequest2),
                         method: 'post',
@@ -4394,11 +4394,16 @@
             const origUserId = currentUser.userId;
             if (currentUser.isLoggedIn && (!hints || (!hints.email && !hints.userId))) {
                 const licenseStatus = ((_a = currentUser.license) === null || _a === void 0 ? void 0 : _a.status) || 'ok';
-                if (licenseStatus === 'ok' && currentUser.accessToken && (!currentUser.accessTokenExpiration || currentUser.accessTokenExpiration.getTime() > Date.now())) {
+                if (licenseStatus === 'ok' &&
+                    currentUser.accessToken &&
+                    (!currentUser.accessTokenExpiration ||
+                        currentUser.accessTokenExpiration.getTime() > Date.now())) {
                     // Already authenticated according to given hints. And license is valid.
                     return false;
                 }
-                if (currentUser.refreshToken && (!currentUser.refreshTokenExpiration || currentUser.refreshTokenExpiration.getTime() > Date.now())) {
+                if (currentUser.refreshToken &&
+                    (!currentUser.refreshTokenExpiration ||
+                        currentUser.refreshTokenExpiration.getTime() > Date.now())) {
                     // Refresh the token
                     yield loadAccessToken(db);
                     return false;
@@ -4410,7 +4415,8 @@
                 lastLogin: new Date(0),
             });
             yield authenticate(db.cloud.options.databaseUrl, context, db.cloud.options.fetchTokens || otpFetchTokenCallback(db), db.cloud.userInteraction, hints);
-            if (origUserId !== UNAUTHORIZED_USER.userId && context.userId !== origUserId) {
+            if (origUserId !== UNAUTHORIZED_USER.userId &&
+                context.userId !== origUserId) {
                 // User was logged in before, but now logged in as another user.
                 yield logout(db);
             }
@@ -4429,7 +4435,7 @@
             yield setCurrentUser(db, context);
             // Make sure to resync as the new login will be authorized
             // for new realms.
-            triggerSync(db, "pull");
+            triggerSync(db, 'pull');
             return context.userId !== origUserId;
         });
     }
@@ -5586,7 +5592,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);
@@ -6260,7 +6266,7 @@
         const syncComplete = new rxjs.Subject();
         dexie.cloud = {
             // @ts-ignore
-            version: "4.0.1-beta.56",
+            version: "4.0.1-beta.58",
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -6491,7 +6497,10 @@
                 // HERE: If requireAuth, do athentication now.
                 let changedUser = false;
                 if ((_c = db.cloud.options) === null || _c === void 0 ? void 0 : _c.requireAuth) {
-                    changedUser = yield login(db);
+                    const user = yield db.getCurrentUser();
+                    if (!user.isLoggedIn) {
+                        changedUser = yield login(db);
+                    }
                 }
                 if (localSyncWorker)
                     localSyncWorker.stop();
@@ -6537,7 +6546,7 @@
         }
     }
     // @ts-ignore
-    dexieCloud.version = "4.0.1-beta.56";
+    dexieCloud.version = "4.0.1-beta.58";
     Dexie.Cloud = dexieCloud;
 
     // In case the SW lives for a while, let it reuse already opened connections: