dexie-cloud-addon 4.3.7 → 4.3.9

package/dist/modern/service-worker.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.3.7, Wed Jan 28 2026
+ * Version 4.3.9, Thu Jan 29 2026
  *
  * https://dexie.org
  *
@@ -6068,7 +6068,7 @@ function associate(factory) {
     };
 }
 
-const getCurrentUserEmitter = associate((db) => new BehaviorSubject(UNAUTHORIZED_USER));
+const getCurrentUserEmitter = associate((db) => new BehaviorSubject(Object.assign(Object.assign({}, UNAUTHORIZED_USER), { isLoading: true })));
 
 function computeSyncState(db) {
     let _prevStatus = db.cloud.webSocketStatus.value;
@@ -6703,7 +6703,7 @@ function dexieCloud(dexie) {
     const syncComplete = new Subject();
     dexie.cloud = {
         // @ts-ignore
-        version: "4.3.7",
+        version: "4.3.9",
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -6744,8 +6744,6 @@ function dexieCloud(dexie) {
                 try {
                     const callback = parseOAuthCallback();
                     if (callback) {
-                        // Clean up URL immediately (remove dxc-auth param)
-                        cleanupOAuthUrl();
                         // Store the pending auth code for processing when db is ready
                         pendingOAuthCode = { code: callback.code, provider: callback.provider };
                         console.debug('[dexie-cloud] OAuth callback detected, auth code stored for processing');
@@ -6753,7 +6751,6 @@ function dexieCloud(dexie) {
                 }
                 catch (error) {
                     // parseOAuthCallback throws OAuthError on error callbacks
-                    cleanupOAuthUrl();
                     if (error instanceof OAuthError) {
                         pendingOAuthError = error;
                         console.error('[dexie-cloud] OAuth callback error:', error.message);
@@ -6947,7 +6944,14 @@ function dexieCloud(dexie) {
             // Manage CurrentUser observable:
             throwIfClosed();
             if (!db.cloud.isServiceWorkerDB) {
-                subscriptions.push(liveQuery(() => db.getCurrentUser()).subscribe(currentUserEmitter));
+                subscriptions.push(liveQuery(() => db.getCurrentUser().then(user => {
+                    if (!user.isLoggedIn && typeof location !== 'undefined' && /dxc-auth\=/.test(location.search)) {
+                        // Still loading user because OAuth redirect just happened.
+                        // Keep isLoading true.
+                        return Object.assign(Object.assign({}, user), { isLoading: true });
+                    }
+                    return user;
+                })).subscribe(currentUserEmitter));
                 // Manage PersistendSyncState observable:
                 subscriptions.push(liveQuery(() => db.getPersistedSyncState()).subscribe(db.cloud.persistedSyncState));
                 // Wait till currentUser and persistedSyncState gets populated
@@ -6981,6 +6985,8 @@ function dexieCloud(dexie) {
                         message: error.message,
                         messageParams: { provider: error.provider || 'unknown' }
                     });
+                    // Clean up URL (remove dxc-auth param)
+                    cleanupOAuthUrl();
                 }
                 catch (uiError) {
                     console.error('[dexie-cloud] Failed to show OAuth error alert:', uiError);
@@ -6994,6 +7000,8 @@ function dexieCloud(dexie) {
                 try {
                     changedUser = yield login(db, { oauthCode: code, provider });
                     user = yield db.getCurrentUser();
+                    // Clean up URL (remove dxc-auth param)
+                    cleanupOAuthUrl();
                 }
                 catch (error) {
                     console.error('[dexie-cloud] OAuth login failed:', error);
@@ -7088,7 +7096,7 @@ function dexieCloud(dexie) {
     }
 }
 // @ts-ignore
-dexieCloud.version = "4.3.7";
+dexieCloud.version = "4.3.9";
 Dexie.Cloud = dexieCloud;
 
 // In case the SW lives for a while, let it reuse already opened connections: