dexie-cloud-addon 4.3.2 → 4.3.3

package/dist/modern/errors/OAuthRedirectError.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 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.
+ */
+export declare class OAuthRedirectError extends Error {
+    readonly provider: string;
+    constructor(provider: string);
+}

package/dist/modern/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
  *
@@ -1409,6 +1409,21 @@ function promptForProvider(userInteraction_1, providers_1, otpEnabled_1) {
     });
 }
 
+/**
+ * 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;
@@ -1576,6 +1591,10 @@ function userAuthenticate(context, fetchToken, userInteraction, hints) {
             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',
@@ -3878,7 +3897,7 @@ function otpFetchTokenCallback(db) {
             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));
@@ -3913,7 +3932,7 @@ function otpFetchTokenCallback(db) {
                         // 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
                 }
@@ -4102,7 +4121,15 @@ function login(db, hints) {
             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.
@@ -6004,7 +6031,7 @@ function LoginDialog({ title, alerts, fields, options, submitLabel, cancelLabel,
                     } }))))))),
         _$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) {
@@ -6686,6 +6713,8 @@ function dexieCloud(dexie) {
     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* () {
@@ -6715,7 +6744,7 @@ function dexieCloud(dexie) {
     const syncComplete = new Subject();
     dexie.cloud = {
         // @ts-ignore
-        version: "4.3.2",
+        version: "4.3.3",
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -6765,9 +6794,14 @@ function dexieCloud(dexie) {
                 }
                 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);
+                    }
                 }
             }
         },
@@ -6963,7 +6997,20 @@ function dexieCloud(dexie) {
             }
             // 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;
@@ -6971,6 +7018,7 @@ function dexieCloud(dexie) {
                 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);
@@ -7065,7 +7113,7 @@ function dexieCloud(dexie) {
     }
 }
 // @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: