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

package/dist/cjs/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/cjs/global-account/react/hooks/useAuth.js

@@ -0,0 +1,338 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useAuth = useAuth;
+const app_1 = __importDefault(require("../../../global-account/app"));
+const bsmnt_1 = require("../../../global-account/bsmnt");
+const react_1 = require("../../../global-account/react");
+const constants_1 = require("../../../shared/constants");
+const debug_1 = require("../../../shared/utils/debug");
+const thirdweb_1 = require("../../../shared/utils/thirdweb");
+const core_1 = require("@wagmi/core");
+const react_2 = require("react");
+const react_3 = require("thirdweb/react");
+const wallets_1 = require("thirdweb/wallets");
+const in_app_1 = require("thirdweb/wallets/in-app");
+const wagmi_1 = require("wagmi");
+const LocalSDKProvider_1 = require("../components/B3Provider/LocalSDKProvider");
+const useB3_1 = require("../components/B3Provider/useB3");
+const createWagmiConfig_1 = require("../utils/createWagmiConfig");
+const useSearchParamsSSR_1 = require("./useSearchParamsSSR");
+const useUserQuery_1 = require("./useUserQuery");
+const debug = (0, debug_1.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
+ */
+function useAuth() {
+    const { onConnectCallback } = (0, react_2.useContext)(LocalSDKProvider_1.LocalSDKContext);
+    const { disconnect } = (0, react_3.useDisconnect)();
+    const wallets = (0, react_3.useConnectedWallets)();
+    const activeWallet = (0, react_3.useActiveWallet)();
+    const isAuthenticated = (0, react_1.useAuthStore)(state => state.isAuthenticated);
+    const setIsAuthenticated = (0, react_1.useAuthStore)(state => state.setIsAuthenticated);
+    const setIsConnected = (0, react_1.useAuthStore)(state => state.setIsConnected);
+    const isConnecting = (0, react_1.useAuthStore)(state => state.isConnecting);
+    const isConnected = (0, react_1.useAuthStore)(state => state.isConnected);
+    const isAuthenticating = (0, react_1.useAuthStore)(state => state.isAuthenticating);
+    const setIsAuthenticating = (0, react_1.useAuthStore)(state => state.setIsAuthenticating);
+    const setHasStartedConnecting = (0, react_1.useAuthStore)(state => state.setHasStartedConnecting);
+    const setActiveWallet = (0, react_3.useSetActiveWallet)();
+    const hasStartedConnecting = (0, react_1.useAuthStore)(state => state.hasStartedConnecting);
+    const useAutoConnectLoadingPrevious = (0, react_2.useRef)(false);
+    const referralCode = (0, useSearchParamsSSR_1.useSearchParam)("referralCode");
+    const { partnerId } = (0, useB3_1.useB3)();
+    const wagmiConfig = (0, createWagmiConfig_1.createWagmiConfig)({ partnerId });
+    const { connect } = (0, wagmi_1.useConnect)();
+    const activeWagmiAccount = (0, wagmi_1.useAccount)();
+    const { switchAccount } = (0, wagmi_1.useSwitchAccount)();
+    const { user, setUser } = (0, useUserQuery_1.useUserQuery)();
+    debug("@@activeWagmiAccount", activeWagmiAccount);
+    const wallet = (0, wallets_1.ecosystemWallet)(constants_1.ecosystemWalletId, {
+        partnerId: partnerId,
+    });
+    /**
+     * Re-authenticate using existing session
+     * Also updates user state and authenticates with BSMNT
+     */
+    const reAuthenticate = (0, react_2.useCallback)(async () => {
+        debug("Re-authenticating...");
+        try {
+            const response = await app_1.default.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 (0, bsmnt_1.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 = (0, react_2.useCallback)(async () => {
+        function syncWagmiFunc() {
+            const connectors = (0, core_1.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 === constants_1.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]);
+    (0, react_2.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 = (0, react_2.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 (0, bsmnt_1.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 = (0, react_2.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_1.default.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 (0, bsmnt_1.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 = (0, react_2.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 = (0, react_2.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_1.default.logout();
+        debug("@@logout:loggedOut");
+        setIsAuthenticated(false);
+        setIsConnected(false);
+        setUser();
+        callback?.();
+    }, [activeWallet, disconnect, wallets, setIsAuthenticated, setUser, setIsConnected]);
+    const { isLoading: useAutoConnectLoading } = (0, react_3.useAutoConnect)({
+        client: thirdweb_1.client,
+        wallets: [wallet],
+        onConnect,
+        onTimeout: () => {
+            logout().catch(error => {
+                debug("@@useAuth:logout on timeout failed", { error });
+            });
+        },
+    });
+    /**
+     * useAutoConnectLoading starts as false
+     */
+    (0, react_2.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: in_app_1.preAuthenticate,
+        connect: onConnect,
+        isAuthenticating,
+        onConnect,
+        user,
+        refetchUser: authenticateUser,
+        setUser,
+    };
+}

package/dist/cjs/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;
 };

package/dist/cjs/global-account/react/hooks/useAuthentication.js

@@ -18,7 +18,7 @@ const in_app_1 = require("thirdweb/wallets/in-app");
 const wagmi_1 = require("wagmi");
 const LocalSDKProvider_1 = require("../components/B3Provider/LocalSDKProvider");
 const createWagmiConfig_1 = require("../utils/createWagmiConfig");
-const useTWAuth_1 = require("./useTWAuth");
+const useAuth_1 = require("./useAuth");
 const useUserQuery_1 = require("./useUserQuery");
 const debug = (0, debug_1.debugB3React)("useAuthentication");
 function useAuthentication(partnerId) {
@@ -36,7 +36,7 @@ function useAuthentication(partnerId) {
     const setHasStartedConnecting = (0, react_1.useAuthStore)(state => state.setHasStartedConnecting);
     const setActiveWallet = (0, react_3.useSetActiveWallet)();
     const hasStartedConnecting = (0, react_1.useAuthStore)(state => state.hasStartedConnecting);
-    const { authenticate } = (0, useTWAuth_1.useTWAuth)();
+    const { reAuthenticate } = (0, useAuth_1.useAuth)();
     const { user, setUser } = (0, useUserQuery_1.useUserQuery)();
     const useAutoConnectLoadingPrevious = (0, react_2.useRef)(false);
     const wagmiConfig = (0, createWagmiConfig_1.createWagmiConfig)({ partnerId });
@@ -96,18 +96,19 @@ function useAuthentication(partnerId) {
     (0, react_2.useEffect)(() => {
         syncWagmi();
     }, [wallets, syncWagmi]);
-    const authenticateUser = (0, react_2.useCallback)(async (wallet) => {
+    /**
+     * 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 = (0, react_2.useCallback)(async () => {
         setHasStartedConnecting(true);
-        if (!wallet) {
-            throw new Error("No wallet found during auto-connect");
-        }
-        const account = wallet ? wallet.getAccount() : activeWallet?.getAccount();
-        if (!account) {
-            throw new Error("No account found during auto-connect");
-        }
         // Try to re-authenticate first
         try {
-            const userAuth = await app_1.default.reAuthenticate();
+            const userAuth = await reAuthenticate();
             setUser(userAuth.user);
             setIsAuthenticated(true);
             setIsAuthenticating(false);
@@ -118,67 +119,50 @@ function useAuthentication(partnerId) {
             return userAuth;
         }
         catch (error) {
-            // If re-authentication fails, try fresh authentication
-            debug("Re-authentication failed, attempting fresh authentication");
-            const userAuth = await authenticate(wallet, partnerId);
-            setUser(userAuth.user);
-            setIsAuthenticated(true);
+            // 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);
-            debug("Fresh authentication successful", { userAuth });
-            // Authenticate on BSMNT with B3 JWT
-            const b3Jwt = await (0, bsmnt_1.authenticateWithB3JWT)(userAuth.accessToken);
-            debug("@@b3Jwt", b3Jwt);
-            return userAuth;
-        }
-    }, [activeWallet, partnerId, authenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting]);
-    const logout = (0, react_2.useCallback)(async (callback) => {
-        if (activeWallet) {
-            debug("@@logout:activeWallet", activeWallet);
-            disconnect(activeWallet);
-            debug("@@logout:activeWallet", activeWallet);
+            throw new Error("Authentication required. Please authenticate via Turnkey.");
         }
-        // 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_1.default.logout();
-        debug("@@logout:loggedOut");
-        setIsAuthenticated(false);
-        setIsConnected(false);
-        setUser();
-        callback?.();
-    }, [activeWallet, disconnect, wallets, setIsAuthenticated, setUser, setIsConnected]);
+    }, [reAuthenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting]);
+    /**
+     * 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 = (0, react_2.useCallback)(async (_walleAutoConnectedWith, allConnectedWallets) => {
         debug("@@useAuthentication: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("@@useAuthentication:onConnect", { wallet });
         try {
-            const wallet = allConnectedWallets.find(wallet => wallet.id.startsWith("ecosystem."));
-            if (!wallet) {
-                throw new Error("No smart wallet found during auto-connect");
-            }
-            debug("@@useAuthentication:onConnect", { wallet });
             setHasStartedConnecting(true);
             setIsConnected(true);
             setIsAuthenticating(true);
             await setActiveWallet(wallet);
-            const userAuth = await authenticateUser(wallet);
-            if (userAuth && onConnectCallback) {
-                await onConnectCallback(wallet, userAuth.accessToken);
+            // 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("@@useAuthentication:onConnect:authFailed", { authError });
+                // Don't set isAuthenticated to false here - let the Turnkey flow handle it
             }
         }
         catch (error) {
             debug("@@useAuthentication:onConnect:failed", { error });
             setIsAuthenticated(false);
             setUser(undefined);
-            await logout();
         }
         finally {
             setIsAuthenticating(false);
@@ -189,19 +173,44 @@ function useAuthentication(partnerId) {
             isConnected,
         });
     }, [
+        onConnectCallback,
+        authenticateUser,
         isAuthenticated,
         isAuthenticating,
         isConnected,
-        setHasStartedConnecting,
-        setIsConnected,
-        setIsAuthenticating,
         setActiveWallet,
-        authenticateUser,
-        onConnectCallback,
+        setHasStartedConnecting,
         setIsAuthenticated,
+        setIsAuthenticating,
+        setIsConnected,
         setUser,
-        logout,
     ]);
+    const logout = (0, react_2.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_1.default.logout();
+        debug("@@logout:loggedOut");
+        setIsAuthenticated(false);
+        setIsConnected(false);
+        setUser();
+        callback?.();
+    }, [activeWallet, disconnect, wallets, setIsAuthenticated, setUser, setIsConnected]);
     const { isLoading: useAutoConnectLoading } = (0, react_3.useAutoConnect)({
         client: thirdweb_1.client,
         wallets: [wallet],

package/dist/cjs/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/cjs/global-account/react/hooks/useTWAuth.js

@@ -4,11 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useTWAuth = useTWAuth;
+/**
+ * @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.
+ */
 const app_1 = __importDefault(require("../../../global-account/app"));
 const debug_1 = __importDefault(require("../../../shared/utils/debug"));
 const react_1 = require("react");
 const useSearchParamsSSR_1 = require("./useSearchParamsSSR");
+/**
+ * @deprecated Use useAuth() with Turnkey authentication instead
+ */
 function useTWAuth() {
+    console.warn("useTWAuth is deprecated. Please migrate to useAuth() with Turnkey authentication. See useTurnkeyAuth.ts for the new implementation.");
     const referralCode = (0, useSearchParamsSSR_1.useSearchParam)("referralCode");
     const authenticate = (0, react_1.useCallback)(async (wallet, partnerId) => {
         if (!wallet || !wallet?.getAuthToken?.())