dexie-cloud-addon 4.3.6 → 4.3.8

package/dist/modern/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
  *
@@ -3841,7 +3841,21 @@ function otpFetchTokenCallback(db) {
             }
             // 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);
             }
@@ -3986,12 +4000,13 @@ function otpFetchTokenCallback(db) {
  * 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
@@ -6053,7 +6068,9 @@ function associate(factory) {
     };
 }
 
-const getCurrentUserEmitter = associate((db) => new BehaviorSubject(UNAUTHORIZED_USER));
+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));
 
 function computeSyncState(db) {
     let _prevStatus = db.cloud.webSocketStatus.value;
@@ -6688,7 +6705,7 @@ function dexieCloud(dexie) {
     const syncComplete = new Subject();
     dexie.cloud = {
         // @ts-ignore
-        version: "4.3.6",
+        version: "4.3.8",
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -6729,8 +6746,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');
@@ -6738,7 +6753,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);
@@ -6966,6 +6980,9 @@ function dexieCloud(dexie) {
                         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);
@@ -6979,6 +6996,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);
@@ -7073,7 +7092,7 @@ function dexieCloud(dexie) {
     }
 }
 // @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: