@b3dotfun/sdk 0.1.69-alpha.2 → 0.1.69-alpha.21

package/src/global-account/react/components/SignInWithB3/components/AuthButton.tsx

@@ -1,5 +1,11 @@
 import { Button } from "../../custom/Button";
-import { strategyIcons } from "../utils/signInUtils";
+import { Github, Mail } from "lucide-react";
+import { strategyIcons, strategyLabels } from "../utils/signInUtils";
+
+const fallbackIcons = {
+  github: Github,
+  email: Mail,
+} as const;
 
 export function AuthButton({
   strategy,
@@ -10,14 +16,27 @@ export function AuthButton({
   onClick: () => void;
   isLoading: boolean;
 }) {
+  const strategyIcon = strategyIcons[strategy];
+  const strategyLabel = strategyLabels[strategy] || strategy;
+  const FallbackIcon = fallbackIcons[strategy as keyof typeof fallbackIcons];
+  const buttonLabel = `Sign in with ${strategyLabel}`;
+
   return (
     <Button
       key={strategy}
       onClick={onClick}
       disabled={isLoading}
+      aria-label={buttonLabel}
+      title={buttonLabel}
       className="flex w-full items-center justify-center bg-gray-100 px-2 py-3 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
     >
-      <img src={strategyIcons[strategy]} className="h-9 w-9" />
+      {strategyIcon ? (
+        <img src={strategyIcon} alt={`${strategyLabel} icon`} className="h-9 w-9" />
+      ) : FallbackIcon ? (
+        <FallbackIcon className="h-9 w-9 text-gray-900 dark:text-gray-100" />
+      ) : (
+        <span className="text-sm font-semibold text-gray-900 dark:text-gray-100">{strategyLabel.charAt(0)}</span>
+      )}
     </Button>
   );
 }

package/src/global-account/react/components/SignInWithB3/steps/LoginStepBetterAuth.tsx

@@ -0,0 +1,308 @@
+import { Button, Input, LoginStepContainer, useB3Config } from "@b3dotfun/sdk/global-account/react";
+import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
+import { useState } from "react";
+import {
+  EmailVerificationRequiredError,
+  type BetterAuthSocialProvider,
+  useBetterAuth,
+} from "../../../hooks/useBetterAuth";
+import { AuthButton } from "../components/AuthButton";
+
+const debug = debugB3React("LoginStepBetterAuth");
+const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+
+const SOCIAL_PROVIDERS: { id: BetterAuthSocialProvider; label: string }[] = [
+  { id: "google", label: "Google" },
+  { id: "github", label: "GitHub" },
+  { id: "discord", label: "Discord" },
+  { id: "microsoft", label: "Microsoft" },
+  { id: "slack", label: "Slack" },
+];
+
+interface LoginStepBetterAuthProps {
+  onSuccess?: () => void;
+  onError?: (error: Error) => Promise<void>;
+}
+
+export function LoginStepBetterAuth({ onSuccess, onError }: LoginStepBetterAuthProps) {
+  const { partnerId } = useB3Config();
+  const { signInWithEmail, signUpWithEmail, signInWithSocial, requestPasswordReset } = useBetterAuth();
+
+  const [mode, setMode] = useState<"sign-in" | "sign-up" | "forgot-password">("sign-in");
+  const [showEmailForm, setShowEmailForm] = useState(false);
+  const [email, setEmail] = useState("");
+  const [password, setPassword] = useState("");
+  const [name, setName] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [resetEmailSent, setResetEmailSent] = useState(false);
+  const [verificationSent, setVerificationSent] = useState(false);
+
+  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") {
+        debug("Signing up", { email: normalizedEmail, name: name.trim() });
+        await signUpWithEmail(normalizedEmail, password, name.trim());
+      } else {
+        debug("Signing in", { email: normalizedEmail });
+        await signInWithEmail(normalizedEmail, password);
+      }
+
+      debug("Auth successful");
+      onSuccess?.();
+    } catch (err) {
+      if (err instanceof EmailVerificationRequiredError) {
+        setVerificationSent(true);
+        setError(null);
+      } else {
+        const message = err instanceof Error ? err.message : "Authentication failed";
+        setError(message);
+        await onError?.(err as Error);
+      }
+      debug("Auth failed", err);
+    } finally {
+      setPassword("");
+      setIsLoading(false);
+    }
+  };
+
+  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);
+      setResetEmailSent(true);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : "Failed to send reset email";
+      setError(message);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleSocialSignIn = async (provider: BetterAuthSocialProvider) => {
+    try {
+      setIsLoading(true);
+      setError(null);
+      await signInWithSocial(provider);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : `${provider} sign in failed`;
+      setError(message);
+      await onError?.(err as Error);
+      setIsLoading(false);
+    }
+  };
+
+  if (verificationSent) {
+    return (
+      <LoginStepContainer partnerId={partnerId}>
+        <div className="mb-6 w-full space-y-4 px-3 text-center">
+          <div className="mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-green-100">
+            <svg className="h-6 w-6 text-green-600" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+              <path
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                strokeWidth={2}
+                d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"
+              />
+            </svg>
+          </div>
+          <p className="text-sm font-medium text-gray-900 dark:text-gray-100">Check your email</p>
+          <p className="text-xs text-gray-500 dark:text-gray-400">
+            We sent a verification link to <span className="font-medium text-gray-700 dark:text-gray-200">{email}</span>
+            . Verify your account, then come back and sign in.
+          </p>
+          <button
+            onClick={() => {
+              setVerificationSent(false);
+              setMode("sign-in");
+              setShowEmailForm(true);
+              setPassword("");
+            }}
+            className="text-sm text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-300"
+          >
+            Back to sign in
+          </button>
+        </div>
+      </LoginStepContainer>
+    );
+  }
+
+  return (
+    <LoginStepContainer partnerId={partnerId}>
+      {mode === "forgot-password" ? (
+        <div className="mb-6 w-full space-y-3 px-3">
+          <p className="text-center text-sm font-medium text-gray-900 dark:text-gray-100">Reset password</p>
+          <p className="text-center text-xs text-gray-500">Enter your email and we'll send you a reset link</p>
+
+          {resetEmailSent ? (
+            <div className="space-y-3 py-4 text-center">
+              <p className="text-sm text-green-600">Check your email for a reset link.</p>
+            </div>
+          ) : (
+            <>
+              <Input
+                type="email"
+                placeholder="you@example.com"
+                value={email}
+                onChange={event => setEmail(event.target.value)}
+                disabled={isLoading}
+                onKeyDown={event => {
+                  if (event.key === "Enter") handleForgotPassword();
+                }}
+              />
+
+              {error && <p className="text-sm text-red-500">{error}</p>}
+
+              <Button onClick={handleForgotPassword} disabled={isLoading} className="w-full">
+                {isLoading ? "Sending..." : "Send reset link"}
+              </Button>
+            </>
+          )}
+
+          <button
+            onClick={() => {
+              setMode("sign-in");
+              setShowEmailForm(true);
+              setError(null);
+              setResetEmailSent(false);
+            }}
+            className="w-full text-center text-sm text-gray-500 hover:text-gray-700"
+          >
+            Back to sign in
+          </button>
+        </div>
+      ) : showEmailForm ? (
+        <div className="mb-6 w-full space-y-3 px-3">
+          <p className="text-center text-sm font-medium text-gray-900 dark:text-gray-100">
+            {mode === "sign-in" ? "Sign in with email" : "Create an account"}
+          </p>
+
+          {mode === "sign-up" && (
+            <Input
+              type="text"
+              placeholder="Your name"
+              value={name}
+              onChange={event => setName(event.target.value)}
+              disabled={isLoading}
+            />
+          )}
+
+          <Input
+            type="email"
+            placeholder="you@example.com"
+            value={email}
+            onChange={event => setEmail(event.target.value)}
+            disabled={isLoading}
+          />
+
+          <Input
+            type="password"
+            placeholder="Password"
+            value={password}
+            onChange={event => setPassword(event.target.value)}
+            disabled={isLoading}
+            onKeyDown={event => {
+              if (event.key === "Enter") handleEmailSubmit();
+            }}
+          />
+
+          {error && <p className="text-sm text-red-500">{error}</p>}
+
+          <Button onClick={handleEmailSubmit} disabled={isLoading} className="w-full">
+            {isLoading ? "Loading..." : mode === "sign-in" ? "Sign in" : "Sign up"}
+          </Button>
+
+          {mode === "sign-in" && (
+            <button
+              onClick={() => {
+                setMode("forgot-password");
+                setError(null);
+              }}
+              disabled={isLoading}
+              className="w-full text-center text-xs text-gray-500 hover:text-gray-700"
+            >
+              Forgot password?
+            </button>
+          )}
+
+          <button
+            onClick={() => {
+              setMode(mode === "sign-in" ? "sign-up" : "sign-in");
+              setError(null);
+            }}
+            disabled={isLoading}
+            className="w-full text-center text-sm text-gray-500 hover:text-gray-700"
+          >
+            {mode === "sign-in" ? "Don't have an account? Sign up" : "Already have an account? Sign in"}
+          </button>
+
+          <Button
+            variant="outline"
+            onClick={() => {
+              setShowEmailForm(false);
+              setError(null);
+            }}
+            disabled={isLoading}
+            className="w-full"
+          >
+            Back
+          </Button>
+        </div>
+      ) : (
+        <div className="mb-6 w-full space-y-4 px-3">
+          {/* Social providers */}
+          <div className="grid w-full grid-cols-3 gap-4">
+            {SOCIAL_PROVIDERS.map(provider => (
+              <AuthButton
+                key={provider.id}
+                strategy={provider.id}
+                onClick={() => handleSocialSignIn(provider.id)}
+                isLoading={isLoading}
+              />
+            ))}
+          </div>
+
+          {/* Divider */}
+          <div className="flex items-center gap-3">
+            <div className="h-px flex-1 bg-gray-200" />
+            <span className="text-xs text-gray-400">or</span>
+            <div className="h-px flex-1 bg-gray-200" />
+          </div>
+
+          {/* Email option */}
+          <AuthButton strategy="email" onClick={() => setShowEmailForm(true)} isLoading={isLoading} />
+
+          {error && <p className="text-center text-sm text-red-500">{error}</p>}
+        </div>
+      )}
+    </LoginStepContainer>
+  );
+}

package/src/global-account/react/components/SignInWithB3/steps/LoginStepCustom.tsx

@@ -3,6 +3,7 @@ import {
   AuthButton,
   Button,
   getConnectOptionsFromStrategy,
+  Input,
   isWalletType,
   LoginStepContainer,
   useAuthentication,
@@ -11,12 +12,21 @@ import {
   useConnect,
   WalletRow,
 } from "@b3dotfun/sdk/global-account/react";
+import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { useState } from "react";
 import { Chain } from "thirdweb";
-import { useConnect as useConnectTW } from "thirdweb/react";
-import { Account, createWallet, Wallet, WalletId } from "thirdweb/wallets";
+import { useConnectedWallets, useConnect as useConnectTW } from "thirdweb/react";
+import {
+  Account,
+  createWallet,
+  MultiStepAuthArgsType,
+  preAuthenticate,
+  SingleStepAuthArgsType,
+  Wallet,
+  WalletId,
+} from "thirdweb/wallets";
 
 interface LoginStepCustomProps {
   automaticallySetFirstEoa: boolean;
@@ -28,6 +38,7 @@ interface LoginStepCustomProps {
 }
 
 const debug = debugB3React("LoginStepCustom");
+const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 
 export function LoginStepCustom({
   onSuccess,
@@ -40,32 +51,49 @@ export function LoginStepCustom({
   const { partnerId } = useB3Config();
   const [isLoading, setIsLoading] = useState(false);
   const [showAllWallets, setShowAllWallets] = useState(false);
+  const [showEmailFlow, setShowEmailFlow] = useState(false);
+  const [email, setEmail] = useState("");
+  const [verificationCode, setVerificationCode] = useState("");
+  const [emailCodeSent, setEmailCodeSent] = useState(false);
+  const [emailError, setEmailError] = useState<string | null>(null);
   const { connect } = useConnect(partnerId, chain);
   const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
-  const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
-  const { logout } = useAuthentication(partnerId, { skipAutoConnect: true });
+  const { connect: onAuthConnect, logout } = useAuthentication(partnerId, { skipAutoConnect: true });
   const { connect: connectTW } = useConnectTW();
+  const connectedWallets = useConnectedWallets();
 
   // Split strategies into auth and wallet types
   const authStrategies = strategies.filter(s => !isWalletType(s));
   const walletStrategies = strategies.filter(isWalletType);
   const initialWallets = walletStrategies.slice(0, maxInitialWallets);
   const additionalWallets = walletStrategies.slice(maxInitialWallets);
+  const authGridColumns = Math.max(1, Math.min(authStrategies.length, 4));
 
-  const handleConnect = async (strategy: AllowedStrategy) => {
+  const resetEmailFlow = () => {
+    setShowEmailFlow(false);
+    setEmailCodeSent(false);
+    setVerificationCode("");
+    setEmailError(null);
+  };
+
+  const connectWithOptions = async (
+    strategy: AllowedStrategy,
+    options: MultiStepAuthArgsType | SingleStepAuthArgsType,
+  ) => {
     try {
       setIsLoading(true);
       debug("setIsAuthenticating:true:3");
       setIsAuthenticating(true);
-      const options = getConnectOptionsFromStrategy(strategy);
       let connectResult: Wallet | null;
 
-      if (automaticallySetFirstEoa) {
-        if (!options.wallet?.id) {
+      if (automaticallySetFirstEoa && isWalletType(strategy) && options.strategy === "wallet") {
+        const walletId = options.wallet?.id as WalletId | undefined;
+        if (!walletId) {
           throw new Error("Wallet ID is required");
         }
+
         connectResult = await connectTW(async () => {
-          const wallet = createWallet(options.wallet?.id as WalletId);
+          const wallet = createWallet(walletId);
           await wallet.connect({
             client,
           });
@@ -73,19 +101,27 @@ export function LoginStepCustom({
           return wallet;
         });
       } else {
-        // @ts-expect-error we have custom strategies too and we also get things like "apple" isn't assignable to "wallet"
         connectResult = await connect(options);
       }
 
       const account = connectResult?.getAccount();
       debug("@@connectResult", { connectResult, account, options });
-      if (!account) throw new Error("Failed to connect");
+      if (!account || !connectResult) throw new Error("Failed to connect");
+      const allConnectedWallets =
+        connectedWallets.length > 0 && connectedWallets.some(wallet => wallet.id === connectResult.id)
+          ? connectedWallets
+          : [connectResult, ...connectedWallets.filter(wallet => wallet.id !== connectResult.id)];
+      await onAuthConnect(connectResult, allConnectedWallets);
       await onSuccess(account);
-      setIsAuthenticated(true);
+      if (strategy === "email") {
+        resetEmailFlow();
+      }
     } catch (error) {
+      if (strategy === "email") {
+        setEmailError(error instanceof Error ? error.message : "Failed to sign in with email");
+      }
       await onError?.(error as Error);
       await logout();
-      setIsAuthenticated(false);
     } finally {
       setIsLoading(false);
       debug("setIsAuthenticating:false:3");
@@ -93,60 +129,177 @@ export function LoginStepCustom({
     }
   };
 
+  const handleConnect = async (strategy: AllowedStrategy) => {
+    if (strategy === "email") {
+      setShowEmailFlow(true);
+      setEmailCodeSent(false);
+      setVerificationCode("");
+      setEmailError(null);
+      return;
+    }
+
+    const options = getConnectOptionsFromStrategy(strategy);
+    await connectWithOptions(strategy, options as SingleStepAuthArgsType);
+  };
+
+  const handleSendEmailCode = async () => {
+    const normalizedEmail = email.trim().toLowerCase();
+    if (!normalizedEmail) {
+      setEmailError("Please enter your email address");
+      return;
+    }
+
+    if (!EMAIL_REGEX.test(normalizedEmail)) {
+      setEmailError("Please enter a valid email address");
+      return;
+    }
+
+    try {
+      setIsLoading(true);
+      setEmailError(null);
+      await preAuthenticate({
+        client,
+        strategy: "email",
+        email: normalizedEmail,
+        ecosystem: {
+          id: ecosystemWalletId,
+          partnerId,
+        },
+      });
+      setEmail(normalizedEmail);
+      setEmailCodeSent(true);
+    } catch (error) {
+      setEmailError(error instanceof Error ? error.message : "Failed to send verification code");
+      await onError?.(error as Error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleEmailLogin = async () => {
+    const normalizedEmail = email.trim().toLowerCase();
+    const normalizedCode = verificationCode.trim();
+
+    if (!EMAIL_REGEX.test(normalizedEmail)) {
+      setEmailError("Please enter a valid email address");
+      return;
+    }
+
+    if (!normalizedCode) {
+      setEmailError("Please enter your verification code");
+      return;
+    }
+
+    await connectWithOptions("email", {
+      strategy: "email",
+      email: normalizedEmail,
+      verificationCode: normalizedCode,
+    });
+  };
+
   return (
     <LoginStepContainer partnerId={partnerId}>
-      {/* Auth Strategies */}
-      {authStrategies.length > 0 && (
-        <div className={`mb-6 w-full ${authStrategies.length <= 3 ? "space-y-3 px-3" : "grid grid-cols-4 gap-4"}`}>
-          {authStrategies.map(strategy => {
-            console.log("strategy", strategy);
-            return (
-              <AuthButton
-                key={strategy}
-                strategy={strategy}
-                onClick={() => handleConnect(strategy)}
-                isLoading={isLoading}
-              />
-            );
-          })}
-        </div>
-      )}
-
-      {/* Initial Wallet List */}
-      <div className="mb-4 w-full space-y-2">
-        {initialWallets.map(walletId => (
-          <WalletRow
-            key={walletId}
-            walletId={walletId as WalletId}
-            onClick={() => handleConnect(walletId)}
-            isLoading={isLoading}
+      {showEmailFlow ? (
+        <div className="mb-6 w-full space-y-3 px-3">
+          <p className="text-center text-sm font-medium text-gray-900 dark:text-gray-100">Sign in with email</p>
+          <Input
+            type="email"
+            placeholder="you@example.com"
+            value={email}
+            onChange={event => setEmail(event.target.value)}
+            disabled={isLoading || emailCodeSent}
           />
-        ))}
-      </div>
 
-      {/* Additional Wallets Section */}
-      {additionalWallets.length > 0 && (
-        <div className="w-full">
+          {emailCodeSent && (
+            <Input
+              type="text"
+              placeholder="Enter verification code"
+              value={verificationCode}
+              onChange={event => setVerificationCode(event.target.value)}
+              disabled={isLoading}
+            />
+          )}
+
+          {emailError && <p className="text-sm text-red-500">{emailError}</p>}
+
           <Button
-            onClick={() => setShowAllWallets(!showAllWallets)}
-            className="mb-2 w-full bg-transparent text-gray-600 hover:bg-gray-100"
+            onClick={emailCodeSent ? handleEmailLogin : handleSendEmailCode}
+            disabled={isLoading}
+            className="w-full"
           >
-            {showAllWallets ? "Show less" : "More options"}
+            {isLoading ? "Loading..." : emailCodeSent ? "Verify code" : "Send code"}
           </Button>
 
-          {showAllWallets && (
-            <div className="max-h-60 space-y-2 overflow-y-auto">
-              {additionalWallets.map(walletId => (
-                <WalletRow
-                  key={walletId}
-                  walletId={walletId as WalletId}
-                  onClick={() => handleConnect(walletId)}
+          {emailCodeSent && (
+            <Button variant="outline" onClick={handleSendEmailCode} disabled={isLoading} className="w-full">
+              Resend code
+            </Button>
+          )}
+
+          <Button variant="outline" onClick={resetEmailFlow} disabled={isLoading} className="w-full">
+            Back
+          </Button>
+        </div>
+      ) : (
+        <>
+          {/* Auth Strategies */}
+          {authStrategies.length > 0 && (
+            <div
+              className={`mb-6 grid w-full gap-4 px-3 ${authStrategies.length > 4 ? "grid-cols-4" : ""}`}
+              style={
+                authStrategies.length <= 4
+                  ? { gridTemplateColumns: `repeat(${authGridColumns}, minmax(0, 1fr))` }
+                  : undefined
+              }
+            >
+              {authStrategies.map(strategy => (
+                <AuthButton
+                  key={strategy}
+                  strategy={strategy}
+                  onClick={() => handleConnect(strategy)}
                   isLoading={isLoading}
                 />
               ))}
             </div>
           )}
-        </div>
+
+          {/* Initial Wallet List */}
+          <div className="mb-4 w-full space-y-2">
+            {initialWallets.map(walletId => (
+              <WalletRow
+                key={walletId}
+                walletId={walletId as WalletId}
+                onClick={() => handleConnect(walletId)}
+                isLoading={isLoading}
+              />
+            ))}
+          </div>
+
+          {/* Additional Wallets Section */}
+          {additionalWallets.length > 0 && (
+            <div className="w-full">
+              <Button
+                onClick={() => setShowAllWallets(!showAllWallets)}
+                className="mb-2 w-full bg-transparent text-gray-600 hover:bg-gray-100"
+              >
+                {showAllWallets ? "Show less" : "More options"}
+              </Button>
+
+              {showAllWallets && (
+                <div className="max-h-60 space-y-2 overflow-y-auto">
+                  {additionalWallets.map(walletId => (
+                    <WalletRow
+                      key={walletId}
+                      walletId={walletId as WalletId}
+                      onClick={() => handleConnect(walletId)}
+                      isLoading={isLoading}
+                    />
+                  ))}
+                </div>
+              )}
+            </div>
+          )}
+        </>
       )}
     </LoginStepContainer>
   );