made onloginsuccess callback only fire onlogin

Crossmint · Feb 15, 2025 · 42af24f · 42af24f
1 parent 45dec65
commit 42af24f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/client/ui/react-ui/src/providers/CrossmintAuthProvider.tsx b/packages/client/ui/react-ui/src/providers/CrossmintAuthProvider.tsx
@@ -119,11 +119,12 @@ export function CrossmintAuthProvider({
         setDialogOpen(false);
 
         // FOR STANDALONE AUTH ONLY! EXCLUDING PASSKEY HELPERS.
-        // Skip if passkey helpers are enabled because they have to still create a wallet.
-        if (onLoginSuccess != null && !(embeddedWallets.showPasskeyHelpers ?? true)) {
+        // not for existing sessions or page refreshes.
+        // Skip for passkey-enabled flows as they handle success separately.
+        if (dialogOpen && onLoginSuccess != null && !(embeddedWallets.showPasskeyHelpers ?? true)) {
             onLoginSuccess();
         }
-    }, [crossmint.jwt, onLoginSuccess, embeddedWallets.showPasskeyHelpers]);
+    }, [crossmint.jwt, dialogOpen, onLoginSuccess, embeddedWallets.showPasskeyHelpers]);
 
     const login = () => {
         if (crossmint.jwt != null) {
@@ -180,6 +181,7 @@ export function CrossmintAuthProvider({
                     showPasskeyHelpers={embeddedWallets.showPasskeyHelpers}
                     appearance={appearance}
                     onLoginSuccess={onLoginSuccess}
+                    dialogOpen={dialogOpen}
                 >
                     <AuthFormProvider
                         preFetchOAuthUrls={getAuthStatus() === "logged-out"}

diff --git a/packages/client/ui/react-ui/src/providers/CrossmintWalletProvider.tsx b/packages/client/ui/react-ui/src/providers/CrossmintWalletProvider.tsx
@@ -60,12 +60,14 @@ export function CrossmintWalletProvider({
     showPasskeyHelpers = true,
     appearance,
     onLoginSuccess,
+    dialogOpen,
 }: {
     children: ReactNode;
     defaultChain: EVMSmartWalletChain;
     showPasskeyHelpers?: boolean;
     appearance?: UIConfig;
     onLoginSuccess?: () => void;
+    dialogOpen: boolean;
 }) {
     const { crossmint } = useCrossmint("CrossmintWalletProvider must be used within CrossmintProvider");
     const smartWalletSDK = useMemo(() => SmartWalletSDK.init({ clientApiKey: crossmint.apiKey }), [crossmint.apiKey]);
@@ -95,7 +97,8 @@ export function CrossmintWalletProvider({
             setWalletState({ status: "loaded", wallet });
 
             // Upon getting/creating a wallet, trigger the onLoginSuccess callback
-            if (onLoginSuccess != null) {
+            // Only fire if the dialog is open
+            if (onLoginSuccess != null && dialogOpen) {
                 onLoginSuccess();
             }
         } catch (error: unknown) {