@passkeyme/auth 2.0.11 → 2.0.13

package/dist/index.js

@@ -1052,6 +1052,25 @@ class PasskeymeAuth {
             });
         }
     }
+    /**
+     * Internal helper: Redirect to login in hosted mode, or throw error in direct mode
+     */
+    redirectOrThrow(userMessage, technicalMessage) {
+        if (this.config.mode === "hosted") {
+            this.redirectToLogin();
+            return { method: "redirect" };
+        }
+        else {
+            throw new PasskeymeError({
+                code: exports.PasskeymeErrorCode.PASSKEY_NOT_SUPPORTED,
+                message: technicalMessage,
+                userMessage: userMessage,
+                recoverable: true,
+                retryable: false,
+                suggestedAction: "Use OAuth sign-in instead",
+            });
+        }
+    }
     /**
      * Handle authentication callback from hosted auth page
      */
@@ -1433,6 +1452,19 @@ class PasskeymeAuth {
             }
             // Extract token and user info from response
             const { token, user_uuid, success, message } = completeResponse.data;
+            // Decode JWT to extract email and other user info
+            let tokenEmail;
+            try {
+                const tokenParts = token.split(".");
+                if (tokenParts.length === 3) {
+                    const payload = JSON.parse(atob(tokenParts[1]));
+                    tokenEmail = payload.email;
+                    logger.debug("Extracted email from JWT:", tokenEmail);
+                }
+            }
+            catch (decodeError) {
+                logger.debug("Failed to decode JWT token:", decodeError);
+            }
             // Store tokens - use the JWT token as access token
             const tokens = {
                 accessToken: token,
@@ -1441,11 +1473,13 @@ class PasskeymeAuth {
             };
             await this.tokenStorage.setTokens(tokens);
             // Create user object with available information
+            // Prefer email from JWT token, fallback to username
+            const userEmail = tokenEmail || username;
             const user = {
                 id: user_uuid,
                 uuid: user_uuid,
                 username: username,
-                email: username, // Assume username is email for now
+                email: userEmail,
                 authenticated: true,
             };
             // Update state
@@ -1503,7 +1537,7 @@ class PasskeymeAuth {
      * 1. Check app config for discoverable credentials support
      * 2. If supported: attempt discoverable credentials first (no username)
      * 3. If not supported or fails: use stored username or prompt for username
-     * 4. Fallback to hosted auth if all passkey attempts fail
+     * 4. Fallback to hosted auth if all passkey attempts fail (unless mode is 'direct')
      */
     async smartLogin(username, apiKey) {
         logger.debug("[DEBUG] smartLogin called with:", {
@@ -1518,8 +1552,9 @@ class PasskeymeAuth {
         logger.debug("[DEBUG] Passkey support check:", isSupported);
         if (!isSupported || !effectiveApiKey) {
             logger.debug("Conditions not met, redirecting to hosted auth. isSupported:", isSupported, "hasApiKey:", !!effectiveApiKey);
-            this.redirectToLogin();
-            return { method: "redirect" };
+            return this.redirectOrThrow(isSupported
+                ? "API key is required for passkey authentication."
+                : "Your device doesn't support passkeys.", "Passkey authentication not available");
         }
         try {
             // Get app configuration to check discoverable credentials support
@@ -1542,8 +1577,7 @@ class PasskeymeAuth {
             // If passkeys are disabled at the app level, fallback to hosted auth
             if (!appConfig.passkeyEnabled) {
                 logger.debug("Passkeys disabled for this app, falling back to hosted auth");
-                this.redirectToLogin();
-                return { method: "redirect" };
+                return this.redirectOrThrow("Passkey authentication is not available for this app.", "Passkeys are disabled for this application");
             }
             let authUsername = username;
             // Smart username resolution following industry best practices
@@ -1565,15 +1599,13 @@ class PasskeymeAuth {
                 const storageKey = `last_username_${this.config.appId}`;
                 logger.debug("Looking for stored username with key:", storageKey);
                 const storedUsername = await this.storage.getItem(storageKey);
-                logger.debug("Found stored username:", storedUsername);
                 if (storedUsername) {
                     logger.debug("Using stored username for targeted authentication:", storedUsername);
                     authUsername = storedUsername;
                 }
                 else {
                     logger.debug("No username available and discoverable auth failed/unsupported, falling back to hosted auth");
-                    this.redirectToLogin();
-                    return { method: "redirect" };
+                    return this.redirectOrThrow("Unable to authenticate with passkey. Please sign in with another method.", "No username available for passkey authentication");
                 }
             }
             // Attempt passkey authentication with username
@@ -1592,9 +1624,15 @@ class PasskeymeAuth {
             if (this.config.debug) {
                 logger.error("[PasskeymeAuth] Passkey authentication error details:", error);
             }
-            // Fallback to hosted auth for any passkey failures
-            this.redirectToLogin();
-            return { method: "redirect" };
+            // Fallback to hosted auth for any passkey failures (unless mode is 'direct')
+            // In direct mode, re-throw the original error for the caller to handle
+            if (this.config.mode === "hosted") {
+                this.redirectToLogin();
+                return { method: "redirect" };
+            }
+            else {
+                throw error;
+            }
         }
     }
     /**