dexie-cloud-addon 4.3.6 → 4.3.8

package/dist/umd/service-worker.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.3.6, Wed Jan 28 2026
+ * Version 4.3.8, Thu Jan 29 2026
  *
  * https://dexie.org
  *
@@ -13207,7 +13207,7 @@
      *
      * ==========================================================================
      *
-     * Version 4.2.2, Wed Jan 28 2026
+     * Version 4.2.2, Thu Jan 29 2026
      *
      * https://dexie.org
      *
@@ -14809,7 +14809,21 @@
                 }
                 // Handle OAuth provider login via redirect
                 if (hints === null || hints === void 0 ? void 0 : hints.provider) {
-                    initiateOAuthRedirect(db, hints.provider);
+                    let resolvedRedirectUri = undefined;
+                    if (hints.redirectPath) {
+                        // If redirectPath is absolute, use as is. If relative, resolve against current location
+                        if (/^https?:\/\//i.test(hints.redirectPath)) {
+                            resolvedRedirectUri = hints.redirectPath;
+                        }
+                        else if (typeof window !== 'undefined' && window.location) {
+                            // Use URL constructor to resolve relative path
+                            resolvedRedirectUri = new URL(hints.redirectPath, window.location.href).toString();
+                        }
+                        else if (typeof location !== 'undefined' && location.href) {
+                            resolvedRedirectUri = new URL(hints.redirectPath, location.href).toString();
+                        }
+                    }
+                    initiateOAuthRedirect(db, hints.provider, resolvedRedirectUri);
                     // This function never returns - page navigates away
                     throw new OAuthRedirectError(hints.provider);
                 }
@@ -14954,12 +14968,13 @@
      * the user is redirected back with a dxc-auth query parameter that is
      * automatically detected by db.cloud.configure().
      */
-    function initiateOAuthRedirect(db, provider) {
+    function initiateOAuthRedirect(db, provider, redirectUriOverride) {
         var _a, _b;
         const url = (_a = db.cloud.options) === null || _a === void 0 ? void 0 : _a.databaseUrl;
         if (!url)
             throw new Error(`No database URL given.`);
-        const redirectUri = ((_b = db.cloud.options) === null || _b === void 0 ? void 0 : _b.oauthRedirectUri) ||
+        const redirectUri = redirectUriOverride ||
+            ((_b = db.cloud.options) === null || _b === void 0 ? void 0 : _b.oauthRedirectUri) ||
             (typeof location !== 'undefined' ? location.href : undefined);
         // CodeRabbit suggested to fail fast here, but the only situation where
         // redirectUri would be undefined is in non-browser environments, and
@@ -17283,7 +17298,9 @@
         };
     }
 
-    const getCurrentUserEmitter = associate((db) => new rxjs.BehaviorSubject(UNAUTHORIZED_USER));
+    const isOathCallback = typeof location !== 'undefined' && !!(new URL(location.href)).searchParams.get('dxc-auth');
+    const getCurrentUserEmitter = associate((db) => new rxjs.BehaviorSubject(isOathCallback
+        ? Object.assign(Object.assign({}, UNAUTHORIZED_USER), { oauthInProgress: true }) : UNAUTHORIZED_USER));
 
     function computeSyncState(db) {
         let _prevStatus = db.cloud.webSocketStatus.value;
@@ -17918,7 +17935,7 @@
         const syncComplete = new rxjs.Subject();
         dexie.cloud = {
             // @ts-ignore
-            version: "4.3.6",
+            version: "4.3.8",
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -17959,8 +17976,6 @@
                     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');
@@ -17968,7 +17983,6 @@
                     }
                     catch (error) {
                         // parseOAuthCallback throws OAuthError on error callbacks
-                        cleanupOAuthUrl();
                         if (error instanceof OAuthError) {
                             pendingOAuthError = error;
                             console.error('[dexie-cloud] OAuth callback error:', error.message);
@@ -18196,6 +18210,9 @@
                             message: error.message,
                             messageParams: { provider: error.provider || 'unknown' }
                         });
+                        // 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);
@@ -18209,6 +18226,8 @@
                     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);
@@ -18303,7 +18322,7 @@
         }
     }
     // @ts-ignore
-    dexieCloud.version = "4.3.6";
+    dexieCloud.version = "4.3.8";
     Dexie.Cloud = dexieCloud;
 
     // In case the SW lives for a while, let it reuse already opened connections: