dexie-cloud-addon 4.3.2 → 4.3.3

package/dist/umd/service-worker.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.3.2, Thu Jan 22 2026
+ * Version 4.3.3, Thu Jan 22 2026
  *
  * https://dexie.org
  *
@@ -2709,6 +2709,21 @@
         });
     }
 
+    /**
+     * Error thrown when initiating an OAuth redirect.
+     *
+     * This is not a real error - it's used to signal that the page is
+     * navigating away to an OAuth provider. It should be caught and
+     * silently ignored at the appropriate level.
+     */
+    class OAuthRedirectError extends Error {
+        constructor(provider) {
+            super(`OAuth redirect initiated for provider: ${provider}`);
+            this.name = 'OAuthRedirectError';
+            this.provider = provider;
+        }
+    }
+
     function loadAccessToken(db) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
@@ -2876,6 +2891,10 @@
                 return context;
             }
             catch (error) {
+                // OAuth redirect is not an error - page is navigating away
+                if (error instanceof OAuthRedirectError || (error === null || error === void 0 ? void 0 : error.name) === 'OAuthRedirectError') {
+                    throw error; // Re-throw without logging
+                }
                 if (error instanceof TokenErrorResponseError) {
                     yield alertUser(userInteraction, error.title, {
                         type: 'error',
@@ -14846,7 +14865,7 @@
                 if (hints === null || hints === void 0 ? void 0 : hints.provider) {
                     initiateOAuthRedirect(db, hints.provider);
                     // This function never returns - page navigates away
-                    throw new Error('OAuth redirect initiated');
+                    throw new OAuthRedirectError(hints.provider);
                 }
                 if ((hints === null || hints === void 0 ? void 0 : hints.grant_type) === 'demo') {
                     const demo_user = yield promptForEmail(userInteraction, 'Enter a demo user email', (hints === null || hints === void 0 ? void 0 : hints.email) || (hints === null || hints === void 0 ? void 0 : hints.userId));
@@ -14881,7 +14900,7 @@
                             // User selected an OAuth provider - initiate redirect
                             initiateOAuthRedirect(db, selection.provider);
                             // This function never returns - page navigates away
-                            throw new Error('OAuth redirect initiated');
+                            throw new OAuthRedirectError(selection.provider);
                         }
                         // User chose OTP - continue with email prompt below
                     }
@@ -15070,7 +15089,15 @@
                 claims: {},
                 lastLogin: new Date(0),
             });
-            yield authenticate(db.cloud.options.databaseUrl, context, db.cloud.options.fetchTokens || otpFetchTokenCallback(db), db.cloud.userInteraction, hints);
+            try {
+                yield authenticate(db.cloud.options.databaseUrl, context, db.cloud.options.fetchTokens || otpFetchTokenCallback(db), db.cloud.userInteraction, hints);
+            }
+            catch (err) {
+                if (err.name === 'OAuthRedirectError') {
+                    return false; // Page is redirecting for OAuth login
+                }
+                throw err;
+            }
             if (origUserId !== UNAUTHORIZED_USER.userId &&
                 context.userId !== origUserId) {
                 // User was logged in before, but now logged in as another user.
@@ -17234,7 +17261,7 @@
                         } }))))))),
             _$1("div", { style: Styles.ButtonsDiv },
                 _$1(k$1, null,
-                    hasFields && submitLabel && (_$1("button", { type: "submit", style: Styles.PrimaryButton, onClick: () => onSubmit(params) }, submitLabel)),
+                    submitLabel && (hasFields || (!hasOptions && !hasFields)) && (_$1("button", { type: "submit", style: Styles.PrimaryButton, onClick: () => onSubmit(params) }, submitLabel)),
                     cancelLabel && (_$1("button", { style: Styles.Button, onClick: onCancel }, cancelLabel))))));
     }
     function valueTransformer(type, value) {
@@ -17916,6 +17943,8 @@
         let configuredProgramatically = false;
         // Pending OAuth auth code from dxc-auth redirect (detected in configure())
         let pendingOAuthCode = null;
+        // Pending OAuth error from dxc-auth redirect (detected in configure())
+        let pendingOAuthError = null;
         // local sync worker - used when there's no service worker.
         let localSyncWorker = null;
         dexie.on('ready', (dexie) => __awaiter(this, void 0, void 0, function* () {
@@ -17945,7 +17974,7 @@
         const syncComplete = new rxjs.Subject();
         dexie.cloud = {
             // @ts-ignore
-            version: "4.3.2",
+            version: "4.3.3",
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -17995,9 +18024,14 @@
                     }
                     catch (error) {
                         // parseOAuthCallback throws OAuthError on error callbacks
-                        // Store null for code but log the error
-                        console.warn('[dexie-cloud] OAuth callback error:', error);
                         cleanupOAuthUrl();
+                        if (error instanceof OAuthError) {
+                            pendingOAuthError = error;
+                            console.error('[dexie-cloud] OAuth callback error:', error.message);
+                        }
+                        else {
+                            console.error('[dexie-cloud] OAuth callback error:', error);
+                        }
                     }
                 }
             },
@@ -18193,7 +18227,20 @@
                 }
                 // HERE: If requireAuth, do athentication now.
                 let changedUser = false;
-                const user = yield db.getCurrentUser();
+                let user = yield db.getCurrentUser();
+                // Show pending OAuth error if present (from dxc-auth redirect)
+                if (pendingOAuthError && !db.cloud.isServiceWorkerDB) {
+                    const error = pendingOAuthError;
+                    pendingOAuthError = null; // Clear pending error
+                    console.debug('[dexie-cloud] Showing OAuth error:', error.message);
+                    // Show alert to user about the OAuth error
+                    yield alertUser(db.cloud.userInteraction, 'Authentication Error', {
+                        type: 'error',
+                        messageCode: 'GENERIC_ERROR',
+                        message: error.message,
+                        messageParams: { provider: error.provider || 'unknown' }
+                    });
+                }
                 // Process pending OAuth callback if present (from dxc-auth redirect)
                 if (pendingOAuthCode && !db.cloud.isServiceWorkerDB) {
                     const { code, provider } = pendingOAuthCode;
@@ -18201,6 +18248,7 @@
                     console.debug('[dexie-cloud] Processing OAuth callback, provider:', provider);
                     try {
                         changedUser = yield login(db, { oauthCode: code, provider });
+                        user = yield db.getCurrentUser();
                     }
                     catch (error) {
                         console.error('[dexie-cloud] OAuth login failed:', error);
@@ -18295,7 +18343,7 @@
         }
     }
     // @ts-ignore
-    dexieCloud.version = "4.3.2";
+    dexieCloud.version = "4.3.3";
     Dexie.Cloud = dexieCloud;
 
     // In case the SW lives for a while, let it reuse already opened connections: