signer-test-sdk-react 0.0.19 → 0.0.21

package/dist/src/AbstraxnProvider.js

@@ -458,10 +458,24 @@ function AbstraxnProviderInner({ config, children, base, wagmi }) {
                 // Store in localStorage for restoration
                 try {
                     localStorage.setItem('abstraxn_connection_type', connectionTypeValue);
+                    localStorage.setItem('abstraxn_oauth_pending', 'google');
                 }
                 catch (e) {
                     // Ignore localStorage errors
                 }
+                // Clear existing query params before starting new flow
+                if (typeof window !== 'undefined') {
+                    const url = new URL(window.location.href);
+                    // Remove auth params that might be present from previous attempts
+                    url.searchParams.delete('code');
+                    url.searchParams.delete('state');
+                    url.searchParams.delete('error');
+                    url.searchParams.delete('success');
+                    url.searchParams.delete('accessToken');
+                    url.searchParams.delete('provider');
+                    url.searchParams.delete('authProvider');
+                    window.history.replaceState({}, document.title, url.toString());
+                }
                 const authManager = walletInstance.getAuthManager();
                 await authManager.loginWithGoogle();
             },
@@ -472,10 +486,24 @@ function AbstraxnProviderInner({ config, children, base, wagmi }) {
                 setConnectionType(connectionTypeValue);
                 try {
                     localStorage.setItem('abstraxn_connection_type', connectionTypeValue);
+                    localStorage.setItem('abstraxn_oauth_pending', 'twitter');
                 }
                 catch (e) {
                     // Ignore localStorage errors
                 }
+                // Clear existing query params before starting new flow
+                if (typeof window !== 'undefined') {
+                    const url = new URL(window.location.href);
+                    // Remove auth params that might be present from previous attempts
+                    url.searchParams.delete('code');
+                    url.searchParams.delete('state');
+                    url.searchParams.delete('error');
+                    url.searchParams.delete('success');
+                    url.searchParams.delete('accessToken');
+                    url.searchParams.delete('provider');
+                    url.searchParams.delete('authProvider');
+                    window.history.replaceState({}, document.title, url.toString());
+                }
                 const authManager = walletInstance.getAuthManager();
                 await authManager.loginWithTwitter();
             },
@@ -486,10 +514,24 @@ function AbstraxnProviderInner({ config, children, base, wagmi }) {
                 setConnectionType(connectionTypeValue);
                 try {
                     localStorage.setItem('abstraxn_connection_type', connectionTypeValue);
+                    localStorage.setItem('abstraxn_oauth_pending', 'discord');
                 }
                 catch (e) {
                     // Ignore localStorage errors
                 }
+                // Clear existing query params before starting new flow
+                if (typeof window !== 'undefined') {
+                    const url = new URL(window.location.href);
+                    // Remove auth params that might be present from previous attempts
+                    url.searchParams.delete('code');
+                    url.searchParams.delete('state');
+                    url.searchParams.delete('error');
+                    url.searchParams.delete('success');
+                    url.searchParams.delete('accessToken');
+                    url.searchParams.delete('provider');
+                    url.searchParams.delete('authProvider');
+                    window.history.replaceState({}, document.title, url.toString());
+                }
                 const authManager = walletInstance.getAuthManager();
                 await authManager.loginWithDiscord();
             },
@@ -655,7 +697,12 @@ function AbstraxnProviderInner({ config, children, base, wagmi }) {
             }
             return path.includes(`/${provider}`);
         };
-        onboarding.init();
+        try {
+            onboarding.init();
+        }
+        catch (err) {
+            console.error('Failed to initialize OnboardingUI:', err);
+        }
         // Check if we should keep it open (if handling a callback)
         const urlParams = new URLSearchParams(window.location.search);
         const shouldKeepOpen = hasAuthParams(urlParams);
@@ -682,13 +729,26 @@ function AbstraxnProviderInner({ config, children, base, wagmi }) {
         }
         onboardingRef.current = onboarding;
         // Handle Google OAuth callback (only in useEffect, not exposed)
