dexie-cloud-addon 4.0.2 → 4.0.4

package/dist/umd/service-worker.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.0.2, Wed Apr 10 2024
+ * Version 4.0.4, Mon Apr 29 2024
  *
  * https://dexie.org
  *
@@ -2540,6 +2540,9 @@
             if (response.userValidUntil != null) {
                 login.license.validUntil = new Date(response.userValidUntil);
             }
+            if (response.data) {
+                login.data = response.data;
+            }
             return login;
         });
     }
@@ -2594,6 +2597,7 @@
                     type: response2.userType,
                     status: response2.claims.license || 'ok',
                 };
+                context.data = response2.data;
                 if (response2.evalDaysLeft != null) {
                     context.license.evalDaysLeft = response2.evalDaysLeft;
                 }
@@ -3922,6 +3926,7 @@
                                     accessTokenExpiration: refreshedLogin.accessTokenExpiration,
                                     claims: refreshedLogin.claims,
                                     license: refreshedLogin.license,
+                                    data: refreshedLogin.data,
                                 });
                                 // Updating $logins will trigger emission of db.cloud.currentUser observable, which
                                 // in turn will lead to that connectWebSocket.ts will reconnect the socket with the
@@ -4425,11 +4430,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;
@@ -4441,7 +4451,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);
             }
@@ -4460,7 +4471,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;
         });
     }
@@ -5470,6 +5481,7 @@
                             accessTokenExpiration: refreshedLogin.accessTokenExpiration,
                             claims: refreshedLogin.claims,
                             license: refreshedLogin.license,
+                            data: refreshedLogin.data
                         });
                     })), switchMap(() => createObservable()));
                 }
@@ -6296,7 +6308,7 @@
         const syncComplete = new rxjs.Subject();
         dexie.cloud = {
             // @ts-ignore
-            version: "4.0.2",
+            version: "4.0.4",
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -6527,7 +6539,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();
@@ -6573,7 +6588,7 @@
         }
     }
     // @ts-ignore
-    dexieCloud.version = "4.0.2";
+    dexieCloud.version = "4.0.4";
     Dexie.Cloud = dexieCloud;
 
     // In case the SW lives for a while, let it reuse already opened connections: