thirdweb 5.58.4 → 5.59.0-nightly-e2b3484764275560aa899f3f894b767faedaa9a1-20240925000331

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

@@ -8,18 +8,9 @@ import type {
   CreateWalletArgs,
   EcosystemWalletId,
 } 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";
 import { getOrCreateInAppWalletConnector } from "./in-app-core.js";
+import type { Ecosystem } from "./types.js";
 
 /**
  * @internal
@@ -52,13 +43,6 @@ export function createEcosystemWallet(args: {
       return chain;
     },
     getConfig: () => createOptions,
-    getProfiles: async () => {
-      if (!client) {
-        return [];
-      }
-
-      return getLinkedProfilesInternal({ client, ecosystem });
-    },
     getAccount: () => account,
     autoConnect: async (options) => {
       const { autoConnectInAppWallet } = await import("./index.js");
@@ -133,28 +117,5 @@ export function createEcosystemWallet(args: {
       chain = newChain;
       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,
-        ecosystem,
-      );
-
-      const { storedToken } = await connector.authenticate(options);
-      return await linkProfileWithToken({
-        client,
-        ecosystem,
-        tokenToLink: storedToken.cookieString,
-      });
-    },
   } as Wallet<EcosystemWalletId>;
 }

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

@@ -5,17 +5,8 @@ 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";
+import type { Ecosystem } from "./types.js";
 
 const connectorCache = new Map<string, InAppConnector>();
 
@@ -62,33 +53,6 @@ export function createInAppWallet(args: {
     },
     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");
 
@@ -178,26 +142,5 @@ 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/types.ts

@@ -6,12 +6,18 @@ import type {
   OAuthOption,
   SocialAuthOption,
 } from "../../../types.js";
+import type { EcosystemWalletId } from "../../../wallet-types.js";
 import type {
   AuthStoredTokenWithCookieReturnType,
   MultiStepAuthArgsType,
   SingleStepAuthArgsType,
 } from "../authentication/types.js";
 
+export type Ecosystem = {
+  id: EcosystemWalletId;
+  partnerId?: string;
+};
+
 export type InAppWalletConnectionOptions = (
   | MultiStepAuthArgsType
   | SingleStepAuthArgsType

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

@@ -1,12 +1,12 @@
 import type { ThirdwebClient } from "../../../../client/client.js";
 import {
   type AuthArgsType,
-  type AuthLoginReturnType,
   type GetAuthenticatedUserParams,
   type PreAuthArgsType,
   UserWalletStatus,
 } from "../../core/authentication/types.js";
 import { getOrCreateInAppWalletConnector } from "../../core/wallet/in-app-core.js";
+import type { Ecosystem } from "../../core/wallet/types.js";
 
 // ---- KEEP IN SYNC WITH /wallets/in-app/web/lib/auth/index.ts ---- //
 // duplication needed for separate exports between web and native
@@ -14,11 +14,15 @@ import { getOrCreateInAppWalletConnector } from "../../core/wallet/in-app-core.j
 /**
  * @internal
  */
-async function getInAppWalletConnector(client: ThirdwebClient) {
+async function getInAppWalletConnector(
+  client: ThirdwebClient,
+  ecosystem?: Ecosystem,
+) {
   return getOrCreateInAppWalletConnector(client, async (client) => {
     const { InAppNativeConnector } = await import("../native-connector.js");
     return new InAppNativeConnector({
       client: client,
+      ecosystem: ecosystem,
     });
   });
 }
@@ -131,9 +135,61 @@ export async function preAuthenticate(args: PreAuthArgsType) {
  * ```
  * @wallet
  */
-export async function authenticate(
-  args: AuthArgsType,
-): Promise<AuthLoginReturnType> {
+export async function authenticate(args: AuthArgsType) {
   const connector = await getInAppWalletConnector(args.client);
-  return connector.connect(args);
+  return connector.authenticate(args);
+}
+
+/**
+ * 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.
+ *
+ * **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({ client, strategy: "google" });
+ * const profiles = await linkProfile({ client, strategy: "discord" });
+ * ```
+ * @wallet
+ */
+export async function linkProfile(args: AuthArgsType) {
+  const connector = await getInAppWalletConnector(args.client, args.ecosystem);
+  return await connector.linkProfile(args);
+}
+
+/**
+ * Gets the linked profiles for the connected in-app or ecosystem wallet.
+ *
+ * @returns An array of accounts user profiles linked to the connected wallet.
+ *
+ * @example
+ * ```ts
+ * import { inAppWallet } from "thirdweb/wallets";
+ *
+ * const wallet = inAppWallet();
+ * wallet.connect({ strategy: "google" });
+ *
+ * const profiles = await getProfiles({
+ *  client,
+ * });
+ *
+ * console.log(profiles[0].type);
+ * console.log(profiles[0].details.email);
+ * ```
+ * @wallet
+ */
+export async function getProfiles(args: GetAuthenticatedUserParams) {
+  const connector = await getInAppWalletConnector(args.client, args.ecosystem);
+  return connector.getProfiles();
 }

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

@@ -1,6 +1,7 @@
 import * as WebBrowser from "expo-web-browser";
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
+import { nativeLocalStorage } from "../../../../utils/storage/nativeStorage.js";
 import type { Wallet } from "../../../interfaces/wallet.js";
 import { getLoginUrl } from "../../core/authentication/getLoginPath.js";
 import { guestAuthenticate } from "../../core/authentication/guest.js";
@@ -10,8 +11,8 @@ import type {
   MultiStepAuthArgsType,
   OAuthRedirectObject,
 } from "../../core/authentication/types.js";
+import type { Ecosystem } from "../../core/wallet/types.js";
 import { verifyOtp } from "../../web/lib/auth/otp.js";
-import type { Ecosystem } from "../../web/types.js";
 import {
   deleteAccount,
   getSessionHeaders,
@@ -166,6 +167,7 @@ export async function guestLogin(
   const { storedToken } = await guestAuthenticate({
     client,
     ecosystem,
+    storage: nativeLocalStorage,
   });
   try {
     const toStoreToken: AuthStoredTokenWithCookieReturnType["storedToken"] = {

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

@@ -3,7 +3,12 @@ import type { ThirdwebClient } from "../../../client/client.js";
 import { stringify } from "../../../utils/json.js";
 import { nativeLocalStorage } from "../../../utils/storage/nativeStorage.js";
 import type { Account, Wallet } from "../../interfaces/wallet.js";
+import { ClientScopedStorage } from "../core/authentication/client-scoped-storage.js";
 import { guestAuthenticate } from "../core/authentication/guest.js";
+import {
+  getLinkedProfilesInternal,
+  linkAccount,
+} from "../core/authentication/linkAccount.js";
 import {
   loginWithPasskey,
   registerPasskey,
@@ -21,8 +26,8 @@ import {
   UserWalletStatus,
 } from "../core/authentication/types.js";
 import type { InAppConnector } from "../core/interfaces/connector.js";
+import type { Ecosystem } from "../core/wallet/types.js";
 import { sendOtp, verifyOtp } from "../web/lib/auth/otp.js";
-import type { Ecosystem } from "../web/types.js";
 import {
   authEndpoint,
   authenticate,
@@ -41,21 +46,31 @@ import { getExistingUserAccount } from "./helpers/wallet/retrieval.js";
 
 type NativeConnectorOptions = {
   client: ThirdwebClient;
-  partnerId?: string | undefined;
+  ecosystem?: Ecosystem;
   passkeyDomain?: string;
 };
 
 export class InAppNativeConnector implements InAppConnector {
-  private options: NativeConnectorOptions;
+  private client: ThirdwebClient;
+  private ecosystem?: Ecosystem;
+  private passkeyDomain?: string;
+  private localStorage: ClientScopedStorage;
 
   constructor(options: NativeConnectorOptions) {
-    this.options = options;
+    this.client = options.client;
+    this.ecosystem = options.ecosystem;
+    this.passkeyDomain = options.passkeyDomain;
+    this.localStorage = new ClientScopedStorage({
+      storage: nativeLocalStorage,
+      clientId: this.client.clientId,
+      ecosystemId: this.ecosystem?.id,
+    });
   }
 
   async getUser(): Promise<GetUser> {
-    const localData = await getWalletUserDetails(this.options.client.clientId);
+    const localData = await getWalletUserDetails(this.client.clientId);
     const userStatus = await fetchUserDetails({
-      client: this.options.client,
+      client: this.client,
       email: localData?.email,
     });
     if (userStatus.status === UserWalletStatus.LOGGED_IN_WALLET_INITIALIZED) {
@@ -82,13 +97,13 @@ export class InAppNativeConnector implements InAppConnector {
     return { status: UserWalletStatus.LOGGED_OUT };
   }
   getAccount(): Promise<Account> {
-    return getExistingUserAccount({ client: this.options.client });
+    return getExistingUserAccount({ client: this.client });
   }
 
   preAuthenticate(args: MultiStepAuthProviderType): Promise<void> {
     return sendOtp({
       ...args,
-      client: this.options.client,
+      client: this.client,
     });
   }
 
@@ -103,13 +118,14 @@ export class InAppNativeConnector implements InAppConnector {
       }
       case "guest": {
         return guestAuthenticate({
-          client: this.options.client,
+          client: this.client,
           ecosystem: params.ecosystem,
+          storage: nativeLocalStorage,
         });
       }
       case "wallet": {
         return siweAuthenticate({
-          client: this.options.client,
+          client: this.client,
           wallet: params.wallet,
           chain: params.chain,
         });
@@ -123,7 +139,7 @@ export class InAppNativeConnector implements InAppConnector {
         const ExpoLinking = require("expo-linking");
         const redirectUrl =
           params.redirectUrl || (ExpoLinking.createURL("") as string);
-        return authenticate({ strategy, redirectUrl }, this.options.client);
+        return authenticate({ strategy, redirectUrl }, this.client);
       }
       case "passkey":
         return this.passkeyAuth(params);
@@ -140,7 +156,7 @@ export class InAppNativeConnector implements InAppConnector {
           email: params.email,
           verificationCode: params.verificationCode,
           strategy: "email",
-          client: this.options.client,
+          client: this.client,
         });
       }
       case "phone": {
@@ -148,7 +164,7 @@ export class InAppNativeConnector implements InAppConnector {
           phoneNumber: params.phoneNumber,
           verificationCode: params.verificationCode,
           strategy: "phone",
-          client: this.options.client,
+          client: this.client,
         });
       }
       case "google":
@@ -221,7 +237,7 @@ export class InAppNativeConnector implements InAppConnector {
     ecosystem?: Ecosystem;
   }): Promise<AuthStoredTokenWithCookieReturnType> {
     const { type, passkeyName, client, ecosystem } = args;
-    const domain = this.options.passkeyDomain;
+    const domain = this.passkeyDomain;
     if (!domain) {
       throw new Error(
         "Passkey domain is required for native platforms. Please pass it in the 'auth' options when creating the inAppWallet().",
@@ -311,14 +327,14 @@ export class InAppNativeConnector implements InAppConnector {
 
   // TODO (rn) expose in the interface
   async deleteActiveAccount() {
-    return deleteActiveAccount({ client: this.options.client });
+    return deleteActiveAccount({ client: this.client });
   }
 
   private async socialLogin(
     auth: OAuthRedirectObject,
   ): Promise<AuthLoginReturnType> {
     try {
-      const { storedToken } = await socialLogin(auth, this.options.client);
+      const { storedToken } = await socialLogin(auth, this.client);
       const account = await this.getAccount();
       return {
         user: {
@@ -343,7 +359,7 @@ export class InAppNativeConnector implements InAppConnector {
   }): Promise<AuthLoginReturnType> {
     try {
       const { storedToken } = await siweLogin(
-        this.options.client,
+        this.client,
         options.wallet,
         options.chain,
       );
@@ -375,10 +391,7 @@ export class InAppNativeConnector implements InAppConnector {
     ecosystem?: Ecosystem;
   }): Promise<AuthLoginReturnType> {
     try {
-      const { storedToken } = await guestLogin(
-        this.options.client,
-        options.ecosystem,
-      );
+      const { storedToken } = await guestLogin(this.client, options.ecosystem);
       const account = await this.getAccount();
       return {
         user: {
@@ -401,7 +414,7 @@ export class InAppNativeConnector implements InAppConnector {
     password: string;
   }): Promise<AuthLoginReturnType> {
     try {
-      const { storedToken } = await customJwt(authOptions, this.options.client);
+      const { storedToken } = await customJwt(authOptions, this.client);
       const account = await this.getAccount();
       return {
         user: {
@@ -422,10 +435,7 @@ export class InAppNativeConnector implements InAppConnector {
     encryptionKey: string;
   }): Promise<AuthLoginReturnType> {
     try {
-      const { storedToken } = await authEndpoint(
-        authOptions,
-        this.options.client,
-      );
+      const { storedToken } = await authEndpoint(authOptions, this.client);
       const account = await this.getAccount();
       return {
         user: {
@@ -442,7 +452,24 @@ export class InAppNativeConnector implements InAppConnector {
   }
 
   logout(): Promise<LogoutReturnType> {
-    return logoutUser(this.options.client.clientId);
+    return logoutUser(this.client.clientId);
+  }
+
+  async linkProfile(args: AuthArgsType) {
+    const { storedToken } = await this.authenticate(args);
+    return await linkAccount({
+      client: args.client,
+      tokenToLink: storedToken.cookieString,
+      storage: this.localStorage,
+    });
+  }
+
+  async getProfiles() {
+    return getLinkedProfilesInternal({
+      client: this.client,
+      ecosystem: this.ecosystem,
+      storage: this.localStorage,
+    });
   }
 }
 

package/src/wallets/in-app/web/lib/actions/generate-wallet.enclave.ts

@@ -1,7 +1,7 @@
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { getThirdwebBaseUrl } from "../../../../../utils/domains.js";
 import { getClientFetch } from "../../../../../utils/fetch.js";
-import type { Ecosystem } from "../../types.js";
+import type { Ecosystem } from "../../../core/wallet/types.js";
 
 /**
  * Generate a new enclave wallet using an auth token

package/src/wallets/in-app/web/lib/actions/get-enclave-user-status.ts

@@ -1,8 +1,8 @@
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { getThirdwebBaseUrl } from "../../../../../utils/domains.js";
 import { getClientFetch } from "../../../../../utils/fetch.js";
+import type { Ecosystem } from "../../../core/wallet/types.js";
 import type { UserStatus } from "../../lib/enclave-wallet.js";
-import type { Ecosystem } from "../../types.js";
 
 /**
  * Gets the user's status from the backend.

package/src/wallets/in-app/web/lib/actions/sign-message.enclave.ts

@@ -2,7 +2,7 @@ import type { ThirdwebClient } from "../../../../../client/client.js";
 import { getThirdwebBaseUrl } from "../../../../../utils/domains.js";
 import { getClientFetch } from "../../../../../utils/fetch.js";
 import { stringify } from "../../../../../utils/json.js";
-import type { Ecosystem } from "../../types.js";
+import type { Ecosystem } from "../../../core/wallet/types.js";
 import { getAuthToken } from "../get-auth-token.js";
 
 export async function signMessage({
@@ -18,7 +18,7 @@ export async function signMessage({
   };
 }) {
   const clientFetch = getClientFetch(client, ecosystem);
-  const authToken = await getAuthToken(client, ecosystem);
+  const authToken = await getAuthToken(client, ecosystem); // TODO (enclave): pass storage from web/native
 
   const response = await clientFetch(
     `${getThirdwebBaseUrl("inAppWallet")}/api/v1/enclave-wallet/sign-message`,

package/src/wallets/in-app/web/lib/actions/sign-transaction.enclave.ts

@@ -3,7 +3,7 @@ import { getThirdwebBaseUrl } from "../../../../../utils/domains.js";
 import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { getClientFetch } from "../../../../../utils/fetch.js";
 import { stringify } from "../../../../../utils/json.js";
-import type { Ecosystem } from "../../types.js";
+import type { Ecosystem } from "../../../core/wallet/types.js";
 import { getAuthToken } from "../get-auth-token.js";
 
 export async function signTransaction({
@@ -17,7 +17,7 @@ export async function signTransaction({
 }) {
   console.log("payload", payload);
   const clientFetch = getClientFetch(client, ecosystem);
-  const authToken = await getAuthToken(client, ecosystem);
+  const authToken = await getAuthToken(client, ecosystem); // TODO (enclave): pass storage from web/native
 
   const response = await clientFetch(
     `${getThirdwebBaseUrl("inAppWallet")}/api/v1/enclave-wallet/sign-transaction`,

package/src/wallets/in-app/web/lib/actions/sign-typed-data.enclave.ts

@@ -4,7 +4,7 @@ import type { ThirdwebClient } from "../../../../../client/client.js";
 import { getThirdwebBaseUrl } from "../../../../../utils/domains.js";
 import { getClientFetch } from "../../../../../utils/fetch.js";
 import { stringify } from "../../../../../utils/json.js";
-import type { Ecosystem } from "../../types.js";
+import type { Ecosystem } from "../../../core/wallet/types.js";
 import { getAuthToken } from "../get-auth-token.js";
 
 export async function signTypedData<
@@ -20,7 +20,7 @@ export async function signTypedData<
   payload: TypedDataDefinition<typedData, primaryType>;
 }) {
   const clientFetch = getClientFetch(client, ecosystem);
-  const authToken = await getAuthToken(client, ecosystem);
+  const authToken = await getAuthToken(client, ecosystem); // TODO (enclave): pass storage from web/native
 
   const response = await clientFetch(
     `${getThirdwebBaseUrl("inAppWallet")}/api/v1/enclave-wallet/sign-typed-data`,

package/src/wallets/in-app/web/lib/auth/abstract-login.ts

@@ -5,7 +5,8 @@ import type {
   AuthProvider,
   SendEmailOtpReturnType,
 } from "../../../core/authentication/types.js";
-import type { ClientIdWithQuerierType, Ecosystem } from "../../types.js";
+import type { Ecosystem } from "../../../core/wallet/types.js";
+import type { ClientIdWithQuerierType } from "../../types.js";
 import type { InAppWalletIframeCommunicator } from "../../utils/iFrameCommunication/InAppWalletIframeCommunicator.js";
 
 export type LoginQuerierTypes = {

package/src/wallets/in-app/web/lib/auth/iframe-auth.ts

@@ -1,6 +1,5 @@
 import type { ThirdwebClient } from "../../../../../client/client.js";
-import { webLocalStorage } from "../../../../../utils/storage/webStorage.js";
-import { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
+import type { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
 import type {
   AuthAndWalletRpcReturnType,
   AuthLoginReturnType,
@@ -8,7 +7,8 @@ import type {
   LogoutReturnType,
   SendEmailOtpReturnType,
 } from "../../../core/authentication/types.js";
-import type { ClientIdWithQuerierType, Ecosystem } from "../../types.js";
+import type { Ecosystem } from "../../../core/wallet/types.js";
+import type { ClientIdWithQuerierType } from "../../types.js";
 import type { InAppWalletIframeCommunicator } from "../../utils/iFrameCommunication/InAppWalletIframeCommunicator.js";
 import { generateWallet } from "../actions/generate-wallet.enclave.js";
 import { getUserStatus } from "../actions/get-enclave-user-status.js";
@@ -56,22 +56,20 @@ export class Auth {
     onAuthSuccess,
     ecosystem,
     baseUrl,
+    localStorage,
   }: ClientIdWithQuerierType & {
     baseUrl: string;
     ecosystem?: Ecosystem;
     onAuthSuccess: (
       authDetails: AuthAndWalletRpcReturnType,
     ) => Promise<AuthLoginReturnType>;
+    localStorage: ClientScopedStorage;
   }) {
     this.client = client;
     this.ecosystem = ecosystem;
 
     this.AuthQuerier = querier;
-    this.localStorage = new ClientScopedStorage({
-      storage: webLocalStorage,
-      clientId: client.clientId,
-      ecosystemId: ecosystem?.id,
-    });
+    this.localStorage = localStorage;
     this.onAuthSuccess = onAuthSuccess;
     this.BaseLogin = new BaseLogin({
       postLogin: async (result) => {