thirdweb 5.44.2-nightly-7c2f616dfe6880beefa4eb48f8dcbce6bba9461a-20240808000401 → 5.45.0-nightly-bbb4f1c53f982b1f9de00fb30efbf2c77f155e96-20240809000532

package/src/wallets/in-app/core/wallet/ecosystem-core.ts

@@ -1,5 +1,6 @@
 import { trackConnect } from "../../../../analytics/track.js";
 import type { Chain } from "../../../../chains/types.js";
+import { getCachedChainIfExists } from "../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import type { Account, Wallet } from "../../../interfaces/wallet.js";
 import { createWalletEmitter } from "../../../wallet-emitter.js";
@@ -28,8 +29,16 @@ export function createEcosystemWallet(args: {
   return {
     id,
     subscribe: emitter.subscribe,
-    getChain: () => chain,
+    getChain() {
+      if (!chain) {
+        return undefined;
+      }
+
+      chain = getCachedChainIfExists(chain.id) || chain;
+      return chain;
+    },
     getConfig: () => createOptions,
+
     getAccount: () => account,
     autoConnect: async (options) => {
       const { autoConnectInAppWallet } = await import("./index.js");

package/src/wallets/in-app/core/wallet/in-app-core.ts

@@ -1,10 +1,20 @@
 import { trackConnect } from "../../../../analytics/track.js";
 import type { Chain } from "../../../../chains/types.js";
+import { getCachedChainIfExists } from "../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import type { Account, Wallet } from "../../../interfaces/wallet.js";
 import { createWalletEmitter } from "../../../wallet-emitter.js";
 import type { CreateWalletArgs } from "../../../wallet-types.js";
 import type { Ecosystem } from "../../web/types.js";
+import {
+  getLinkedProfilesInternal,
+  linkAccount as linkProfileWithToken,
+} from "../authentication/linkAccount.js";
+import type {
+  MultiStepAuthArgsType,
+  Profile,
+  SingleStepAuthArgsType,
+} from "../authentication/types.js";
 import type { InAppConnector } from "../interfaces/connector.js";
 
 const connectorCache = new WeakMap<
@@ -45,9 +55,43 @@ export function createInAppWallet(args: {
   return {
     id: "inApp",
     subscribe: emitter.subscribe,
-    getChain: () => chain,
+    getChain() {
+      if (!chain) {
+        return undefined;
+      }
+
+      chain = getCachedChainIfExists(chain.id) || chain;
+      return chain;
+    },
     getConfig: () => createOptions,
     getAccount: () => account,
+    /**
+     * @description
+     * Gets the linked profiles for the current wallet.
+     * This method is only available for in-app or ecosystem wallets.
+     *
+     * @returns An array of accounts user profiles linked to the current wallet.
+     *
+     * @example
+     * ```ts
+     * import { inAppWallet } from "thirdweb/wallets";
+     *
+     * const wallet = inAppWallet();
+     * wallet.connect({ strategy: "google" });
+     *
+     * const profiles = wallet.getProfiles();
+     *
+     * console.log(profiles[0].type);
+     * console.log(profiles[0].details.email);
+     * ```
+     */
+    getProfiles: async () => {
+      if (!client) {
+        return [];
+      }
+
+      return getLinkedProfilesInternal({ client });
+    },
     autoConnect: async (options) => {
       const { autoConnectInAppWallet } = await import("./index.js");
 
@@ -74,11 +118,11 @@ export function createInAppWallet(args: {
     },
     connect: async (options) => {
       const { connectInAppWallet } = await import("./index.js");
-
       const connector = await getOrCreateInAppWalletConnector(
         options.client,
         connectorFactory,
       );
+
       const [connectedAccount, connectedChain] = await connectInAppWallet(
         options,
         createOptions,
@@ -136,5 +180,26 @@ export function createInAppWallet(args: {
       }
       emitter.emit("chainChanged", newChain);
     },
-  };
+    // This is not included on the global interface but is force-resolved in linkProfile
+    linkProfile: async (
+      options: SingleStepAuthArgsType | MultiStepAuthArgsType,
+    ): Promise<Profile[]> => {
+      if (!client) {
+        throw new Error(
+          "No client found, please connect the wallet before linking a profile",
+        );
+      }
+
+      const connector = await getOrCreateInAppWalletConnector(
+        client,
+        connectorFactory,
+      );
+
+      const { storedToken } = await connector.authenticate(options);
+      return await linkProfileWithToken({
+        client,
+        tokenToLink: storedToken.cookieString,
+      });
+    },
+  } as Wallet<"inApp">;
 }

package/src/wallets/in-app/core/wallet/index.ts

@@ -12,7 +12,7 @@ import type {
   WalletAutoConnectionOption,
   WalletConnectionOption,
 } from "../../../wallet-types.js";
-import { UserWalletStatus } from "../authentication/type.js";
+import { UserWalletStatus } from "../authentication/types.js";
 import type { InAppConnector } from "../interfaces/connector.js";
 
 /**
@@ -52,7 +52,7 @@ export async function connectInAppWallet(
   // IF WE EVER ADD MORE CONNECTOR TYPES, this could cause redirect to be ignored despite being specified
   // TODO: In V6, make everything redirect auth
 
-  const authResult = await connector.authenticate(options);
+  const authResult = await connector.connect(options);
   const authAccount = authResult.user.account;
 
   if (

package/src/wallets/in-app/core/wallet/profiles.ts

@@ -0,0 +1,74 @@
+import type { Wallet } from "../../../interfaces/wallet.js";
+import type {
+  MultiStepAuthArgsType,
+  Profile,
+  SingleStepAuthArgsType,
+} from "../authentication/types.js";
+
+/**
+ * @description
+ * Gets the linked profiles for the provided wallet.
+ * This method is only available for in-app wallets.
+ *
+ * @returns An array of accounts user profiles linked to the current wallet.
+ *
+ * @example
+ * ```ts
+ * import { inAppWallet } from "thirdweb/wallets";
+ *
+ * const wallet = inAppWallet();
+ * wallet.connect({ strategy: "google" });
+ *
+ * const profiles = await getProfiles(wallet);
+ *
+ * console.log(profiles[0].type);
+ * console.log(profiles[0].details.email);
+ * ```
+ */
+export async function getProfiles(wallet: Wallet<"inApp">) {
+  if (wallet.id !== "inApp") {
+    throw new Error("Multi-auth currently only supports in-app wallets");
+  }
+
+  return (
+    wallet as unknown as { getProfiles: () => Promise<Profile[]> }
+  ).getProfiles();
+}
+
+/**
+ * @description
+ * Connects a new profile (authentication method) to the current user.
+ * The connected profile can be any valid in-app wallet including email, phone, passkey, etc.
+ * The inputs mirror those used when authenticating normally, @see {@link Wallet.connect}
+ *
+ * **When a profile is linked to the account, that profile can then be used to sign into the account.**
+ *
+ * This method is only available for in-app wallets.
+ *
+ * @param wallet - The wallet to link an additional profile to.
+ * @param auth - The authentications options to add the new profile.
+ * @returns A promise that resolves to the currently linked profiles when the connection is successful.
+ * @throws If the connection fails, if the profile is already linked to the account, or if the profile is already associated with another account.
+ *
+ * @example
+ * ```ts
+ * const wallet = inAppWallet();
+ *
+ * await wallet.connect({ strategy: "google" });
+ * const profiles = await linkProfile(wallet, { strategy: "discord" });
+ * ```
+ */
+export async function linkProfile(
+  wallet: Wallet<"inApp">,
+  auth: MultiStepAuthArgsType | SingleStepAuthArgsType,
+): Promise<Profile[]> {
+  if (wallet.id !== "inApp") {
+    throw new Error("Multi-auth currently only supports in-app wallets");
+  }
+
+  return (
+    wallet as unknown as {
+      linkProfile: (authOptions: typeof auth) => Promise<Profile[]>;
+    }
+  ).linkProfile(auth);
+}

package/src/wallets/in-app/core/wallet/types.ts

@@ -6,7 +6,7 @@ import type {
   AuthStoredTokenWithCookieReturnType,
   MultiStepAuthArgsType,
   SingleStepAuthArgsType,
-} from "../authentication/type.js";
+} from "../authentication/types.js";
 
 export type InAppWalletConnectionOptions = (
   | MultiStepAuthArgsType

package/src/wallets/in-app/native/auth/index.ts

@@ -5,7 +5,7 @@ import {
   type GetAuthenticatedUserParams,
   type PreAuthArgsType,
   UserWalletStatus,
-} from "../../core/authentication/type.js";
+} from "../../core/authentication/types.js";
 import { getOrCreateInAppWalletConnector } from "../../core/wallet/in-app-core.js";
 
 // ---- KEEP IN SYNC WITH /wallets/in-app/web/lib/auth/index.ts ---- //
@@ -137,5 +137,5 @@ export async function authenticate(
   args: AuthArgsType,
 ): Promise<AuthLoginReturnType> {
   const connector = await getInAppWalletConnector(args.client);
-  return connector.authenticate(args);
+  return connector.connect(args);
 }

package/src/wallets/in-app/native/auth/native-auth.ts

@@ -1,214 +1,61 @@
-import type { CognitoUser } from "amazon-cognito-identity-js";
-
-import { Auth } from "aws-amplify";
 import * as WebBrowser from "expo-web-browser";
 import type { ThirdwebClient } from "../../../../client/client.js";
-import { getSocialAuthLoginPath } from "../../core/authentication/getLoginPath.js";
-import {
-  AuthProvider,
-  type AuthStoredTokenWithCookieReturnType,
-  type OauthOption,
-  RecoveryShareManagement,
-  type SendEmailOtpReturnType,
-} from "../../core/authentication/type.js";
+import type { InjectedSupportedWalletIds } from "../../../../wallets/__generated__/wallet-ids.js";
+import { getLoginUrl } from "../../core/authentication/getLoginPath.js";
+import { siweAuthenticate } from "../../core/authentication/siwe.js";
+import type {
+  AuthStoredTokenWithCookieReturnType,
+  MultiStepAuthArgsType,
+  OauthOption,
+} from "../../core/authentication/types.js";
+import { verifyOtp } from "../../web/lib/auth/otp.js";
+import type { Ecosystem } from "../../web/types.js";
 import {
   deleteAccount,
-  fetchUserDetails,
-  generateAuthTokenFromCognitoEmailOtp,
   getSessionHeaders,
   verifyClientId,
 } from "../helpers/api/fetchers.js";
-import {
-  cognitoEmailSignIn,
-  cognitoEmailSignUp,
-  cognitoPhoneSignIn,
-  cognitoPhoneSignUp,
-} from "../helpers/auth/cognitoAuth.js";
-import {
-  postAuth,
-  postAuthUserManaged,
-  preAuth,
-} from "../helpers/auth/middleware.js";
+import { postAuth, postAuthUserManaged } from "../helpers/auth/middleware.js";
 import {
   ROUTE_AUTH_ENDPOINT_CALLBACK,
   ROUTE_AUTH_JWT_CALLBACK,
 } from "../helpers/constants.js";
 import { createErrorMessage } from "../helpers/errors.js";
-import { isDeviceSharePresentForUser } from "../helpers/storage/local.js";
-import { getCognitoUser, setCognitoUser } from "../helpers/storage/state.js";
-import type { VerifiedTokenResponse } from "../helpers/types.js";
-
-export async function sendVerificationEmail(options: {
-  email: string;
-  client: ThirdwebClient;
-}): Promise<SendEmailOtpReturnType> {
-  await verifyClientId(options.client);
-
-  await preAuth({
-    authenticationMethod: AuthProvider.COGNITO,
-    email: options.email,
-  });
-
-  let result: Awaited<ReturnType<typeof fetchUserDetails>>;
-  try {
-    result = await fetchUserDetails({
-      email: options.email,
-      client: options.client,
-    });
-  } catch (e) {
-    throw new Error(
-      createErrorMessage("Malformed response from the send email OTP API", e),
-    );
-  }
-
-  let cognitoUser: CognitoUser;
-  try {
-    cognitoUser = await cognitoEmailSignIn(
-      options.email,
-      options.client.clientId,
-    );
-  } catch (e) {
-    await cognitoEmailSignUp(options.email, options.client.clientId);
-    cognitoUser = await cognitoEmailSignIn(
-      options.email,
-      options.client.clientId,
-    );
-  }
-  setCognitoUser(cognitoUser);
-
-  return {
-    isNewUser: false, // TODO (rn) check this assumption is ok
-    isNewDevice: !(await isDeviceSharePresentForUser(
-      options.client.clientId,
-      result.walletUserId ?? "",
-    )),
-    recoveryShareManagement: RecoveryShareManagement.CLOUD_MANAGED,
-  };
-}
-
-export async function sendVerificationSms(options: {
-  phoneNumber: string;
-  client: ThirdwebClient;
-}): Promise<SendEmailOtpReturnType> {
-  await verifyClientId(options.client);
-
-  await preAuth({
-    authenticationMethod: AuthProvider.COGNITO,
-    phone: options.phoneNumber,
-  });
-
-  let result: Awaited<ReturnType<typeof fetchUserDetails>>;
-  try {
-    result = await fetchUserDetails({
-      email: options.phoneNumber, // TODO should cleanup the API here
-      client: options.client,
-    });
-  } catch (e) {
-    throw new Error(
-      createErrorMessage("Malformed response from the send email OTP API", e),
-    );
-  }
-
-  let cognitoUser: CognitoUser;
-  try {
-    cognitoUser = await cognitoPhoneSignIn(
-      options.phoneNumber,
-      options.client.clientId,
-    );
-  } catch (e) {
-    await cognitoPhoneSignUp(options.phoneNumber, options.client.clientId);
-    cognitoUser = await cognitoPhoneSignIn(
-      options.phoneNumber,
-      options.client.clientId,
-    );
-  }
-  setCognitoUser(cognitoUser);
-
-  return {
-    isNewUser: false, // TODO (rn) check this assumption is ok
-    isNewDevice: !(await isDeviceSharePresentForUser(
-      options.client.clientId,
-      result.walletUserId ?? "",
-    )),
-    recoveryShareManagement: RecoveryShareManagement.CLOUD_MANAGED,
-  };
-}
-
-export async function validateEmailOTP(options: {
-  email: string;
-  otp: string;
-  client: ThirdwebClient;
-  recoveryCode?: string;
-}): Promise<AuthStoredTokenWithCookieReturnType> {
-  try {
-    await fetchUserDetails({
-      email: options.email,
-      client: options.client,
-    });
-  } catch (e) {
-    throw new Error(
-      createErrorMessage("Malformed response validating the OTP", e),
-    );
-  }
-  let verifiedTokenResponse: VerifiedTokenResponse;
-
-  try {
-    let cognitoUser = getCognitoUser();
-    if (!cognitoUser) {
-      throw new Error("MISSING COGNITO USER");
-    }
-    cognitoUser = await Auth.sendCustomChallengeAnswer(
-      cognitoUser,
-      options.otp,
-    );
-
-    // It we get here, the answer was sent successfully,
-    // but it might have been wrong (1st or 2nd time)
-    // So we should test if the user is authenticated now
-    const session = await Auth.currentSession();
-
-    verifiedTokenResponse = await generateAuthTokenFromCognitoEmailOtp(
-      session,
-      options.client.clientId,
-    );
-  } catch (e) {
-    throw new Error(`Invalid OTP ${e}`);
-  }
 
+export async function otpLogin(
+  options: MultiStepAuthArgsType & {
+    client: ThirdwebClient;
+    ecosystem?: Ecosystem;
+  },
+): Promise<AuthStoredTokenWithCookieReturnType> {
+  const { storedToken } = await verifyOtp(options);
   try {
-    const storedToken: AuthStoredTokenWithCookieReturnType["storedToken"] = {
-      jwtToken: verifiedTokenResponse.verifiedToken.jwtToken,
-      authDetails: verifiedTokenResponse.verifiedToken.authDetails,
-      authProvider: verifiedTokenResponse.verifiedToken.authProvider,
-      developerClientId: verifiedTokenResponse.verifiedToken.developerClientId,
-      cookieString: verifiedTokenResponse.verifiedTokenJwtString,
+    const toStoreToken: AuthStoredTokenWithCookieReturnType["storedToken"] = {
+      jwtToken: storedToken.jwtToken,
+      authDetails: storedToken.authDetails,
+      authProvider: storedToken.authProvider,
+      developerClientId: storedToken.developerClientId,
+      cookieString: storedToken.cookieString,
       // we should always store the jwt cookie since there's no concept of cookie in react native
       shouldStoreCookieString: true,
-      isNewUser: verifiedTokenResponse.verifiedToken.isNewUser,
+      isNewUser: storedToken.isNewUser,
     };
 
-    await postAuth({
-      storedToken,
-      client: options.client,
-      recoveryCode: options.recoveryCode,
-    });
+    await postAuth({ storedToken: toStoreToken, client: options.client });
 
     return { storedToken };
   } catch (e) {
     throw new Error(
-      createErrorMessage(
-        "Malformed response from the verify one time password",
-        e,
-      ),
+      createErrorMessage("Malformed response from post authentication", e),
     );
   }
 }
 
-export async function socialLogin(
+export async function authenticate(
   auth: OauthOption,
   client: ThirdwebClient,
 ): Promise<AuthStoredTokenWithCookieReturnType> {
-  const loginUrl = getSocialAuthLoginPath({
+  const loginUrl = getLoginUrl({
     authOption: auth.strategy,
     client,
     mode: "mobile",
@@ -246,8 +93,48 @@ export async function socialLogin(
   if (!authResult) {
     throw new Error("No auth result found");
   }
-  const { storedToken } = JSON.parse(authResult);
+  return JSON.parse(authResult);
+}
+
+export async function socialLogin(
+  auth: OauthOption,
+  client: ThirdwebClient,
+): Promise<AuthStoredTokenWithCookieReturnType> {
+  const { storedToken } = await authenticate(auth, client);
+  try {
+    const toStoreToken: AuthStoredTokenWithCookieReturnType["storedToken"] = {
+      jwtToken: storedToken.jwtToken,
+      authDetails: storedToken.authDetails,
+      authProvider: storedToken.authProvider,
+      developerClientId: storedToken.developerClientId,
+      cookieString: storedToken.cookieString,
+      // we should always store the jwt cookie since there's no concept of cookie in react native
+      shouldStoreCookieString: true,
+      isNewUser: storedToken.isNewUser,
+    };
+
+    await postAuth({ storedToken: toStoreToken, client });
+
+    return { storedToken };
+  } catch (e) {
+    throw new Error(
+      createErrorMessage("Malformed response from post authentication", e),
+    );
+  }
+}
 
+export async function siweLogin(
+  client: ThirdwebClient,
+  walletId: InjectedSupportedWalletIds,
+  chainId: number,
+  ecosystem?: Ecosystem,
+): Promise<AuthStoredTokenWithCookieReturnType> {
+  const { storedToken } = await siweAuthenticate({
+    client,
+    ecosystem,
+    walletId,
+    chainId,
+  });
   try {
     const toStoreToken: AuthStoredTokenWithCookieReturnType["storedToken"] = {
       jwtToken: storedToken.jwtToken,

package/src/wallets/in-app/native/helpers/api/fetchers.ts

@@ -3,7 +3,7 @@ import type { ThirdwebClient } from "../../../../../client/client.js";
 import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { getClientFetch } from "../../../../../utils/fetch.js";
 import { randomBytesHex } from "../../../../../utils/random.js";
-import type { UserDetailsApiType } from "../../../core/authentication/type.js";
+import type { UserDetailsApiType } from "../../../core/authentication/types.js";
 import {
   ROUTE_EMBEDDED_WALLET_DETAILS,
   ROUTE_IS_VALID_USER_MANAGED_OTP,

package/src/wallets/in-app/native/helpers/auth/logout.ts

@@ -1,4 +1,4 @@
-import type { LogoutReturnType } from "../../../core/authentication/type.js";
+import type { LogoutReturnType } from "../../../core/authentication/types.js";
 import {
   removeAuthTokenInClient,
   removeLoggedInWalletUserId,

package/src/wallets/in-app/native/helpers/auth/middleware.ts

@@ -3,7 +3,7 @@ import {
   AuthProvider,
   type AuthStoredTokenWithCookieReturnType,
   RecoveryShareManagement,
-} from "../../../core/authentication/type.js";
+} from "../../../core/authentication/types.js";
 import { ErrorMessages } from "../errors.js";
 import {
   getDeviceShare,

package/src/wallets/in-app/native/helpers/storage/local.ts

@@ -1,5 +1,5 @@
 import AsyncStorage from "@react-native-async-storage/async-storage";
-import type { AuthArgsType } from "../../../core/authentication/type.js";
+import type { AuthArgsType } from "../../../core/authentication/types.js";
 import {
   AUTH_TOKEN_LOCAL_STORAGE_NAME,
   DEVICE_SHARE_LOCAL_STORAGE_NAME,

package/src/wallets/in-app/native/helpers/types.ts

@@ -1,7 +1,7 @@
 import type {
   AuthProvider,
   RecoveryShareManagement,
-} from "../../core/authentication/type.js";
+} from "../../core/authentication/types.js";
 
 export type VerifiedTokenResponse = {
   verifiedToken: {

package/src/wallets/in-app/native/helpers/wallet/creation.ts

@@ -2,7 +2,7 @@ import { secp256k1 } from "@noble/curves/secp256k1";
 import { publicKeyToAddress } from "viem/utils";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { stringToHex, toHex } from "../../../../../utils/encoding/hex.js";
-import type { SetUpWalletRpcReturnType } from "../../../core/authentication/type.js";
+import type { SetUpWalletRpcReturnType } from "../../../core/authentication/types.js";
 import { storeUserShares } from "../api/fetchers.js";
 import { logoutUser } from "../auth/logout.js";
 import {

package/src/wallets/in-app/native/helpers/wallet/retrieval.ts

@@ -6,7 +6,7 @@ import {
 } from "../../../../../utils/encoding/hex.js";
 import type { Account } from "../../../../interfaces/wallet.js";
 import { privateKeyToAccount } from "../../../../private-key.js";
-import type { SetUpWalletRpcReturnType } from "../../../core/authentication/type.js";
+import type { SetUpWalletRpcReturnType } from "../../../core/authentication/types.js";
 import { getUserShares } from "../api/fetchers.js";
 import {
   DEVICE_SHARE_MISSING_MESSAGE,