@b3dotfun/sdk 0.0.88 → 0.0.89-alpha.0

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

@@ -0,0 +1,331 @@
+import app from "../../../global-account/app.js";
+import { authenticateWithB3JWT } from "../../../global-account/bsmnt.js";
+import { useAuthStore, useB3Config } 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 { 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 } = useB3Config();
+    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/useClient.js

@@ -1,11 +1,11 @@
-import { useB3 } from "../../../global-account/react/index.js";
+import { useB3Config } from "../../../global-account/react/index.js";
 import { useCallback } from "react";
 import { authenticateBoth, authenticateWithClient, getClient, getClientByType, setClientType, } from "../../client-manager.js";
 /**
  * Hook to access the current FeathersJS client and client management utilities
  */
 export function useClient() {
-    const { clientType } = useB3();
+    const { clientType } = useB3Config();
     const getCurrentClient = useCallback(() => {
         return getClient();
     }, []);

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

@@ -1,4 +1,4 @@
-import { useB3, useConnect } from "../../../global-account/react/index.js";
+import { useB3Config, useConnect } from "../../../global-account/react/index.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
 import { useIdentityToken, usePrivy } from "@privy-io/react-auth";
 import { useCallback, useRef, useState } from "react";
@@ -8,7 +8,7 @@ const debug = debugB3React("@@b3:useHandleConnectWithPrivy");
  * Currently, this is for the basement-privy strategy
  */
 export function useHandleConnectWithPrivy(chain, onSuccess) {
-    const { partnerId } = useB3();
+    const { partnerId } = useB3Config();
     if (!chain) {
         throw new Error("Chain is required");
     }

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

@@ -1,7 +1,7 @@
+import { useB3Config } from "../../../global-account/react/index.js";
 import { getAuthToken } from "../../../shared/utils/auth-token.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
 import { useCallback, useEffect, useState } from "react";
-import { useB3 } from "../components/index.js";
 import { notificationsAPI } from "../utils/notificationsAPI.js";
 import { useUserQuery } from "./useUserQuery.js";
 const debug = debugB3React("useNotifications");
@@ -27,7 +27,7 @@ const debug = debugB3React("useNotifications");
  */
 export function useNotifications() {
     const { user } = useUserQuery();
-    const { partnerId } = useB3();
+    const { partnerId } = useB3Config();
     const [userData, setUserData] = useState(null);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(null);

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

@@ -1,4 +1,7 @@
 import { Wallet } from "thirdweb/wallets";
+/**
+ * @deprecated Use useAuth() with Turnkey authentication instead
+ */
 export declare function useTWAuth(): {
     authenticate: (wallet: Wallet, partnerId: string) => Promise<import("@feathersjs/authentication").AuthenticationResult>;
 };

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

@@ -1,8 +1,16 @@
+/**
+ * @deprecated This hook is deprecated. Use useAuth() with Turnkey authentication instead.
+ * This file is kept for backward compatibility but should not be used in new code.
+ */
 import app from "../../../global-account/app.js";
 import debug from "../../../shared/utils/debug.js";
 import { useCallback } from "react";
 import { useSearchParam } from "./useSearchParamsSSR.js";
+/**
+ * @deprecated Use useAuth() with Turnkey authentication instead
+ */
 export function useTWAuth() {
+    console.warn("useTWAuth is deprecated. Please migrate to useAuth() with Turnkey authentication. See useTurnkeyAuth.ts for the new implementation.");
     const referralCode = useSearchParam("referralCode");
     const authenticate = useCallback(async (wallet, partnerId) => {
         if (!wallet || !wallet?.getAuthToken?.())

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

@@ -1,12 +1,12 @@
 "use client";
 import { isNativeToken } from "../../../anyspend/index.js";
-import { useB3, useAccountWallet } from "../../../global-account/react/index.js";
+import { useAccountWallet, useAuthStore } from "../../../global-account/react/index.js";
 import { formatTokenAmount } from "../../../shared/utils/number.js";
 import { getERC20Balances, getNativeTokenBalance } from "../../../shared/utils/thirdweb-insights.js";
 import { useQuery } from "@tanstack/react-query";
 import { useEffect } from "react";
 export function useTokenBalance({ token, address }) {
-    const { ready } = useB3();
+    const isAuthenticated = useAuthStore(state => state.isAuthenticated);
     const account = useAccountWallet();
     const effectiveAddress = address || account?.address;
     const { data: tokenBalance, isLoading, isFetching, refetch, } = useQuery({
@@ -38,7 +38,7 @@ export function useTokenBalance({ token, address }) {
             }
             return { formatted: "0", raw: null };
         },
-        enabled: ready && !!effectiveAddress,
+        enabled: isAuthenticated && !!effectiveAddress,
         staleTime: 30000,
         gcTime: 5 * 60 * 1000,
         retry: 2,
@@ -46,12 +46,12 @@ export function useTokenBalance({ token, address }) {
     });
     // Force a refetch when the wallet or token changes
     useEffect(() => {
-        if (ready && effectiveAddress) {
+        if (isAuthenticated && effectiveAddress) {
             refetch();
         }
-    }, [ready, effectiveAddress, token.address, token.chainId, token.symbol, refetch]);
+    }, [isAuthenticated, effectiveAddress, token.address, token.chainId, token.symbol, refetch]);
     // Determine if we're actually loading
-    const isActuallyLoading = !ready || !effectiveAddress || isLoading || (isFetching && !tokenBalance);
+    const isActuallyLoading = !isAuthenticated || !effectiveAddress || isLoading || (isFetching && !tokenBalance);
     return {
         rawBalance: tokenBalance?.raw || BigInt(0),
         formattedBalance: tokenBalance?.formatted || "0",

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

@@ -4,8 +4,8 @@ import { useQuery } from "@tanstack/react-query";
 import { viemToThirdwebChain } from "../../../shared/constants/chains/b3Chain.js";
 import { getChainById } from "../../../shared/utils/chains.js";
 import { client } from "../../../shared/utils/thirdweb.js";
-import { getWalletBalance } from "thirdweb/wallets";
 import invariant from "invariant";
+import { getWalletBalance } from "thirdweb/wallets";
 export function useTokenBalancesByChain({ address, chainsIds, enabled = true, }) {
     // Normalize chains to array
     const chainIds = Array.isArray(chainsIds) ? chainsIds : [chainsIds];
@@ -46,7 +46,9 @@ export function useTokenBalancesByChain({ address, chainsIds, enabled = true, })
         staleTime: 30000, // Consider data fresh for 30 seconds
         gcTime: 5 * 60 * 1000, // Keep in cache for 5 minutes
         retry: 2, // Limit retries on failure
-        structuralSharing: false,
+        // Enable structural sharing to prevent infinite loops
+        // This ensures we only get new references when data actually changes
+        structuralSharing: true,
     });
     return {
         nativeTokens: combinedData?.nativeTokens ?? [],

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

@@ -3,7 +3,7 @@ import { useCallback, useState } from "react";
 import app from "../../app.js";
 import { useB3Config } from "../components/index.js";
 import { useAuthStore } from "../stores/index.js";
-import { useAuthentication } from "./useAuthentication.js";
+import { useAuth } from "./useAuth.js";
 const debug = debugB3React("useTurnkeyAuth");
 /**
  * Hook for Turnkey email-based OTP authentication
@@ -19,29 +19,54 @@ export function useTurnkeyAuth() {
     const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
     const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
     const { partnerId } = useB3Config();
-    const { user } = useAuthentication(partnerId);
+    const { authenticate } = useAuth();
     /**
      * Step 1: Initiate login with email
-     * - Calls backend to create sub-org (if needed) and send OTP
+     * - Calls backend turnkey-jwt strategy (init action) to create sub-org (if needed) and send OTP
      * - Returns otpId to use in verification step
+     *
+     * Note: Uses the turnkey-jwt authentication strategy, not the service directly.
+     * The turnkey-jwt strategy handles both OTP flow (init/verify) and final authentication.
      */
     const initiateLogin = useCallback(async (email) => {
         setIsLoading(true);
         setError(null);
         setIsAuthenticating(true);
         try {
-            if (!user?.userId) {
-                throw new Error("User ID is required to initiate Turnkey login.");
-            }
             debug(`Initiating login for: ${email}`);
-            // Call FeathersJS service to initialize OTP
-            const data = await app.service("turnkey-auth").init({ email, userId: user.userId });
+            // Use authentication service with turnkey-jwt strategy (init action)
+            // userId is resolved from authentication context on the backend (params.user.userId)
+            // Backend will get userId from _params.user?.userId if authenticated, or handle unauthenticated case
+            // So we only need to send email
+            debug(`Calling app.authenticate with turnkey-jwt strategy (init action)`, { email });
+            const response = await app.authenticate({
+                strategy: "turnkey-jwt",
+                action: "init",
+                email,
+            });
+            // The strategy returns the TurnkeyAuthInitResponse directly
+            const data = response;
             debug(`OTP initialized successfully. OtpId: ${data.otpId}`);
             return data;
         }
         catch (err) {
             debug("Error initiating login:", err);
-            const errorMessage = err.message || "Failed to send OTP email. Please try again.";
+            // Provide more detailed error information
+            let errorMessage = "Failed to send OTP email. Please try again.";
+            if (err.message) {
+                errorMessage = err.message;
+            }
+            else if (err.name === "TypeError" && err.message?.includes("fetch")) {
+                errorMessage = "Network error: Unable to reach the server. Please check your connection and try again.";
+            }
+            else if (err.code === "ECONNREFUSED" || err.code === "ENOTFOUND") {
+                errorMessage = "Connection error: Unable to reach the server. Please check your internet connection.";
+            }
+            else if (err.response) {
+                // FeathersJS error response
+                errorMessage = err.response.message || err.message || errorMessage;
+                debug("FeathersJS error response:", err.response);
+            }
             setError(errorMessage);
             throw err;
         }
@@ -49,11 +74,11 @@ export function useTurnkeyAuth() {
             setIsLoading(false);
             setIsAuthenticating(false);
         }
-    }, [user, setIsAuthenticating]);
+    }, [setIsAuthenticating]);
     /**
      * Step 2: Verify OTP and authenticate
-     * - Verifies OTP with backend
-     * - Gets Turnkey session JWT
+     * - Verifies OTP with backend via turnkey-jwt strategy (verify action)
+     * - Gets Turnkey session JWT from the verify response
      * - Authenticates with b3-api using "turnkey-jwt" strategy
      * - JWT automatically stored in cookies by SDK
      */
@@ -62,19 +87,22 @@ export function useTurnkeyAuth() {
         setError(null);
         setIsAuthenticating(true);
         try {
-            debug(`Verifying OTP...`, { userId: user?.userId });
-            // Step 1: Verify OTP and get Turnkey session JWT
-            const { turnkeySessionJwt } = await app.service("turnkey-auth").verify({
+            debug(`Verifying OTP...`, { otpId });
+            // Step 1: Verify OTP with backend using turnkey-jwt strategy (verify action)
+            // This returns the Turnkey session JWT
+            const response = await app.authenticate({
+                strategy: "turnkey-jwt",
+                action: "verify",
                 otpId,
                 otpCode,
             });
-            debug(`OTP verified! Authenticating with b3-api...`);
+            // The strategy returns the TurnkeyAuthVerifyResponse directly
+            const verifyResult = response;
+            const { turnkeySessionJwt } = verifyResult;
+            debug(`OTP verified! Got Turnkey session JWT. Authenticating with b3-api...`);
             // Step 2: Authenticate with b3-api using Turnkey JWT
-            // The SDK will automatically store the b3-api JWT in cookies
-            const authResult = await app.authenticate({
-                strategy: "turnkey-jwt",
-                accessToken: turnkeySessionJwt,
-            });
+            // Use the unified useAuth hook for authentication with "turnkey-jwt" strategy
+            const authResult = await authenticate(turnkeySessionJwt, partnerId || "");
             debug(`Successfully authenticated with b3-api!`, authResult);
             // Update auth store to reflect authenticated state
             setIsAuthenticated(true);
@@ -94,7 +122,7 @@ export function useTurnkeyAuth() {
             setIsLoading(false);
             setIsAuthenticating(false);
         }
-    }, [user, setIsAuthenticating, setIsAuthenticated]);
+    }, [partnerId, setIsAuthenticating, setIsAuthenticated, authenticate]);
     const clearError = useCallback(() => {
         setError(null);
     }, []);

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

@@ -0,0 +1,60 @@
+/**
+ * Preferred Hook to get the user data
+ */
+export declare function useUser(): {
+    user: {
+        email?: string | undefined;
+        username?: string | undefined;
+        telNumber?: 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;
+                username?: string | undefined;
+                phone?: 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;
+        };
+    } | null;
+    isConnecting: boolean;
+    isConnected: boolean;
+    isAuthenticating: boolean;
+};