@b3dotfun/sdk 0.1.69-alpha.3 → 0.1.69-alpha.5

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>
   );

package/src/global-account/react/components/SignInWithB3/utils/signInUtils.ts

@@ -5,7 +5,8 @@ type WalletType = Wallet["id"];
 type StrategyType = SingleStepAuthArgsType["strategy"];
 type CustomStrategyType = "basement" | "privy";
 
-type AllowedStrategies = StrategyType | WalletType | CustomStrategyType;
+type AllowedStrategies = StrategyType | WalletType | CustomStrategyType | "email";
+type NonWalletStrategyType = Exclude<AllowedStrategies, WalletType>;
 const customStrategies = ["basement", "privy"] as const;
 // type CustomStrategy = (typeof customStrategies)[number];
 
@@ -13,9 +14,10 @@ export const allowedStrategies = [
   // Auth strategies
   "apple",
   "google",
+  "github",
   "x",
   "discord",
-  // "github",
+  "email",
   "guest",
 
   // Wallet IDs
@@ -36,7 +38,7 @@ export function isWalletType(strategy: AllowedStrategies): strategy is WalletTyp
   return strategy === "walletConnect" || walletIdPattern.test(strategy);
 }
 
-export function isStrategyType(strategy: AllowedStrategies): strategy is StrategyType {
+export function isStrategyType(strategy: AllowedStrategies): strategy is NonWalletStrategyType {
   return !isWalletType(strategy);
 }
 
@@ -49,6 +51,10 @@ export function getConnectOptionsFromStrategy(strategy: AllowedStrategy): {
     throw new Error(`Invalid strategy: ${strategy}`);
   }
 
+  if (strategy === "email") {
+    throw new Error("Email strategy requires OTP flow and cannot be connected in a single step");
+  }
+
   if (isWalletType(strategy)) {
     return { strategy: "wallet" as const, wallet: createWallet(strategy) };
   } else {
@@ -65,6 +71,16 @@ export const strategyIcons: Record<string, string> = {
   guest: "https://cdn.b3.fun/incognito.svg",
   // Add more strategies as needed
 };
+
+export const strategyLabels: Record<string, string> = {
+  google: "Google",
+  x: "X",
+  discord: "Discord",
+  apple: "Apple",
+  guest: "Guest",
+  github: "GitHub",
+  email: "Email",
+};
 // Test it
 // console.log(getConnectOptionsFromStrategy("io.metamask"));
 // console.log(getConnectOptionsFromStrategy("google"));

package/src/global-account/react/hooks/useConnect.tsx

@@ -4,7 +4,7 @@ import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { useCallback, useState } from "react";
 import { Chain } from "thirdweb";
 import { useConnect as useConnectTW } from "thirdweb/react";
-import { ecosystemWallet, SingleStepAuthArgsType } from "thirdweb/wallets";
+import { ecosystemWallet, MultiStepAuthArgsType, SingleStepAuthArgsType } from "thirdweb/wallets";
 const debug = debugB3React("useConnect");
 
 /**
@@ -23,7 +23,7 @@ export function useConnect(partnerId: string, chain?: Chain) {
    * It is used to connect to a wallet using the thirdweb client.
    */
   const connectTw = useCallback(
-    async (strategyOptions?: SingleStepAuthArgsType) => {
+    async (strategyOptions?: MultiStepAuthArgsType | SingleStepAuthArgsType) => {
       setIsLoading(true);
       return await connect(async () => {
         if (!strategyOptions) throw new Error("Strategy options are required");