@b3dotfun/sdk 0.1.69 → 0.1.70-alpha.2

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

@@ -5,7 +5,7 @@ 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 { useCallback, useContext, useEffect, useMemo, useRef } from "react";
 import { useActiveWallet, useAutoConnect, useConnectedWallets, useDisconnect, useSetActiveWallet, } from "thirdweb/react";
 import { ecosystemWallet } from "thirdweb/wallets";
 import { preAuthenticate } from "thirdweb/wallets/in-app";
@@ -16,7 +16,7 @@ import { useTWAuth } from "./useTWAuth.js";
 import { useUserQuery } from "./useUserQuery.js";
 const debug = debugB3React("useAuthentication");
 export function useAuthentication(partnerId, { skipAutoConnect = false } = {}) {
-    const { onConnectCallback, onLogoutCallback } = useContext(LocalSDKContext);
+    const { onConnectCallback, onLogoutCallback, disableBSMNTAuthentication } = useContext(LocalSDKContext);
     const { disconnect } = useDisconnect();
     const wallets = useConnectedWallets();
     // Keep refs so logout() always disconnects current wallets, not stale closure values.
@@ -48,7 +48,7 @@ export function useAuthentication(partnerId, { skipAutoConnect = false } = {}) {
     const { authenticate } = useTWAuth();
     const { user, setUser } = useUserQuery();
     const useAutoConnectLoadingPrevious = useRef(false);
-    const wagmiConfig = createWagmiConfig({ partnerId });
+    const wagmiConfig = useMemo(() => createWagmiConfig({ partnerId }), [partnerId]);
     const { connect } = useConnect();
     const activeWagmiAccount = useAccount();
     const { switchAccount } = useSwitchAccount();
@@ -99,9 +99,7 @@ export function useAuthentication(partnerId, { skipAutoConnect = false } = {}) {
             });
         }
         syncWagmiFunc();
-        // wagmi config shouldn't change
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [partnerId, wallets]);
+    }, [wagmiConfig, wallets, connect, switchAccount]);
     useEffect(() => {
         syncWagmi();
     }, [wallets, syncWagmi]);
@@ -121,9 +119,11 @@ export function useAuthentication(partnerId, { skipAutoConnect = false } = {}) {
             setIsAuthenticated(true);
             setIsAuthenticating(false);
             debug("Re-authenticated successfully", { userAuth });
-            // Authenticate on BSMNT with B3 JWT
-            const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
-            debug("@@b3Jwt", b3Jwt);
+            if (!disableBSMNTAuthentication) {
+                // Authenticate on BSMNT with B3 JWT
+                const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+                debug("@@b3Jwt", b3Jwt);
+            }
             return userAuth;
         }
         catch (error) {
@@ -134,12 +134,23 @@ export function useAuthentication(partnerId, { skipAutoConnect = false } = {}) {
             setIsAuthenticated(true);
             setIsAuthenticating(false);
             debug("Fresh authentication successful", { userAuth });
-            // Authenticate on BSMNT with B3 JWT
-            const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
-            debug("@@b3Jwt", b3Jwt);
+            if (!disableBSMNTAuthentication) {
+                // Authenticate on BSMNT with B3 JWT
+                const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+                debug("@@b3Jwt", b3Jwt);
+            }
             return userAuth;
         }
-    }, [activeWallet, partnerId, authenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting]);
+    }, [
+        activeWallet,
+        partnerId,
+        authenticate,
+        setIsAuthenticated,
+        setIsAuthenticating,
+        setUser,
+        setHasStartedConnecting,
+        disableBSMNTAuthentication,
+    ]);
     const logout = useCallback(async (callback) => {
         // Disconnect ecosystem/smart wallets from the connected wallets list.
         // EOA wallets (MetaMask, Coinbase Wallet) are left in the list so they can

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

@@ -1,7 +1,10 @@
+import { EIP1193 } from "thirdweb/wallets";
 /**
- * Hook to automatically select the first EOA wallet when user is authenticated
- * Only auto-selects if the last auth was via wallet or no previous auth provider
+ * Hook to automatically connect a default EOA provider (if given) and
+ * select the first EOA wallet when user is authenticated.
+ * Only auto-selects if the last auth was via wallet or no previous auth provider.
  */
-export declare function useAutoSelectWallet({ enabled }: {
+export declare function useAutoSelectWallet({ enabled, defaultEoaProvider, }: {
     enabled: boolean;
+    defaultEoaProvider?: EIP1193.EIP1193Provider;
 }): void;

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

@@ -1,16 +1,44 @@
+import { client } from "../../../shared/utils/thirdweb.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
-import { useCallback, useEffect } from "react";
-import { getLastAuthProvider, useConnectedWallets, useSetActiveWallet } from "thirdweb/react";
+import { useCallback, useEffect, useRef } from "react";
+import { getLastAuthProvider, useAddConnectedWallet, useConnectedWallets, useSetActiveWallet } from "thirdweb/react";
+import { EIP1193 } from "thirdweb/wallets";
 import { useAuthStore } from "../stores/index.js";
 const debug = debugB3React("useAutoSelectWallet");
 /**
- * Hook to automatically select the first EOA wallet when user is authenticated
- * Only auto-selects if the last auth was via wallet or no previous auth provider
+ * Hook to automatically connect a default EOA provider (if given) and
+ * select the first EOA wallet when user is authenticated.
+ * Only auto-selects if the last auth was via wallet or no previous auth provider.
  */
-export function useAutoSelectWallet({ enabled }) {
+export function useAutoSelectWallet({ enabled, defaultEoaProvider, }) {
     const isAuthenticated = useAuthStore(state => state.isAuthenticated);
     const wallets = useConnectedWallets();
     const setActiveWallet = useSetActiveWallet();
+    const addConnectedWallet = useAddConnectedWallet();
+    const hasConnectedProvider = useRef(false);
+    // Auto-connect the default EOA provider (e.g. Farcaster frame wallet) on mount.
+    // Uses useAddConnectedWallet instead of useConnect so the wallet is added to
+    // connectedWallets WITHOUT becoming the active wallet. This prevents
+    // useAuthentication's logout/onTimeout from disconnecting it (logout only
+    // disconnects ecosystem wallets and the active wallet).
+    useEffect(() => {
+        if (!defaultEoaProvider || hasConnectedProvider.current)
+            return;
+        hasConnectedProvider.current = true;
+        const connectDefaultProvider = async () => {
+            try {
+                const wallet = EIP1193.fromProvider({ provider: defaultEoaProvider });
+                await wallet.connect({ client });
+                addConnectedWallet(wallet);
+                debug("Auto-connected default EOA provider", wallet.id);
+            }
+            catch (error) {
+                debug("Failed to auto-connect default EOA provider", error);
+                hasConnectedProvider.current = false;
+            }
+        };
+        connectDefaultProvider();
+    }, [defaultEoaProvider, addConnectedWallet]);
     const setWallet = useCallback((wallet) => {
         debug("@@setWallet", wallet.id, wallet.getAccount()?.address);
         setActiveWallet(wallet);