dexie-cloud-addon 4.0.2 → 4.0.4

package/dist/modern/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
  *
@@ -2537,6 +2537,9 @@ function refreshAccessToken(url, login) {
         if (response.userValidUntil != null) {
             login.license.validUntil = new Date(response.userValidUntil);
         }
+        if (response.data) {
+            login.data = response.data;
+        }
         return login;
     });
 }
@@ -2591,6 +2594,7 @@ function userAuthenticate(context, fetchToken, userInteraction, hints) {
                 type: response2.userType,
                 status: response2.claims.license || 'ok',
             };
+            context.data = response2.data;
             if (response2.evalDaysLeft != null) {
                 context.license.evalDaysLeft = response2.evalDaysLeft;
             }
@@ -3919,6 +3923,7 @@ function MessagesFromServerConsumer(db) {
                                 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
@@ -4422,11 +4427,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;
@@ -4438,7 +4448,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);
         }
@@ -4457,7 +4468,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;
     });
 }
@@ -5467,6 +5478,7 @@ function connectWebSocket(db) {
                         accessTokenExpiration: refreshedLogin.accessTokenExpiration,
                         claims: refreshedLogin.claims,
                         license: refreshedLogin.license,
+                        data: refreshedLogin.data
                     });
                 })), switchMap(() => createObservable()));
             }
@@ -6293,7 +6305,7 @@ function dexieCloud(dexie) {
     const syncComplete = new Subject();
     dexie.cloud = {
         // @ts-ignore
-        version: "4.0.2",
+        version: "4.0.4",
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -6524,7 +6536,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();
@@ -6570,7 +6585,7 @@ function dexieCloud(dexie) {
     }
 }
 // @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: