@b3dotfun/sdk 0.1.69-alpha.17 → 0.1.69-alpha.18

package/dist/esm/global-account/better-auth-client.js

@@ -0,0 +1,13 @@
+import { createAuthClient } from "better-auth/client";
+import { B3_API_URL } from "../app.shared.js";
+export function createB3BetterAuthClient(baseURL = B3_API_URL) {
+    return createAuthClient({
+        baseURL,
+        basePath: "/auth",
+        fetchOptions: {
+            credentials: "include",
+        },
+    });
+}
+// Default singleton for standard usage
+export const betterAuthClient = createB3BetterAuthClient();

package/dist/esm/global-account/react/components/B3Provider/B3ConfigProvider.d.ts

@@ -3,6 +3,7 @@ import { CreateOrderParams } from "../../../../anyspend/react/hooks/useAnyspendC
 import { PermissionsConfig } from "../../../../global-account/types/permissions";
 import { Account } from "thirdweb/wallets";
 import { ClientType } from "../../../client-manager";
+export type AuthStrategy = "thirdweb" | "better-auth";
 export interface B3ConfigContextType {
     accountOverride?: Account;
     automaticallySetFirstEoa: boolean;
@@ -13,8 +14,9 @@ export interface B3ConfigContextType {
     partnerId: string;
     stripePublishableKey?: string;
     createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
+    authStrategy: AuthStrategy;
 }
-export declare function B3ConfigProvider({ children, accountOverride, environment, defaultPermissions, automaticallySetFirstEoa, theme, clientType, partnerId, stripePublishableKey, createClientReferenceId, }: {
+export declare function B3ConfigProvider({ children, accountOverride, environment, defaultPermissions, automaticallySetFirstEoa, theme, clientType, partnerId, stripePublishableKey, createClientReferenceId, authStrategy, }: {
     children: React.ReactNode;
     accountOverride?: Account;
     environment?: "development" | "production";
@@ -25,5 +27,6 @@ export declare function B3ConfigProvider({ children, accountOverride, environmen
     partnerId: string;
     stripePublishableKey?: string;
     createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
+    authStrategy?: AuthStrategy;
 }): import("react/jsx-runtime").JSX.Element;
 export declare function useB3Config(): B3ConfigContextType;

package/dist/esm/global-account/react/components/B3Provider/B3ConfigProvider.js

@@ -10,7 +10,7 @@ const DEFAULT_PERMISSIONS = {
     endDate: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365), // 1 year from now
 };
 const B3ConfigContext = createContext(null);
-export function B3ConfigProvider({ children, accountOverride, environment = "development", defaultPermissions = DEFAULT_PERMISSIONS, automaticallySetFirstEoa = false, theme = "light", clientType = "rest", partnerId, stripePublishableKey, createClientReferenceId, }) {
+export function B3ConfigProvider({ children, accountOverride, environment = "development", defaultPermissions = DEFAULT_PERMISSIONS, automaticallySetFirstEoa = false, theme = "light", clientType = "rest", partnerId, stripePublishableKey, createClientReferenceId, authStrategy = "thirdweb", }) {
     return (_jsx(B3ConfigContext.Provider, { value: {
             accountOverride,
             environment,
@@ -21,6 +21,7 @@ export function B3ConfigProvider({ children, accountOverride, environment = "dev
             partnerId,
             stripePublishableKey,
             createClientReferenceId,
+            authStrategy,
         }, children: children }));
 }
 export function useB3Config() {

package/dist/esm/global-account/react/components/B3Provider/B3Provider.d.ts

@@ -1,6 +1,7 @@
 import { CreateOnrampOrderParams } from "../../../../anyspend/react/hooks/useAnyspendCreateOnrampOrder";
 import { CreateOrderParams } from "../../../../anyspend/react/hooks/useAnyspendCreateOrder";
 import { PermissionsConfig } from "../../../../global-account/types/permissions";
+import type { AuthStrategy } from "./B3ConfigProvider";
 import "@relayprotocol/relay-kit-ui/styles.css";
 import { QueryClient } from "@tanstack/react-query";
 import { Account, EIP1193, Wallet } from "thirdweb/wallets";
@@ -9,7 +10,7 @@ import { ClientType } from "../../../client-manager";
 /**
  * Main B3Provider component
  */
-export declare function B3Provider({ theme, children, accountOverride, environment, automaticallySetFirstEoa, defaultEoaProvider, simDuneApiKey, toaster: _toaster, clientType, rpcUrls, partnerId, stripePublishableKey, onConnect, onLogout, connectors, overrideDefaultConnectors, createClientReferenceId, defaultPermissions, disableBSMNTAuthentication, queryClient, }: {
+export declare function B3Provider({ theme, children, accountOverride, environment, automaticallySetFirstEoa, defaultEoaProvider, simDuneApiKey, toaster: _toaster, clientType, rpcUrls, partnerId, stripePublishableKey, onConnect, onLogout, connectors, overrideDefaultConnectors, createClientReferenceId, defaultPermissions, disableBSMNTAuthentication, queryClient, authStrategy, }: {
     theme: "light" | "dark";
     children: React.ReactNode;
     accountOverride?: Account;
@@ -36,4 +37,6 @@ export declare function B3Provider({ theme, children, accountOverride, environme
     disableBSMNTAuthentication?: boolean;
     /** Provide your own QueryClient for React Query. If omitted, WalletProvider creates one internally. */
     queryClient?: QueryClient;
+    /** Auth strategy: "thirdweb" (default, ecosystem wallet) or "better-auth" (email/password via Better Auth) */
+    authStrategy?: AuthStrategy;
 }): import("react/jsx-runtime").JSX.Element;

package/dist/esm/global-account/react/components/B3Provider/B3Provider.js

@@ -10,13 +10,14 @@ import { StyleRoot } from "../StyleRoot.js";
 import { setToastContext, ToastProvider, useToastContext } from "../Toast/index.js";
 import AuthenticationProvider from "./AuthenticationProvider.js";
 import { B3ConfigProvider } from "./B3ConfigProvider.js";
+import BetterAuthProvider from "./BetterAuthProvider.js";
 import { LocalSDKProvider } from "./LocalSDKProvider.js";
 /**
  * Main B3Provider component
  */
 export function B3Provider({ theme = "light", children, accountOverride, environment, automaticallySetFirstEoa, defaultEoaProvider, simDuneApiKey, 
 // deprecated since v0.0.87
-toaster: _toaster, clientType = "rest", rpcUrls, partnerId, stripePublishableKey, onConnect, onLogout, connectors, overrideDefaultConnectors = false, createClientReferenceId, defaultPermissions, disableBSMNTAuthentication = false, queryClient, }) {
+toaster: _toaster, clientType = "rest", rpcUrls, partnerId, stripePublishableKey, onConnect, onLogout, connectors, overrideDefaultConnectors = false, createClientReferenceId, defaultPermissions, disableBSMNTAuthentication = false, queryClient, authStrategy = "thirdweb", }) {
     // Initialize Google Analytics on mount
     useEffect(() => {
         loadGA4Script();
@@ -26,7 +27,7 @@ toaster: _toaster, clientType = "rest", rpcUrls, partnerId, stripePublishableKey
         setClientType(clientType);
     }, [clientType]);
     const wagmiConfig = useMemo(() => createWagmiConfig({ partnerId, rpcUrls, connectors, overrideDefaultConnectors }), [partnerId, rpcUrls, connectors, overrideDefaultConnectors]);
-    return (_jsx(WalletProvider, { wagmiConfig: wagmiConfig, queryClient: queryClient, children: _jsx(TooltipProvider, { children: _jsx(ToastProvider, { children: _jsx(LocalSDKProvider, { onConnectCallback: onConnect, onLogoutCallback: onLogout, disableBSMNTAuthentication: disableBSMNTAuthentication, children: _jsxs(B3ConfigProvider, { accountOverride: accountOverride, environment: environment, automaticallySetFirstEoa: !!automaticallySetFirstEoa, theme: theme, clientType: clientType, partnerId: partnerId, stripePublishableKey: stripePublishableKey, createClientReferenceId: createClientReferenceId, defaultPermissions: defaultPermissions, children: [_jsx(ToastContextConnector, {}), _jsxs(RelayKitProviderWrapper, { simDuneApiKey: simDuneApiKey, children: [children, _jsx(StyleRoot, { id: "b3-root" })] }), _jsx(AuthenticationProvider, { partnerId: partnerId, automaticallySetFirstEoa: !!automaticallySetFirstEoa, defaultEoaProvider: defaultEoaProvider })] }) }) }) }) }));
+    return (_jsx(WalletProvider, { wagmiConfig: wagmiConfig, queryClient: queryClient, children: _jsx(TooltipProvider, { children: _jsx(ToastProvider, { children: _jsx(LocalSDKProvider, { onConnectCallback: onConnect, onLogoutCallback: onLogout, disableBSMNTAuthentication: disableBSMNTAuthentication, children: _jsxs(B3ConfigProvider, { accountOverride: accountOverride, environment: environment, automaticallySetFirstEoa: !!automaticallySetFirstEoa, theme: theme, clientType: clientType, partnerId: partnerId, stripePublishableKey: stripePublishableKey, createClientReferenceId: createClientReferenceId, defaultPermissions: defaultPermissions, authStrategy: authStrategy, children: [_jsx(ToastContextConnector, {}), _jsxs(RelayKitProviderWrapper, { simDuneApiKey: simDuneApiKey, children: [children, _jsx(StyleRoot, { id: "b3-root" })] }), authStrategy === "better-auth" ? (_jsx(BetterAuthProvider, { partnerId: partnerId })) : (_jsx(AuthenticationProvider, { partnerId: partnerId, automaticallySetFirstEoa: !!automaticallySetFirstEoa, defaultEoaProvider: defaultEoaProvider }))] }) }) }) }) }));
 }
 /**
  * Component to connect the toast context to the global toast API

package/dist/esm/global-account/react/components/B3Provider/BetterAuthProvider.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Parallel to AuthenticationProvider for Better Auth strategy.
+ *
+ * Manages the isAuthenticating lifecycle for Better Auth:
+ * 1. On mount, try to restore an existing Feathers JWT (from a previous login)
+ * 2. If no Feathers JWT, check for a Better Auth session (e.g. after OAuth redirect)
+ *    and exchange it for a Feathers JWT
+ * 3. If neither exists, set isAuthenticating: false so the login UI renders
+ *
+ * Also patches app.logout() so any code path that calls it (useAuthentication,
+ * useAuth, SignIn component, etc.) automatically clears the Better Auth session.
+ */
+declare const BetterAuthProvider: ({ partnerId }: {
+    partnerId: string;
+}) => null;
+export default BetterAuthProvider;

package/dist/esm/global-account/react/components/B3Provider/BetterAuthProvider.js

@@ -0,0 +1,115 @@
+import app from "../../../../global-account/app.js";
+import { useAuthStore } from "../../../../global-account/react/index.js";
+import { B3_AUTH_COOKIE_NAME } from "../../../../shared/constants/index.js";
+import { debugB3React } from "../../../../shared/utils/debug.js";
+import Cookies from "js-cookie";
+import { useEffect, useRef } from "react";
+import { betterAuthClient } from "../../../better-auth-client.js";
+import { useUserQuery } from "../../hooks/useUserQuery.js";
+const debug = debugB3React("BetterAuthProvider");
+/**
+ * Parallel to AuthenticationProvider for Better Auth strategy.
+ *
+ * Manages the isAuthenticating lifecycle for Better Auth:
+ * 1. On mount, try to restore an existing Feathers JWT (from a previous login)
+ * 2. If no Feathers JWT, check for a Better Auth session (e.g. after OAuth redirect)
+ *    and exchange it for a Feathers JWT
+ * 3. If neither exists, set isAuthenticating: false so the login UI renders
+ *
+ * Also patches app.logout() so any code path that calls it (useAuthentication,
+ * useAuth, SignIn component, etc.) automatically clears the Better Auth session.
+ */
+const BetterAuthProvider = ({ partnerId }) => {
+    const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
+    const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
+    const setIsConnected = useAuthStore(state => state.setIsConnected);
+    const { setUser } = useUserQuery();
+    const hasAttemptedRestore = useRef(false);
+    const hasPatched = useRef(false);
+    // Patch app.logout() to also clear the Better Auth session.
+    // This ensures any existing logout path (useAuthentication, useAuth, SignIn
+    // dropdown, etc.) clears both the Feathers JWT and the Better Auth session.
+    // Patch app.logout() to also clear the Better Auth session.
+    // Only handles Better Auth signOut — state cleanup (isAuthenticated, isConnected,
+    // setUser, localStorage) is handled by useAuthentication/useAuth's own logout.
+    useEffect(() => {
+        if (hasPatched.current)
+            return;
+        hasPatched.current = true;
+        const originalLogout = app.logout.bind(app);
+        app.logout = async () => {
+            debug("Patched logout: clearing Better Auth session");
+            try {
+                await betterAuthClient.signOut();
+            }
+            catch {
+                debug("Better Auth signOut failed (non-critical)");
+            }
+            return originalLogout();
+        };
+        return () => {
+            app.logout = originalLogout;
+            hasPatched.current = false;
+        };
+    }, []);
+    // Session restore on mount
+    useEffect(() => {
+        if (hasAttemptedRestore.current)
+            return;
+        hasAttemptedRestore.current = true;
+        const restoreSession = async () => {
+            debug("Attempting session restore");
+            // 1. Try existing Feathers JWT first (fastest — no network call to Better Auth)
+            try {
+                const response = await app.reAuthenticate();
+                if (response?.user) {
+                    debug("Feathers JWT restored", { userId: response.user.userId });
+                    setUser(response.user);
+                    setIsAuthenticated(true);
+                    setIsConnected(true);
+                    setIsAuthenticating(false);
+                    return;
+                }
+            }
+            catch {
+                debug("No existing Feathers JWT");
+            }
+            // 2. Check for a Better Auth session (e.g. after OAuth redirect sets a cookie)
+            try {
+                const session = await betterAuthClient.getSession();
+                if (session.data?.session?.token) {
+                    debug("Better Auth session found, exchanging for Feathers JWT", {
+                        betterAuthUserId: session.data.user?.id,
+                    });
+                    const response = await app.authenticate({
+                        strategy: "better-auth",
+                        accessToken: session.data.session.token,
+                        partnerId,
+                    });
+                    if (response.accessToken) {
+                        Cookies.set(B3_AUTH_COOKIE_NAME, response.accessToken, {
+                            secure: true,
+                            sameSite: "Lax",
+                        });
+                    }
+                    if (response.user) {
+                        setUser(response.user);
+                        setIsAuthenticated(true);
+                        setIsConnected(true);
+                    }
+                    debug("OAuth session exchanged for Feathers JWT", { userId: response.user?.userId });
+                    setIsAuthenticating(false);
+                    return;
+                }
+            }
+            catch {
+                debug("No Better Auth session to restore");
+            }
+            // 3. Nothing found — show login UI
+            setIsAuthenticating(false);
+        };
+        restoreSession();
+    }, [setIsAuthenticated, setIsAuthenticating, setIsConnected, setUser, partnerId]);
+    return null;
+};
+export default BetterAuthProvider;

package/dist/esm/global-account/react/components/SignInWithB3/BetterAuthResetPassword.d.ts

@@ -0,0 +1,21 @@
+export interface BetterAuthResetPasswordProps {
+    /** The reset token from the URL query param */
+    token: string;
+    /** Called after password is successfully reset */
+    onSuccess?: () => void;
+    /** Called on error */
+    onError?: (error: Error) => void;
+    /** Optional class name */
+    className?: string;
+}
+/**
+ * Standalone reset password form. Render this on your reset password page.
+ * Reads the token from props (extract it from the URL query string).
+ *
+ * Usage:
+ * ```tsx
+ * const token = new URLSearchParams(window.location.search).get("token");
+ * <BetterAuthResetPassword token={token} onSuccess={() => navigate("/login")} />
+ * ```
+ */
+export declare function BetterAuthResetPassword({ token, onSuccess, onError, className }: BetterAuthResetPasswordProps): import("react/jsx-runtime").JSX.Element;

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

@@ -0,0 +1,64 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Button, Input } from "../../../../global-account/react/index.js";
+import { debugB3React } from "../../../../shared/utils/debug.js";
+import { useState } from "react";
+import { useBetterAuth } from "../../hooks/useBetterAuth.js";
+const debug = debugB3React("BetterAuthResetPassword");
+/**
+ * Standalone reset password form. Render this on your reset password page.
+ * Reads the token from props (extract it from the URL query string).
+ *
+ * Usage:
+ * ```tsx
+ * const token = new URLSearchParams(window.location.search).get("token");
+ * <BetterAuthResetPassword token={token} onSuccess={() => navigate("/login")} />
+ * ```
+ */
+export function BetterAuthResetPassword({ token, onSuccess, onError, className }) {
+    const { resetPassword } = useBetterAuth();
+    const [password, setPassword] = useState("");
+    const [confirmPassword, setConfirmPassword] = useState("");
+    const [isLoading, setIsLoading] = useState(false);
+    const [error, setError] = useState(null);
+    const [success, setSuccess] = useState(false);
+    const handleSubmit = async () => {
+        if (!password) {
+            setError("Please enter a new password");
+            return;
+        }
+        if (password.length < 8) {
+            setError("Password must be at least 8 characters");
+            return;
+        }
+        if (password !== confirmPassword) {
+            setError("Passwords do not match");
+            return;
+        }
+        try {
+            setIsLoading(true);
+            setError(null);
+            await resetPassword(password, token);
+            setSuccess(true);
+            debug("Password reset successful");
+            onSuccess?.();
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : "Password reset failed";
+            setError(message);
+            debug("Password reset failed", err);
+            onError?.(err);
+        }
+        finally {
+            setPassword("");
+            setConfirmPassword("");
+            setIsLoading(false);
+        }
+    };
+    if (!token) {
+        return (_jsx("div", { className: `w-full max-w-[400px] px-6 text-center ${className || ""}`, children: _jsx("p", { className: "text-sm text-red-500", children: "Invalid or missing reset token." }) }));
+    }
+    return (_jsxs("div", { className: `w-full max-w-[400px] px-6 ${className || ""}`, children: [_jsxs("div", { className: "mb-10 text-center", children: [_jsx("h1", { className: "text-[28px] font-semibold tracking-tight text-gray-900 dark:text-gray-100", children: success ? "Password reset" : "Set new password" }), _jsx("p", { className: "mt-3 text-[15px] text-gray-500 dark:text-gray-400", children: success ? "Your password has been updated." : "Enter your new password below." })] }), success ? (_jsx("div", { className: "space-y-4 text-center", children: _jsx("div", { className: "mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-green-100", children: _jsx("svg", { className: "h-6 w-6 text-green-600", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", children: _jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M5 13l4 4L19 7" }) }) }) })) : (_jsxs("div", { className: "space-y-5", children: [_jsxs("div", { children: [_jsx("label", { className: "mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300", children: "New password" }), _jsx(Input, { type: "password", placeholder: "At least 8 characters", value: password, onChange: e => setPassword(e.target.value), disabled: isLoading, className: "h-11 px-4 text-[15px]" })] }), _jsxs("div", { children: [_jsx("label", { className: "mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300", children: "Confirm password" }), _jsx(Input, { type: "password", placeholder: "Repeat your password", value: confirmPassword, onChange: e => setConfirmPassword(e.target.value), disabled: isLoading, onKeyDown: e => {
+                                    if (e.key === "Enter")
+                                        handleSubmit();
+                                }, className: "h-11 px-4 text-[15px]" })] }), error && _jsx("p", { className: "text-sm text-red-500", children: error }), _jsx(Button, { onClick: handleSubmit, disabled: isLoading, className: "h-11 w-full bg-gray-900 text-[15px] font-medium text-white hover:bg-gray-800 dark:bg-white dark:text-gray-900 dark:hover:bg-gray-100", children: isLoading ? "Resetting..." : "Reset password" })] }))] }));
+}

package/dist/esm/global-account/react/components/SignInWithB3/BetterAuthSignIn.d.ts

@@ -0,0 +1,34 @@
+import { type BetterAuthSocialProvider } from "../../hooks/useBetterAuth";
+export interface BetterAuthSignInProps {
+    /** Title displayed above the form. Default: "Welcome back" for sign-in, "Create an account" for sign-up */
+    title?: string;
+    /** Subtitle displayed below the title */
+    subtitle?: string;
+    /** Which social providers to show. Defaults to all. Pass empty array to hide. */
+    socialProviders?: BetterAuthSocialProvider[];
+    /** Show email/password form. Default: true */
+    showEmail?: boolean;
+    /** URL to redirect to after password reset link is clicked. Token is appended as ?token=... */
+    passwordResetRedirectTo?: string;
+    /** Called after successful authentication */
+    onSuccess?: () => void;
+    /** Called on authentication error */
+    onError?: (error: Error) => void;
+    /** Optional class name for the root container */
+    className?: string;
+}
+/**
+ * Standalone inline sign-in component for Better Auth.
+ *
+ * Renders directly — no modal, no button wrapper. Designed for full-page
+ * sign-in layouts (e.g., B3OS web with branding on the left, form on the right).
+ *
+ * Usage:
+ * ```tsx
+ * <BetterAuthSignIn
+ *   socialProviders={["google", "github"]}
+ *   onSuccess={() => router.push("/dashboard")}
+ * />
+ * ```
+ */
+export declare function BetterAuthSignIn({ title, subtitle, socialProviders, showEmail, passwordResetRedirectTo, onSuccess, onError, className, }: BetterAuthSignInProps): import("react/jsx-runtime").JSX.Element | null;

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

@@ -0,0 +1,146 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { Button, Input, useAuthStore } from "../../../../global-account/react/index.js";
+import { debugB3React } from "../../../../shared/utils/debug.js";
+import { useState } from "react";
+import { useBetterAuth } from "../../hooks/useBetterAuth.js";
+import { strategyIcons, strategyLabels } from "./utils/signInUtils.js";
+const debug = debugB3React("BetterAuthSignIn");
+const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+const DEFAULT_SOCIAL_PROVIDERS = [
+    { id: "google", label: "Google" },
+    { id: "github", label: "GitHub" },
+    { id: "discord", label: "Discord" },
+    { id: "microsoft", label: "Microsoft" },
+    { id: "slack", label: "Slack" },
+];
+/**
+ * Standalone inline sign-in component for Better Auth.
+ *
+ * Renders directly — no modal, no button wrapper. Designed for full-page
+ * sign-in layouts (e.g., B3OS web with branding on the left, form on the right).
+ *
+ * Usage:
+ * ```tsx
+ * <BetterAuthSignIn
+ *   socialProviders={["google", "github"]}
+ *   onSuccess={() => router.push("/dashboard")}
+ * />
+ * ```
+ */
+export function BetterAuthSignIn({ title, subtitle = "Enter your credentials to access your account", socialProviders = DEFAULT_SOCIAL_PROVIDERS.map(p => p.id), showEmail = true, passwordResetRedirectTo, onSuccess, onError, className, }) {
+    const { signInWithEmail, signUpWithEmail, signInWithSocial, requestPasswordReset } = useBetterAuth();
+    const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+    const [mode, setMode] = useState("sign-in");
+    const [email, setEmail] = useState("");
+    const [password, setPassword] = useState("");
+    const [name, setName] = useState("");
+    const [isLoading, setIsLoading] = useState(false);
+    const [loadingProvider, setLoadingProvider] = useState(null);
+    const [error, setError] = useState(null);
+    const [resetEmailSent, setResetEmailSent] = useState(false);
+    const resolvedTitle = title ||
+        (mode === "forgot-password" ? "Reset password" : mode === "sign-in" ? "Welcome back" : "Create an account");
+    const resolvedSubtitle = mode === "forgot-password"
+        ? "Enter your email and we'll send you a reset link"
+        : subtitle || "Enter your credentials to access your account";
+    const handleForgotPassword = async () => {
+        const normalizedEmail = email.trim().toLowerCase();
+        if (!EMAIL_REGEX.test(normalizedEmail)) {
+            setError("Please enter a valid email address");
+            return;
+        }
+        try {
+            setIsLoading(true);
+            setError(null);
+            await requestPasswordReset(normalizedEmail, passwordResetRedirectTo);
+            setResetEmailSent(true);
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : "Failed to send reset email";
+            setError(message);
+        }
+        finally {
+            setIsLoading(false);
+        }
+    };
+    const providers = socialProviders
+        .map(id => DEFAULT_SOCIAL_PROVIDERS.find(p => p.id === id))
+        .filter((p) => !!p);
+    if (isAuthenticated) {
+        return null;
+    }
+    const handleEmailSubmit = async () => {
+        const normalizedEmail = email.trim().toLowerCase();
+        if (!EMAIL_REGEX.test(normalizedEmail)) {
+            setError("Please enter a valid email address");
+            return;
+        }
+        if (!password) {
+            setError("Please enter a password");
+            return;
+        }
+        if (mode === "sign-up" && !name.trim()) {
+            setError("Please enter your name");
+            return;
+        }
+        try {
+            setIsLoading(true);
+            setError(null);
+            if (mode === "sign-up") {
+                await signUpWithEmail(normalizedEmail, password, name.trim());
+            }
+            else {
+                await signInWithEmail(normalizedEmail, password);
+            }
+            debug("Auth successful");
+            onSuccess?.();
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : "Authentication failed";
+            setError(message);
+            debug("Auth failed", err);
+            onError?.(err);
+        }
+        finally {
+            setPassword("");
+            setIsLoading(false);
+        }
+    };
+    const handleSocialSignIn = async (provider) => {
+        try {
+            setIsLoading(true);
+            setLoadingProvider(provider);
+            setError(null);
+            await signInWithSocial(provider);
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : `Sign in failed`;
+            setError(message);
+            onError?.(err);
+            setIsLoading(false);
+            setLoadingProvider(null);
+        }
+    };
+    return (_jsxs("div", { className: `w-full max-w-[400px] px-6 ${className || ""}`, children: [_jsxs("div", { className: "mb-10 text-center", children: [_jsx("h1", { className: "text-[28px] font-semibold tracking-tight text-gray-900 dark:text-gray-100", children: resolvedTitle }), _jsx("p", { className: "mt-3 text-[15px] text-gray-500 dark:text-gray-400", children: resolvedSubtitle })] }), mode === "forgot-password" && (_jsxs("div", { className: "space-y-5", children: [resetEmailSent ? (_jsxs("div", { className: "space-y-4 text-center", children: [_jsx("div", { className: "mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-green-100", children: _jsx("svg", { className: "h-6 w-6 text-green-600", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", children: _jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M5 13l4 4L19 7" }) }) }), _jsx("p", { className: "text-[15px] text-gray-600 dark:text-gray-300", children: "Check your email for a reset link." })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { children: [_jsx("label", { className: "mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300", children: "Email" }), _jsx(Input, { type: "email", placeholder: "name@company.com", value: email, onChange: e => setEmail(e.target.value), disabled: isLoading, onKeyDown: e => {
+                                            if (e.key === "Enter")
+                                                handleForgotPassword();
+                                        }, className: "h-11 px-4 text-[15px]" })] }), error && _jsx("p", { className: "text-sm text-red-500", children: error }), _jsx(Button, { onClick: handleForgotPassword, disabled: isLoading, className: "h-11 w-full bg-gray-900 text-[15px] font-medium text-white hover:bg-gray-800 dark:bg-white dark:text-gray-900 dark:hover:bg-gray-100", children: isLoading ? "Sending..." : "Send reset link" })] })), _jsx("p", { className: "mt-8 text-center text-[14px] text-gray-500 dark:text-gray-400", children: _jsx("button", { onClick: () => {
+                                setMode("sign-in");
+                                setError(null);
+                                setResetEmailSent(false);
+                            }, className: "font-medium text-blue-600 hover:text-blue-500 dark:text-blue-400", children: "Back to sign in" }) })] })), showEmail && mode !== "forgot-password" && (_jsxs("div", { className: "space-y-5", children: [mode === "sign-up" && (_jsxs("div", { children: [_jsx("label", { className: "mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300", children: "Name" }), _jsx(Input, { type: "text", placeholder: "Your name", value: name, onChange: e => setName(e.target.value), disabled: isLoading, className: "h-11 px-4 text-[15px]" })] })), _jsxs("div", { children: [_jsx("label", { className: "mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300", children: "Email" }), _jsx(Input, { type: "email", placeholder: "name@company.com", value: email, onChange: e => setEmail(e.target.value), disabled: isLoading, className: "h-11 px-4 text-[15px]" })] }), _jsxs("div", { children: [_jsxs("div", { className: "mb-2 flex items-center justify-between", children: [_jsx("label", { className: "block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300", children: "Password" }), mode === "sign-in" && (_jsx("button", { type: "button", onClick: () => {
+                                            setMode("forgot-password");
+                                            setError(null);
+                                        }, className: "text-xs font-medium text-blue-600 hover:text-blue-500 dark:text-blue-400", children: "Forgot password?" }))] }), _jsx(Input, { type: "password", placeholder: "Password", value: password, onChange: e => setPassword(e.target.value), disabled: isLoading, onKeyDown: e => {
+                                    if (e.key === "Enter")
+                                        handleEmailSubmit();
+                                }, className: "h-11 px-4 text-[15px]" })] }), error && _jsx("p", { className: "text-sm text-red-500", children: error }), _jsx(Button, { onClick: handleEmailSubmit, disabled: isLoading, className: "h-11 w-full bg-gray-900 text-[15px] font-medium text-white hover:bg-gray-800 dark:bg-white dark:text-gray-900 dark:hover:bg-gray-100", children: isLoading ? "Loading..." : mode === "sign-in" ? "Sign in" : "Sign up" })] })), providers.length > 0 && mode !== "forgot-password" && (_jsxs(_Fragment, { children: [showEmail && (_jsxs("div", { className: "my-8 flex items-center gap-4", children: [_jsx("div", { className: "h-px flex-1 bg-gray-200 dark:bg-gray-700" }), _jsx("span", { className: "text-xs text-gray-400", children: "Or continue with" }), _jsx("div", { className: "h-px flex-1 bg-gray-200 dark:bg-gray-700" })] })), _jsx("div", { className: "space-y-4", children: providers.map(provider => {
+                            const icon = strategyIcons[provider.id];
+                            const label = strategyLabels[provider.id] || provider.label;
+                            const isProviderLoading = loadingProvider === provider.id;
+                            return (_jsxs("button", { onClick: () => handleSocialSignIn(provider.id), disabled: isLoading, style: { paddingTop: "12px", paddingBottom: "12px" }, className: "flex w-full items-center justify-center gap-3 rounded-lg border border-gray-200 bg-white px-4 text-[14px] font-medium text-gray-700 transition-colors hover:bg-gray-50 disabled:opacity-50 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-200 dark:hover:bg-gray-700", children: [isProviderLoading ? (_jsxs("svg", { className: "h-5 w-5 animate-spin text-gray-400", viewBox: "0 0 24 24", fill: "none", children: [_jsx("circle", { className: "opacity-25", cx: "12", cy: "12", r: "10", stroke: "currentColor", strokeWidth: "4" }), _jsx("path", { className: "opacity-75", fill: "currentColor", d: "M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z" })] })) : (icon && _jsx("img", { src: icon, alt: "", className: "h-5 w-5" })), _jsx("span", { children: isProviderLoading ? "Redirecting..." : label })] }, provider.id));
+                        }) })] })), showEmail && mode !== "forgot-password" && (_jsxs("p", { className: "mt-8 text-center text-[14px] text-gray-500 dark:text-gray-400", children: [mode === "sign-in" ? "Don't have an account? " : "Already have an account? ", _jsx("button", { onClick: () => {
+                            setMode(mode === "sign-in" ? "sign-up" : "sign-in");
+                            setError(null);
+                        }, disabled: isLoading, className: "font-medium text-blue-600 hover:text-blue-500 dark:text-blue-400", children: mode === "sign-in" ? "Sign up" : "Sign in" })] }))] }));
+}

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

@@ -1,5 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Loading, useAuthentication, useAuthStore, useB3Config, useGetAllTWSigners, useModalStore, } from "../../../../global-account/react/index.js";
+import { LoginStepBetterAuth } from "./steps/LoginStepBetterAuth.js";
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
@@ -13,18 +14,20 @@ const MAX_REFETCH_ATTEMPTS = 20;
  * Handles different login providers, authentication steps, and session key management
  */
 export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin = false, source = "signInWithB3Button", signersEnabled = false, }) {
-    const { automaticallySetFirstEoa } = useB3Config();
+    const { automaticallySetFirstEoa, authStrategy } = useB3Config();
     // skipAutoConnect: this component intentionally logs out on mount to show a fresh login screen.
     // AuthenticationProvider is the sole owner of useAutoConnect to avoid competing auth cycles.
     const { user, logout } = useAuthentication(partnerId, { skipAutoConnect: true });
     // Tracks whether the pre-login logout has finished.
     // We must not render ConnectEmbed until logout (wallet disconnect) completes,
     // otherwise the wallet state disrupts ConnectEmbed causing a blank modal.
-    const [readyToShowLogin, setReadyToShowLogin] = useState(source === "requestPermissions");
+    const [readyToShowLogin, setReadyToShowLogin] = useState(source === "requestPermissions" || authStrategy === "better-auth");
     const hasLoggedOutRef = useRef(false);
     useEffect(() => {
         if (hasLoggedOutRef.current)
             return;
+        if (authStrategy === "better-auth")
+            return;
         if (source !== "requestPermissions") {
             debug("Logging out before login");
             hasLoggedOutRef.current = true;
@@ -32,7 +35,7 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
                 setReadyToShowLogin(true);
             });
         }
-    }, [source, logout]);
+    }, [source, logout, authStrategy]);
     const [step, setStep] = useState(source === "requestPermissions" ? null : "login");
     const [sessionKeyAdded, setSessionKeyAdded] = useState(source === "requestPermissions" ? true : false);
     const { setB3ModalContentType, setB3ModalOpen, isOpen, contentType } = useModalStore();
@@ -240,6 +243,9 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         if (!readyToShowLogin || isAuthenticating || isFetchingSigners) {
             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 (authStrategy === "better-auth") {
+            content = _jsx(LoginStepBetterAuth, { onSuccess: () => handleLoginSuccess({}), onError: onError });
+        }
         else {
             // Custom strategy
             if (strategies?.[0] === "privy") {

package/dist/esm/global-account/react/components/SignInWithB3/steps/LoginStepBetterAuth.d.ts

@@ -0,0 +1,6 @@
+interface LoginStepBetterAuthProps {
+    onSuccess?: () => void;
+    onError?: (error: Error) => Promise<void>;
+}
+export declare function LoginStepBetterAuth({ onSuccess, onError }: LoginStepBetterAuthProps): import("react/jsx-runtime").JSX.Element;
+export {};