dexie-cloud-addon 4.3.8 → 4.3.9

package/dist/modern/service-worker.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.3.8, Thu Jan 29 2026
+ * Version 4.3.9, Thu Jan 29 2026
  *
  * https://dexie.org
  *
@@ -6068,9 +6068,7 @@ function associate(factory) {
     };
 }
 
-const isOathCallback = typeof location !== 'undefined' && !!(new URL(location.href)).searchParams.get('dxc-auth');
-const getCurrentUserEmitter = associate((db) => new BehaviorSubject(isOathCallback
-    ? Object.assign(Object.assign({}, UNAUTHORIZED_USER), { oauthInProgress: true }) : 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;
@@ -6705,7 +6703,7 @@ function dexieCloud(dexie) {
     const syncComplete = new Subject();
     dexie.cloud = {
         // @ts-ignore
-        version: "4.3.8",
+        version: "4.3.9",
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -6946,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
@@ -6982,7 +6987,6 @@ function dexieCloud(dexie) {
                     });
                     // Clean up URL (remove dxc-auth param)
                     cleanupOAuthUrl();
-                    currentUserEmitter.next(Object.assign(Object.assign({}, currentUserEmitter.value), { oauthInProgress: false }));
                 }
                 catch (uiError) {
                     console.error('[dexie-cloud] Failed to show OAuth error alert:', uiError);
@@ -7092,7 +7096,7 @@ function dexieCloud(dexie) {
     }
 }
 // @ts-ignore
-dexieCloud.version = "4.3.8";
+dexieCloud.version = "4.3.9";
 Dexie.Cloud = dexieCloud;
 
 // In case the SW lives for a while, let it reuse already opened connections: