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

package/dist/modern/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
  *
@@ -3329,7 +3329,7 @@ function syncWithServer(changes, syncState, baseRevs, db, databaseUrl, schema, c
         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'));
@@ -4287,7 +4287,7 @@ function otpFetchTokenCallback(db) {
                 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',
@@ -4391,11 +4391,16 @@ function login(db, hints) {
         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;
@@ -4407,7 +4412,8 @@ function login(db, hints) {
             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);
         }
@@ -4426,7 +4432,7 @@ function login(db, hints) {
         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;
     });
 }
@@ -5583,7 +5589,7 @@ function LocalSyncWorker(db, cloudOptions, cloudSchema) {
             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);
@@ -6257,7 +6263,7 @@ function dexieCloud(dexie) {
     const syncComplete = new 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() {
@@ -6488,7 +6494,10 @@ function dexieCloud(dexie) {
             // 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();
@@ -6534,7 +6543,7 @@ function dexieCloud(dexie) {
     }
 }
 // @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: