@proveanything/smartlinks-auth-ui 0.4.5 → 0.4.6

package/dist/index.js

@@ -12541,7 +12541,7 @@ function requiresEmailVerification(error) {
 }
 
 // VERSION: Update this when making changes to help identify which version is running
-const AUTH_UI_VERSION = '44';
+const AUTH_UI_VERSION = '45';
 const LOG_PREFIX = `[SmartlinksAuthUI:v${AUTH_UI_VERSION}]`;
 // Helper to check for URL auth params synchronously (runs during initialization)
 // This prevents the form from flashing before detecting deep-link flows
@@ -12656,6 +12656,43 @@ const getNativeBridge = () => {
         return native;
     return null;
 };
+// Helper to register an AuthKit.onAuthResult handler for a specific callbackId
+// The Android native app calls: window.AuthKit.onAuthResult(resultJson)
+const registerAuthKitCallback = (callbackId, onResult, timeoutMs = 5000, onTimeout) => {
+    const bridge = window.AuthKit;
+    if (!bridge) {
+        console.warn('[AuthKit] No AuthKit bridge found, cannot register callback');
+        onTimeout?.();
+        return () => { };
+    }
+    // Store the previous handler so we can restore on cleanup
+    const previousHandler = bridge.onAuthResult;
+    const timeout = setTimeout(() => {
+        // Restore previous handler on timeout
+        bridge.onAuthResult = previousHandler;
+        onTimeout?.();
+    }, timeoutMs);
+    bridge.onAuthResult = (resultOrJson) => {
+        const result = typeof resultOrJson === 'string' ? JSON.parse(resultOrJson) : resultOrJson;
+        // Match by callbackId if present, otherwise accept any result
+        if (result.callbackId && result.callbackId !== callbackId) {
+            // Not for us — pass through to previous handler if any
+            if (typeof previousHandler === 'function') {
+                previousHandler(resultOrJson);
+            }
+            return;
+        }
+        clearTimeout(timeout);
+        // Restore previous handler
+        bridge.onAuthResult = previousHandler;
+        onResult(result);
+    };
+    // Return cleanup function
+    return () => {
+        clearTimeout(timeout);
+        bridge.onAuthResult = previousHandler;
+    };
+};
 // Sign out from Google on the native side (clears cached Google account)
 // This is fire-and-forget with a timeout - gracefully degrades if not supported
 const signOutGoogleNative = async () => {
@@ -12664,21 +12701,7 @@ const signOutGoogleNative = async () => {
         return;
     const callbackId = `google_signout_${Date.now()}`;
     return new Promise((resolve) => {
-        const timeout = setTimeout(() => resolve(), 3000);
-        // Store original callback to restore later
-        const originalCallback = window.smartlinksNativeCallback;
-        window.smartlinksNativeCallback = (result) => {
-            if (result.callbackId === callbackId) {
-                clearTimeout(timeout);
-                // Restore original callback
-                window.smartlinksNativeCallback = originalCallback;
-                resolve();
-            }
-            else if (originalCallback) {
-                // Pass through to original callback for other messages
-                originalCallback(result);
-            }
-        };
+        registerAuthKitCallback(callbackId, () => resolve(), 3000, () => resolve());
         const payload = JSON.stringify({
             type: 'GOOGLE_SIGN_OUT',
             callbackId,
@@ -12692,37 +12715,25 @@ const checkSilentGoogleSignIn = async (clientId, googleClientId) => {
         return null;
     const callbackId = `google_check_${Date.now()}`;
     return new Promise((resolve) => {
-        const timeout = setTimeout(() => resolve(null), 5000);
-        // Store original callback to restore later
-        const originalCallback = window.smartlinksNativeCallback;
-        window.smartlinksNativeCallback = (result) => {
-            if (result.callbackId === callbackId) {
-                clearTimeout(timeout);
-                // Restore original callback
-                window.smartlinksNativeCallback = originalCallback;
-                if (result.success) {
-                    resolve({
-                        isSignedIn: result.isSignedIn || false,
-                        idToken: result.idToken,
-                        email: result.email,
-                        name: result.name,
-                        picture: result.picture,
-                    });
-                }
-                else {
-                    resolve(null);
-                }
+        registerAuthKitCallback(callbackId, (result) => {
+            if (result.success) {
+                resolve({
+                    isSignedIn: result.isSignedIn || false,
+                    idToken: result.idToken,
+                    email: result.email,
+                    name: result.name,
+                    picture: result.picture,
+                });
             }
-            else if (originalCallback) {
-                // Pass through to original callback for other messages
-                originalCallback(result);
+            else {
+                resolve(null);
             }
-        };
+        }, 5000, () => resolve(null));
         const payload = JSON.stringify({
             type: 'GOOGLE_CHECK_SIGN_IN',
             clientId,
             googleClientId,
-            serverClientId: googleClientId, // Alias for Android SDK
+            serverClientId: googleClientId,
             callbackId,
         });
         nativeBridge.checkGoogleSignIn(payload);
@@ -12766,6 +12777,7 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
     const [contactSchema, setContactSchema] = React.useState(null); // Schema for registration fields
     const [silentSignInChecked, setSilentSignInChecked] = React.useState(false); // Track if silent sign-in has been checked
     const [googleFallbackToPopup, setGoogleFallbackToPopup] = React.useState(false); // Show popup fallback when FedCM is blocked/dismissed
+    const [googleNativeTimedOut, setGoogleNativeTimedOut] = React.useState(false); // Native bridge callback timed out
     const log = React.useMemo(() => createLoggerWrapper(logger), [logger]);
     const api = new AuthAPI(apiEndpoint, clientId, clientName, logger);
     const auth = useAuth();
@@ -13042,6 +13054,7 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
             if (urlMode === 'verifyEmail') {
                 log.log('Verifying email with token:', token);
                 const response = await api.verifyEmailWithToken(token);
+                log.log('Email verification response:', { hasToken: !!response.token, hasUser: !!response.user, emailVerificationMode: response.emailVerificationMode, isNewUser: response.isNewUser });
                 // Get email verification mode from response or config
                 const verificationMode = response.emailVerificationMode || config?.emailVerification?.mode || 'verify-auto-login';
                 if ((verificationMode === 'verify-auto-login' || verificationMode === 'immediate') && response.token) {
@@ -13086,6 +13099,7 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
                 log.log('Verifying reset token:', token);
                 // Verify token is valid, then show password reset form
                 const verifyResult = await api.verifyResetToken(token);
+                log.log('Reset token verification result:', { valid: verifyResult.valid, hasEmail: !!verifyResult.email, message: verifyResult.message });
                 // Check if token is valid before proceeding
                 if (!verifyResult.valid) {
                     throw new Error(verifyResult.message || 'Invalid or expired token');
@@ -13103,6 +13117,7 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
             else if (urlMode === 'magicLink') {
                 log.log('Verifying magic link token:', token);
                 const response = await api.verifyMagicLink(token);
+                log.log('Magic link verification response:', { hasToken: !!response.token, hasUser: !!response.user, isNewUser: response.isNewUser });
                 // Auto-login with magic link if token is provided
                 if (response.token) {
                     // Always await - auth.login now waits for parent ack automatically in iframe mode
@@ -13178,6 +13193,7 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
             const redirectUri = state.redirectUri || window.location.origin + window.location.pathname;
             // Exchange authorization code for tokens
             const response = await api.loginWithGoogleCode(code, redirectUri);
+            log.log('Google OAuth code exchange response:', { hasToken: !!response.token, hasUser: !!response.user, isNewUser: response.isNewUser });
             if (response.token) {
                 // Await login to ensure token is persisted before any navigation
                 await auth.login(response.token, response.user, response.accountData, response.isNewUser, getExpirationFromResponse(response));
@@ -13208,13 +13224,15 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
         setError(undefined);
         setAuthSuccess(false);
         try {
+            log.log('Submitting email auth:', { mode, email: data.email });
             const response = mode === 'login'
                 ? await api.login(data.email, data.password)
                 : await api.register({
                     ...data,
                     accountData: mode === 'register' ? accountData : undefined,
-                    redirectUrl: getRedirectUrl(), // Include redirect URL for email verification
+                    redirectUrl: getRedirectUrl(),
                 });
+            log.log('Email auth response:', { mode, hasToken: !!response?.token, hasUser: !!response?.user, isNewUser: response?.isNewUser, requiresEmailVerification: response?.requiresEmailVerification, accountLocked: response?.accountLocked, emailVerificationMode: response?.emailVerificationMode });
             // Defensive check: validate response before accessing properties
             // SDK should throw on 401/error responses, but handle edge cases gracefully
             if (!response) {
@@ -13427,21 +13445,20 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
             if (nativeBridge) {
                 log.log('Using native bridge for Google Sign-In');
                 const callbackId = `google_auth_${Date.now()}`;
-                window.smartlinksNativeCallback = async (result) => {
-                    // Ignore stale callbacks
-                    if (result.callbackId !== callbackId) {
-                        log.log('Ignoring stale native callback:', result.callbackId);
-                        return;
-                    }
-                    log.log('Native callback received:', {
+                // Register callback via AuthKit.onAuthResult (the native app calls this)
+                const cleanup = registerAuthKitCallback(callbackId, async (result) => {
+                    log.log('Native Google auth result received:', {
                         success: result.success,
                         hasIdToken: !!result.idToken,
                         email: result.email,
                         error: result.error,
+                        callbackId: result.callbackId,
                     });
+                    setGoogleNativeTimedOut(false);
                     try {
                         if (result.success && result.idToken) {
                             const authResponse = await api.loginWithGoogle(result.idToken);
+                            log.log('Native Google login response:', { hasToken: !!authResponse.token, hasUser: !!authResponse.user, isNewUser: authResponse.isNewUser });
                             if (authResponse.token) {
                                 await auth.login(authResponse.token, authResponse.user, authResponse.accountData, authResponse.isNewUser, getExpirationFromResponse(authResponse));
                                 setAuthSuccess(true);
@@ -13464,7 +13481,12 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
                     finally {
                         setLoading(false);
                     }
-                };
+                }, 30000, // 30s timeout for interactive Google Sign-In
+                () => {
+                    log.log('Native Google Sign-In timed out after 30s');
+                    setLoading(false);
+                    setGoogleNativeTimedOut(true);
+                });
                 const payloadObj = {
                     type: 'GOOGLE_SIGN_IN',
                     clientId,
@@ -13476,12 +13498,13 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
                     requestServerAuthCode: false,
                 };
                 const payload = JSON.stringify(payloadObj);
-                log.log('Invoking native signInWithGoogle');
+                log.log('Invoking native signInWithGoogle with callbackId:', callbackId);
                 try {
                     nativeBridge.signInWithGoogle(payload);
                 }
                 catch (invokeError) {
                     console.error(`${LOG_PREFIX} Exception invoking signInWithGoogle:`, invokeError);
+                    cleanup(); // Clean up the callback registration
                     throw invokeError;
                 }
                 // Don't set loading to false - waiting for native callback
@@ -13526,6 +13549,7 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
                     clearInterval(checkClosed);
                     try {
                         if (event.data.success && event.data.token) {
+                            log.log('Google proxy result received:', { success: true, hasUser: !!event.data.user, isNewUser: event.data.isNewUser });
                             const { token, user, accountData, isNewUser, expiresAt, expiresIn } = event.data;
                             const expiration = expiresAt || (expiresIn ? Date.now() + expiresIn : undefined);
                             await auth.login(token, user, accountData, isNewUser, expiration);
@@ -13653,6 +13677,7 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
                                     googleUserInfo: userInfo,
                                     tokenType: 'access_token',
                                 });
+                                log.log('Popup Google login response:', { hasToken: !!authResponse.token, hasUser: !!authResponse.user, isNewUser: authResponse.isNewUser });
                                 if (authResponse.token) {
                                     // Google OAuth can be login or signup - use isNewUser flag from backend if available
                                     await auth.login(authResponse.token, authResponse.user, authResponse.accountData, authResponse.isNewUser, getExpirationFromResponse(authResponse));
@@ -13698,6 +13723,7 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
                         try {
                             const idToken = response.credential;
                             const authResponse = await api.loginWithGoogle(idToken);
+                            log.log('OneTap Google login response:', { hasToken: !!authResponse.token, hasUser: !!authResponse.user, isNewUser: authResponse.isNewUser });
                             if (authResponse.token) {
                                 // Google OAuth can be login or signup - use isNewUser flag from backend if available
                                 await auth.login(authResponse.token, authResponse.user, authResponse.accountData, authResponse.isNewUser, getExpirationFromResponse(authResponse));
@@ -13764,6 +13790,7 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
             else {
                 // Verify code - Twilio identifies the verification by phone number
                 const response = await api.verifyPhoneCode(phoneNumber, verificationCode);
+                log.log('Phone verification response:', { hasToken: !!response?.token, hasUser: !!response?.user, isNewUser: response?.isNewUser });
                 // Defensive validation: API may return undefined or error object on failure
                 if (!response) {
                     throw new Error('Verification failed - please check your code and try again');
@@ -14098,7 +14125,40 @@ const SmartlinksAuthUI = ({ apiEndpoint, clientId, clientName, accountData, onAu
                                     backgroundColor: 'transparent',
                                     border: 'none',
                                     cursor: 'pointer',
-                                }, children: "Dismiss" })] })), (() => {
+                                }, children: "Dismiss" })] })), googleNativeTimedOut && (jsxRuntime.jsxs("div", { style: {
+                            marginBottom: '1rem',
+                            padding: '0.75rem 1rem',
+                            borderRadius: '0.5rem',
+                            backgroundColor: resolvedTheme === 'dark' ? 'rgba(245, 158, 11, 0.1)' : 'rgba(245, 158, 11, 0.05)',
+                            border: `1px solid ${resolvedTheme === 'dark' ? 'rgba(245, 158, 11, 0.3)' : 'rgba(245, 158, 11, 0.2)'}`,
+                        }, children: [jsxRuntime.jsx("p", { style: {
+                                    fontSize: '0.8125rem',
+                                    color: resolvedTheme === 'dark' ? '#fbbf24' : '#92400e',
+                                    marginBottom: '0.5rem',
+                                    lineHeight: 1.4,
+                                }, children: 'Google sign-in didn\'t respond. You can try again or use another sign-in method.' }), jsxRuntime.jsx("button", { onClick: () => {
+                                    setGoogleNativeTimedOut(false);
+                                    handleGoogleLogin();
+                                }, style: {
+                                    width: '100%',
+                                    padding: '0.5rem 1rem',
+                                    fontSize: '0.875rem',
+                                    fontWeight: 500,
+                                    color: '#fff',
+                                    backgroundColor: '#4285F4',
+                                    border: 'none',
+                                    borderRadius: '0.375rem',
+                                    cursor: 'pointer',
+                                }, children: 'Retry Google Sign-In' }), jsxRuntime.jsx("button", { onClick: () => setGoogleNativeTimedOut(false), style: {
+                                    marginTop: '0.375rem',
+                                    width: '100%',
+                                    padding: '0.25rem',
+                                    fontSize: '0.75rem',
+                                    color: resolvedTheme === 'dark' ? '#64748b' : '#9ca3af',
+                                    backgroundColor: 'transparent',
+                                    border: 'none',
+                                    cursor: 'pointer',
+                                }, children: 'Dismiss' })] })), (() => {
                         const emailDisplayMode = config?.emailDisplayMode || 'form';
                         const providerOrder = config?.providerOrder || (config?.enabledProviders || enabledProviders);
                         const actualProviders = config?.enabledProviders || enabledProviders;