-        const handleGoogleCallback = async () => {
+        const handleGoogleCallback = async (force = false) => {
             if (googleCallbackHandledRef.current)
                 return;
             const urlParams = new URLSearchParams(window.location.search);
             if (!hasAuthParams(urlParams) || matchesProvider('twitter', urlParams) || matchesProvider('discord', urlParams)) {
                 return;
             }
+            // Check if we initiated this OAuth flow
+            let oauthPending = null;
+            try {
+                oauthPending = localStorage.getItem('abstraxn_oauth_pending');
+            }
+            catch (e) { }
+            if (!force && !oauthPending)
+                return;
+            // Clear the pending flag
+            try {
+                localStorage.removeItem('abstraxn_oauth_pending');
+            }
+            catch (e) { }
             // Show loading modal if success=true is in URL
             const hasSuccess = urlParams.get('success') === 'true';
             if (hasSuccess && onboardingRef.current) {
@@ -748,6 +808,19 @@ function AbstraxnProviderInner({ config, children, base, wagmi }) {
             if (!hasAuthParams(urlParams) || !matchesProvider('discord', urlParams)) {
                 return;
             }
+            // Check if we initiated this OAuth flow
+            let oauthPending = null;
+            try {
+                oauthPending = localStorage.getItem('abstraxn_oauth_pending');
+            }
+            catch (e) { }
+            if (!oauthPending)
+                return;
+            // Clear the pending flag
+            try {
+                localStorage.removeItem('abstraxn_oauth_pending');
+            }
+            catch (e) { }
             // Show loading modal if success=true is in URL
             const hasSuccess = urlParams.get('success') === 'true';
             if (hasSuccess && onboardingRef.current) {
@@ -807,6 +880,19 @@ function AbstraxnProviderInner({ config, children, base, wagmi }) {
             if (!hasAuthParams(urlParams) || !matchesProvider('twitter', urlParams)) {
                 return;
             }
+            // Check if we initiated this OAuth flow
+            let oauthPending = null;
+            try {
+                oauthPending = localStorage.getItem('abstraxn_oauth_pending');
+            }
+            catch (e) { }
+            if (!oauthPending)
+                return;
+            // Clear the pending flag
+            try {
+                localStorage.removeItem('abstraxn_oauth_pending');
+            }
+            catch (e) { }
             // Show loading modal if success=true is in URL
             const hasSuccess = urlParams.get('success') === 'true';
             if (hasSuccess && onboardingRef.current) {
@@ -917,6 +1003,10 @@ function AbstraxnProviderInner({ config, children, base, wagmi }) {
     // Show onboarding UI (defined first to avoid hoisting issues)
     const showOnboarding = useCallback(() => {
         setError(null); // Clear any previous errors
+        if (!onboardingRef.current) {
+            console.error('OnboardingUI not initialized - cannot show modal');
+            return;
+        }
         if (onboardingRef.current) {
             const onboarding = onboardingRef.current;
             // Re-initialize if destroyed
@@ -1613,7 +1703,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi }) {
         }
     }, []);
     // Handle Google callback
-    const handleGoogleCallback = useCallback(async () => {
+    const handleGoogleCallback = useCallback(async (_force = false) => {
         if (!walletRef.current)
             return;
         setLoading(true);
@@ -2350,7 +2440,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi }) {
         loginWithOTP,
         verifyOTP,
         loginWithGoogle,
-        handleGoogleCallback,
+        handleGoogleCallback: () => handleGoogleCallback(true),
         refreshWhoami,
         uiConfig: config.ui,
         // External wallet methods
@@ -2987,8 +3077,12 @@ export function AbstraxnProvider({ config, children }) {
     const { wagmiConfig, configError } = useMemo(() => {
         if (!externalWalletsEnabled)
             return { wagmiConfig: null, configError: null };
+        // Use provided config if available
+        if (config.wagmiConfig) {
+            return { wagmiConfig: config.wagmiConfig, configError: null };
+        }
         try {
-            const configResult = createWagmiConfig(wagmiChains, config.externalWallets?.walletConnectProjectId, config.externalWallets?.connectors, config.ui?.theme || 'dark');
+            const configResult = createWagmiConfig(wagmiChains, config.externalWallets?.walletConnectProjectId, config.externalWallets?.connectors, config.ui?.theme || 'dark', config.externalWallets?.ssr);
             return { wagmiConfig: configResult, configError: null };
         }
         catch (error) {
@@ -2998,7 +3092,7 @@ export function AbstraxnProvider({ config, children }) {
                 configError: error instanceof Error ? error : new Error('Failed to create wagmi config')
             };
         }
-    }, [externalWalletsEnabled, wagmiChains, config.externalWallets?.walletConnectProjectId, config.externalWallets?.connectors]);
+    }, [externalWalletsEnabled, wagmiChains, config.externalWallets?.walletConnectProjectId, config.externalWallets?.connectors, config.wagmiConfig, config.externalWallets?.ssr]);
     // If external wallets are enabled, wrap with QueryClientProvider and WagmiProvider
     if (externalWalletsEnabled) {
         // Check if React Query is available BEFORE doing anything else
@@ -3021,7 +3115,7 @@ export function AbstraxnProvider({ config, children }) {
             // Don't render AbstraxnProviderInner until wagmiConfig is ready
             return (_jsx(QueryClientWrapper, { queryClient: queryClient, children: _jsx("div", { style: { display: 'none' }, children: "Loading wallet connectors..." }) }));
         }
-        return (_jsx(QueryClientWrapper, { queryClient: queryClient, children: _jsx(WagmiProvider, { config: wagmiConfig, children: _jsx(AbstraxnProviderWithWagmi, { config: config, children: children }) }) }));
+        return (_jsx(QueryClientWrapper, { queryClient: queryClient, children: _jsx(WagmiProvider, { config: wagmiConfig, initialState: config.initialState, children: _jsx(AbstraxnProviderWithWagmi, { config: config, children: children }) }) }));
     }
     // If external wallets are disabled, use the provider without wagmi
     return _jsx(AbstraxnProviderWithoutWagmi, { config: config, children: children });