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

package/dist/umd/service-worker.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.0.1-beta.57, Wed Feb 14 2024
+ * Version 4.0.1-beta.58, Tue Feb 20 2024
  *
  * https://dexie.org
  *
@@ -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;
         });
     }
@@ -6260,7 +6266,7 @@
         const syncComplete = new rxjs.Subject();
         dexie.cloud = {
             // @ts-ignore
-            version: "4.0.1-beta.57",
+            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.57";
+    dexieCloud.version = "4.0.1-beta.58";
     Dexie.Cloud = dexieCloud;
 
     // In case the SW lives for a while, let it reuse already opened connections: