@b3dotfun/sdk 0.0.82-alpha.3 → 0.0.83-test.0

package/dist/esm/global-account/react/components/SignInWithB3/SignInWithB3Flow.js

@@ -3,6 +3,7 @@ import { Loading, useAuthStore, useB3, useGetAllTWSigners, useModalStore, } from
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import { useCallback, useEffect, useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
+import { TurnkeyAuthModal } from "../TurnkeyAuthModal.js";
 import { SignInWithB3Privy } from "./SignInWithB3Privy.js";
 import { LoginStep, LoginStepContainer } from "./steps/LoginStep.js";
 import { LoginStepCustom } from "./steps/LoginStepCustom.js";
@@ -20,7 +21,9 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
     const account = useActiveAccount();
     const isAuthenticating = useAuthStore(state => state.isAuthenticating);
     const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+    const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
     const isConnected = useAuthStore(state => state.isConnected);
+    const setIsConnected = useAuthStore(state => state.setIsConnected);
     const setJustCompletedLogin = useAuthStore(state => state.setJustCompletedLogin);
     const [refetchCount, setRefetchCount] = useState(0);
     const [refetchError, setRefetchError] = useState(null);
@@ -122,6 +125,10 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         debug("Refetching user after Turnkey success...");
         await refetchUser();
         debug("User refetched successfully");
+        // Set authentication and connection state so UI updates properly
+        setIsAuthenticated(true);
+        setIsConnected(true);
+        setJustCompletedLogin(true);
         // After user data is refreshed, close Turnkey modal and go back to sign-in flow
         debug("Switching back to signInWithB3 modal");
         setB3ModalContentType({
@@ -151,6 +158,9 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         closeAfterLogin,
         source,
         signersEnabled,
+        setIsAuthenticated,
+        setIsConnected,
+        setJustCompletedLogin,
     ]);
     // Handle post-login flow after signers are loaded
     useEffect(() => {
@@ -286,21 +296,56 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
     if (refetchError) {
         content = (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx("div", { className: "p-4 text-center text-red-500", children: refetchError }) }));
     }
-    else if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
-        content = (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx("div", { className: "my-8 flex min-h-[350px] items-center justify-center", children: _jsx(Loading, { variant: "white", size: "lg" }) }) }));
-    }
     else if (step === "login") {
-        // Custom strategy
-        if (strategies?.[0] === "privy") {
-            content = _jsx(SignInWithB3Privy, { onSuccess: handleLoginSuccess, chain: chain });
-        }
-        else if (strategies) {
-            // Strategies are explicitly provided
-            content = (_jsx(LoginStepCustom, { strategies: strategies, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
+        // PRIORITY: If Turnkey is enabled, show Turnkey modal FIRST as the primary authentication option
+        // Show Turnkey when enabled and not already completed in this session
+        const shouldShowTurnkeyFirst = enableTurnkey && !turnkeyAuthCompleted;
+        if (shouldShowTurnkeyFirst) {
+            // Don't show loading spinner for Turnkey - let the modal handle its own loading state
+            // This prevents the infinite loop where isAuthenticating causes the modal to be replaced
+            debug("Showing Turnkey as primary authentication option", {
+                enableTurnkey,
+                turnkeyAuthCompleted,
+                isAuthenticated,
+            });
+            // Show Turnkey authentication as primary option
+            content = (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx(TurnkeyAuthModal, { onSuccess: async (authenticatedUser) => {
+                        debug("Turnkey authentication successful in primary flow", { authenticatedUser });
+                        setTurnkeyAuthCompleted(true);
+                        // After Turnkey auth, refetch user to get the full user object
+                        await refetchUser();
+                        // User is now authenticated via Turnkey
+                        // Set both isAuthenticated and isConnected to true so UI updates properly
+                        // Wallet connection is optional and can happen later for signing transactions
+                        setIsAuthenticated(true);
+                        setIsConnected(true);
+                        setJustCompletedLogin(true);
+                        // Call the login success callback
+                        onLoginSuccess?.({});
+                    }, onClose: () => {
+                        // If user closes Turnkey modal, they can still use wallet connection as fallback
+                        setTurnkeyAuthCompleted(true);
+                    }, initialEmail: "", skipToOtp: false }) }));
         }
         else {
-            // Default to handle all strategies we support
-            content = _jsx(LoginStep, { chain: chain, onSuccess: handleLoginSuccess, onError: onError });
+            // Show loading spinner only if not in Turnkey flow
+            if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
+                content = (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx("div", { className: "my-8 flex min-h-[350px] items-center justify-center", children: _jsx(Loading, { variant: "white", size: "lg" }) }) }));
+            }
+            else {
+                // Custom strategy
+                if (strategies?.[0] === "privy") {
+                    content = _jsx(SignInWithB3Privy, { onSuccess: handleLoginSuccess, chain: chain });
+                }
+                else if (strategies) {
+                    // Strategies are explicitly provided
+                    content = (_jsx(LoginStepCustom, { strategies: strategies, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
+                }
+                else {
+                    // Default to handle all strategies we support
+                    content = _jsx(LoginStep, { chain: chain, onSuccess: handleLoginSuccess, onError: onError });
+                }
+            }
         }
     }
     return content;

package/dist/esm/global-account/react/hooks/index.d.ts

@@ -3,6 +3,7 @@ export { useAccountAssets } from "./useAccountAssets";
 export { useAccountWallet } from "./useAccountWallet";
 export { useAddTWSessionKey } from "./useAddTWSessionKey";
 export { useAnalytics } from "./useAnalytics";
+export { useAuth } from "./useAuth";
 export { useAuthentication } from "./useAuthentication";
 export { useB3BalanceFromAddresses } from "./useB3BalanceFromAddresses";
 export { useB3EnsName } from "./useB3EnsName";

package/dist/esm/global-account/react/hooks/index.js

@@ -3,6 +3,7 @@ export { useAccountAssets } from "./useAccountAssets.js";
 export { useAccountWallet } from "./useAccountWallet.js";
 export { useAddTWSessionKey } from "./useAddTWSessionKey.js";
 export { useAnalytics } from "./useAnalytics.js";
+export { useAuth } from "./useAuth.js";
 export { useAuthentication } from "./useAuthentication.js";
 export { useB3BalanceFromAddresses } from "./useB3BalanceFromAddresses.js";
 export { useB3EnsName } from "./useB3EnsName.js";

package/dist/esm/global-account/react/hooks/useAuth.d.ts

@@ -0,0 +1,76 @@
+import { Wallet } from "thirdweb/wallets";
+import { preAuthenticate } from "thirdweb/wallets/in-app";
+/**
+ * Unified authentication hook that uses Turnkey for authentication
+ * This replaces the previous Thirdweb-based authentication
+ *
+ * This hook provides 1:1 feature parity with useAuthentication.ts
+ */
+export declare function useAuth(): {
+    authenticate: (turnkeySessionJwt: string, partnerId: string) => Promise<import("@feathersjs/authentication").AuthenticationResult>;
+    reAuthenticate: () => Promise<import("@feathersjs/authentication").AuthenticationResult>;
+    logout: (callback?: () => void) => Promise<void>;
+    isAuthenticated: boolean;
+    isReady: boolean;
+    isConnecting: boolean;
+    isConnected: boolean;
+    wallet: import("thirdweb/dist/types/wallets/in-app/core/wallet/types").EcosystemWallet;
+    preAuthenticate: typeof preAuthenticate;
+    connect: (_walleAutoConnectedWith: Wallet, allConnectedWallets: Wallet[]) => Promise<void>;
+    isAuthenticating: boolean;
+    onConnect: (_walleAutoConnectedWith: Wallet, allConnectedWallets: Wallet[]) => Promise<void>;
+    user: {
+        email?: string | undefined;
+        telNumber?: string | undefined;
+        username?: string | undefined;
+        ens?: string | undefined;
+        avatar?: string | undefined;
+        preferences?: {} | undefined;
+        referredBy?: string | {} | undefined;
+        sourceApp?: string | undefined;
+        referralCode?: string | undefined;
+        userGroups?: number[] | undefined;
+        isMigratedFromBSMNT?: boolean | undefined;
+        privyLinkedAccounts?: {
+            name?: string | undefined;
+            address?: string | undefined;
+            email?: string | undefined;
+            chain_type?: string | undefined;
+            lv?: number | undefined;
+            wallet_client_type?: string | undefined;
+            smart_wallet_type?: string | undefined;
+            subject?: string | undefined;
+            type: string;
+        }[] | undefined;
+        twProfiles?: {
+            type: string;
+            details: {
+                id?: string | undefined;
+                name?: string | undefined;
+                address?: string | undefined;
+                email?: string | undefined;
+                phone?: string | undefined;
+                username?: string | undefined;
+                fid?: string | undefined;
+            };
+        }[] | undefined;
+        turnkeySubOrgs?: {
+            hasDelegatedUser?: boolean | undefined;
+            subOrgId: string;
+            accounts: Record<string, any>[];
+        }[] | undefined;
+        _id: string | {};
+        userId: string;
+        smartAccountAddress: string;
+        createdAt: number;
+        updatedAt: number;
+        partnerIds: {
+            privyId?: string | undefined;
+            thirdwebId?: string | undefined;
+            turnkeyId?: string | undefined;
+            turnkeyOtpId?: string | undefined;
+        };
+    } | undefined;
+    refetchUser: () => Promise<import("@feathersjs/authentication").AuthenticationResult>;
+    setUser: (newUser?: import("@b3dotfun/b3-api").Users) => void;
+};

package/dist/esm/global-account/react/hooks/useAuth.js

@@ -0,0 +1,332 @@
+import app from "../../../global-account/app.js";
+import { authenticateWithB3JWT } from "../../../global-account/bsmnt.js";
+import { useAuthStore } from "../../../global-account/react/index.js";
+import { ecosystemWalletId } from "../../../shared/constants/index.js";
+import { debugB3React } from "../../../shared/utils/debug.js";
+import { client } from "../../../shared/utils/thirdweb.js";
+import { getConnectors } from "@wagmi/core";
+import { useCallback, useContext, useEffect, useRef } from "react";
+import { useActiveWallet, useAutoConnect, useConnectedWallets, useDisconnect, useSetActiveWallet, } from "thirdweb/react";
+import { ecosystemWallet } from "thirdweb/wallets";
+import { preAuthenticate } from "thirdweb/wallets/in-app";
+import { useAccount, useConnect, useSwitchAccount } from "wagmi";
+import { LocalSDKContext } from "../components/B3Provider/LocalSDKProvider.js";
+import { useB3 } from "../components/B3Provider/useB3.js";
+import { createWagmiConfig } from "../utils/createWagmiConfig.js";
+import { useSearchParam } from "./useSearchParamsSSR.js";
+import { useUserQuery } from "./useUserQuery.js";
+const debug = debugB3React("useAuth");
+/**
+ * Unified authentication hook that uses Turnkey for authentication
+ * This replaces the previous Thirdweb-based authentication
+ *
+ * This hook provides 1:1 feature parity with useAuthentication.ts
+ */
+export function useAuth() {
+    const { onConnectCallback } = useContext(LocalSDKContext);
+    const { disconnect } = useDisconnect();
+    const wallets = useConnectedWallets();
+    const activeWallet = useActiveWallet();
+    const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+    const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
+    const setIsConnected = useAuthStore(state => state.setIsConnected);
+    const isConnecting = useAuthStore(state => state.isConnecting);
+    const isConnected = useAuthStore(state => state.isConnected);
+    const isAuthenticating = useAuthStore(state => state.isAuthenticating);
+    const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
+    const setHasStartedConnecting = useAuthStore(state => state.setHasStartedConnecting);
+    const setActiveWallet = useSetActiveWallet();
+    const hasStartedConnecting = useAuthStore(state => state.hasStartedConnecting);
+    const useAutoConnectLoadingPrevious = useRef(false);
+    const referralCode = useSearchParam("referralCode");
+    const { partnerId } = useB3();
+    const wagmiConfig = createWagmiConfig({ partnerId });
+    const { connect } = useConnect();
+    const activeWagmiAccount = useAccount();
+    const { switchAccount } = useSwitchAccount();
+    const { user, setUser } = useUserQuery();
+    debug("@@activeWagmiAccount", activeWagmiAccount);
+    const wallet = ecosystemWallet(ecosystemWalletId, {
+        partnerId: partnerId,
+    });
+    /**
+     * Re-authenticate using existing session
+     * Also updates user state and authenticates with BSMNT
+     */
+    const reAuthenticate = useCallback(async () => {
+        debug("Re-authenticating...");
+        try {
+            const response = await app.reAuthenticate();
+            debug("Re-authentication successful", response);
+            // Update user state if user data exists
+            if (response.user) {
+                setUser(response.user);
+                debug("User state updated", response.user);
+            }
+            // Authenticate with BSMNT
+            try {
+                const b3Jwt = await authenticateWithB3JWT(response.accessToken);
+                debug("BSMNT re-authentication successful", b3Jwt);
+            }
+            catch (bsmntError) {
+                // BSMNT authentication failure shouldn't block the main auth flow
+                debug("BSMNT re-authentication failed (non-critical)", bsmntError);
+            }
+            return response;
+        }
+        catch (err) {
+            debug("Re-authentication failed", err);
+            throw err;
+        }
+    }, [setUser]);
+    const syncWagmi = useCallback(async () => {
+        function syncWagmiFunc() {
+            const connectors = getConnectors(wagmiConfig);
+            debug("@@syncWagmi", {
+                connectors,
+                wallets,
+            });
+            // For each that matchs a TW wallet on wallets, connect to the wagmi connector
+            // or, since ecosystem wallets is separate, connect those via in-app-wallet from wagmi
+            connectors.forEach(async (connector) => {
+                const twWallet = wallets.find(wallet => wallet.id === connector.id || connector.id === "in-app-wallet");
+                // If no TW wallet, do not prompt the user to connect
+                if (!twWallet) {
+                    return;
+                }
+                // Metamask will prompt to connect, we can just switch accounts here.
+                if (connector.id === "io.metamask") {
+                    return switchAccount({ connector });
+                }
+                if (
+                // If it's not an in-app wallet or it is the ecosystem wallet, connect
+                connector.id !== "in-app-wallet" ||
+                    (connector.id === "in-app-wallet" && twWallet.id === ecosystemWalletId)) {
+                    try {
+                        const options = {
+                            wallet: twWallet, // the connected wallet
+                        };
+                        debug("@@syncWagmi:connecting", { twWallet, connector });
+                        connect({
+                            connector,
+                            ...options,
+                        });
+                    }
+                    catch (error) {
+                        console.error("@@syncWagmi:error", error);
+                    }
+                }
+                else {
+                    debug("@@syncWagmi:not-connecting", connector);
+                }
+            });
+        }
+        syncWagmiFunc();
+        // wagmi config shouldn't change
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [partnerId, wallets]);
+    useEffect(() => {
+        syncWagmi();
+    }, [wallets, syncWagmi]);
+    /**
+     * Authenticate user using Turnkey
+     * Note: This no longer requires a wallet for authentication.
+     * Wallets are still used for signing transactions, but authentication is done via Turnkey email OTP.
+     *
+     * For backward compatibility, this function still accepts a wallet parameter,
+     * but it's not used for authentication anymore.
+     */
+    const authenticateUser = useCallback(async () => {
+        setHasStartedConnecting(true);
+        // Try to re-authenticate first
+        try {
+            const userAuth = await reAuthenticate();
+            setUser(userAuth.user);
+            setIsAuthenticated(true);
+            setIsAuthenticating(false);
+            debug("Re-authenticated successfully", { userAuth });
+            // Authenticate on BSMNT with B3 JWT
+            const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+            debug("@@b3Jwt", b3Jwt);
+            return userAuth;
+        }
+        catch (error) {
+            // If re-authentication fails, user needs to authenticate via Turnkey
+            // This should be handled by the Turnkey auth modal/flow
+            debug("Re-authentication failed. User needs to authenticate via Turnkey.", error);
+            setIsAuthenticated(false);
+            setIsAuthenticating(false);
+            throw new Error("Authentication required. Please authenticate via Turnkey.");
+        }
+    }, [reAuthenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting]);
+    /**
+     * Authenticate with Turnkey using email OTP
+     * This is the primary authentication method, replacing Thirdweb wallet-based auth
+     *
+     * This function:
+     * 1. Authenticates with FeathersJS (persists session via cookies)
+     * 2. Sets user state in the user store (persists to localStorage)
+     * 3. Authenticates with BSMNT for basement integration
+     */
+    const authenticate = useCallback(async (turnkeySessionJwt, partnerId) => {
+        if (!turnkeySessionJwt) {
+            throw new Error("Turnkey session JWT is required");
+        }
+        debug("Authenticating with Turnkey JWT", { referralCode, partnerId });
+        try {
+            // Step 1: Authenticate with FeathersJS (session persisted via cookies)
+            const response = await app.authenticate({
+                strategy: "turnkey-jwt",
+                accessToken: turnkeySessionJwt,
+                referralCode,
+                partnerId: partnerId,
+            });
+            debug("Authentication successful", response);
+            // Step 2: Set user state (persists to localStorage via Zustand)
+            if (response.user) {
+                setUser(response.user);
+                debug("User state updated", response.user);
+            }
+            // Step 3: Authenticate with BSMNT for basement integration
+            try {
+                const b3Jwt = await authenticateWithB3JWT(response.accessToken);
+                debug("BSMNT authentication successful", b3Jwt);
+            }
+            catch (bsmntError) {
+                // BSMNT authentication failure shouldn't block the main auth flow
+                debug("BSMNT authentication failed (non-critical)", bsmntError);
+            }
+            return response;
+        }
+        catch (err) {
+            debug("Authentication failed", err);
+            throw err;
+        }
+    }, [referralCode, setUser]);
+    /**
+     * Handle wallet connection
+     * Note: With Turnkey migration, wallet connection is primarily for signing transactions,
+     * not for authentication. Authentication should be done separately via Turnkey email OTP.
+     */
+    /**
+     * Handle wallet connection
+     * Note: With Turnkey migration, wallet connection is primarily for signing transactions,
+     * not for authentication. Authentication should be done separately via Turnkey email OTP.
+     */
+    const onConnect = useCallback(async (_walleAutoConnectedWith, allConnectedWallets) => {
+        debug("@@useAuth:onConnect", { _walleAutoConnectedWith, allConnectedWallets });
+        const wallet = allConnectedWallets.find(wallet => wallet.id.startsWith("ecosystem."));
+        if (!wallet) {
+            throw new Error("No smart wallet found during auto-connect");
+        }
+        debug("@@useAuth:onConnect", { wallet });
+        try {
+            setHasStartedConnecting(true);
+            setIsConnected(true);
+            setIsAuthenticating(true);
+            await setActiveWallet(wallet);
+            // Try to authenticate user (will use re-authenticate if session exists)
+            // If no session exists, authentication will need to happen via Turnkey flow
+            try {
+                const userAuth = await authenticateUser();
+                if (userAuth && onConnectCallback) {
+                    await onConnectCallback(wallet, userAuth.accessToken);
+                }
+            }
+            catch (authError) {
+                // Authentication failed - this is expected if user hasn't authenticated via Turnkey yet
+                // The Turnkey auth modal should handle this
+                debug("@@useAuth:onConnect:authFailed", { authError });
+                // Don't set isAuthenticated to false here - let the Turnkey flow handle it
+            }
+        }
+        catch (error) {
+            debug("@@useAuth:onConnect:failed", { error });
+            setIsAuthenticated(false);
+            setUser(undefined);
+        }
+        finally {
+            setIsAuthenticating(false);
+        }
+        debug({
+            isAuthenticated,
+            isAuthenticating,
+            isConnected,
+        });
+    }, [
+        onConnectCallback,
+        authenticateUser,
+        isAuthenticated,
+        isAuthenticating,
+        isConnected,
+        setActiveWallet,
+        setHasStartedConnecting,
+        setIsAuthenticated,
+        setIsAuthenticating,
+        setIsConnected,
+        setUser,
+    ]);
+    const logout = useCallback(async (callback) => {
+        if (activeWallet) {
+            debug("@@logout:activeWallet", activeWallet);
+            disconnect(activeWallet);
+            debug("@@logout:activeWallet", activeWallet);
+        }
+        // Log out of each wallet
+        wallets.forEach(wallet => {
+            console.log("@@logging out", wallet);
+            disconnect(wallet);
+        });
+        // Delete localStorage thirdweb:connected-wallet-ids
+        // https://npc-labs.slack.com/archives/C070E6HNG85/p1750185115273099
+        if (typeof localStorage !== "undefined") {
+            localStorage.removeItem("thirdweb:connected-wallet-ids");
+            localStorage.removeItem("wagmi.store");
+            localStorage.removeItem("lastAuthProvider");
+            localStorage.removeItem("b3-user");
+        }
+        app.logout();
+        debug("@@logout:loggedOut");
+        setIsAuthenticated(false);
+        setIsConnected(false);
+        setUser();
+        callback?.();
+    }, [activeWallet, disconnect, wallets, setIsAuthenticated, setUser, setIsConnected]);
+    const { isLoading: useAutoConnectLoading } = useAutoConnect({
+        client,
+        wallets: [wallet],
+        onConnect,
+        onTimeout: () => {
+            logout().catch(error => {
+                debug("@@useAuth:logout on timeout failed", { error });
+            });
+        },
+    });
+    /**
+     * useAutoConnectLoading starts as false
+     */
+    useEffect(() => {
+        if (!useAutoConnectLoading && useAutoConnectLoadingPrevious.current && !hasStartedConnecting) {
+            setIsAuthenticating(false);
+        }
+        useAutoConnectLoadingPrevious.current = useAutoConnectLoading;
+    }, [useAutoConnectLoading, hasStartedConnecting, setIsAuthenticating]);
+    const isReady = isAuthenticated && !isAuthenticating;
+    return {
+        authenticate,
+        reAuthenticate,
+        logout,
+        isAuthenticated,
+        isReady,
+        isConnecting,
+        isConnected,
+        wallet,
+        preAuthenticate,
+        connect: onConnect,
+        isAuthenticating,
+        onConnect,
+        user,
+        refetchUser: authenticateUser,
+        setUser,
+    };
+}

package/dist/esm/global-account/react/hooks/useAuthentication.d.ts

@@ -41,8 +41,8 @@ export declare function useAuthentication(partnerId: string): {
                 name?: string | undefined;
                 address?: string | undefined;
                 email?: string | undefined;
-                username?: string | undefined;
                 phone?: string | undefined;
+                username?: string | undefined;
                 fid?: string | undefined;
             };
         }[] | undefined;
@@ -63,6 +63,6 @@ export declare function useAuthentication(partnerId: string): {
             turnkeyOtpId?: string | undefined;
         };
     } | undefined;
-    refetchUser: (wallet?: Wallet) => Promise<import("@feathersjs/authentication").AuthenticationResult>;
+    refetchUser: () => Promise<import("@feathersjs/authentication").AuthenticationResult>;
     setUser: (newUser?: import("@b3dotfun/b3-api").Users) => void;
 };