thirdweb 5.59.0-nightly-e2b3484764275560aa899f3f894b767faedaa9a1-20240925000331 → 5.59.0-nightly-5ab3a81f79e96cb7caed6f591969942b2b67dbb6-20240926000312

package/src/wallets/in-app/core/authentication/passkeys.ts

@@ -1,9 +1,8 @@
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
 import { getClientFetch } from "../../../../utils/fetch.js";
-import type { AsyncStorage } from "../../../../utils/storage/AsyncStorage.js";
 import type { Ecosystem } from "../wallet/types.js";
-import { ClientScopedStorage } from "./client-scoped-storage.js";
+import type { ClientScopedStorage } from "./client-scoped-storage.js";
 import type { AuthStoredTokenWithCookieReturnType } from "./types.js";
 
 function getVerificationPath() {
@@ -56,7 +55,7 @@ export interface PasskeyClient {
 
 export async function registerPasskey(options: {
   client: ThirdwebClient;
-  storage: AsyncStorage;
+  storage: ClientScopedStorage;
   passkeyClient: PasskeyClient;
   ecosystem?: Ecosystem;
   username?: string;
@@ -65,11 +64,6 @@ export async function registerPasskey(options: {
   if (!options.passkeyClient.isAvailable()) {
     throw new Error("Passkeys are not available on this device");
   }
-  const storage = new ClientScopedStorage({
-    storage: options.storage,
-    clientId: options.client.clientId,
-    ecosystemId: options.ecosystem?.id,
-  });
   const fetchWithId = getClientFetch(options.client, options.ecosystem);
   const generatedName = options.username ?? generateUsername(options.ecosystem);
   // 1. request challenge from  server
@@ -125,7 +119,7 @@ export async function registerPasskey(options: {
     );
   }
   // 4. store the credentialId in local storage
-  await storage.savePasskeyCredentialId(registration.credentialId);
+  await options.storage.savePasskeyCredentialId(registration.credentialId);
 
   // 5. returns back the IAW authentication token
   return verifData;
@@ -133,7 +127,7 @@ export async function registerPasskey(options: {
 
 export async function loginWithPasskey(options: {
   client: ThirdwebClient;
-  storage: AsyncStorage;
+  storage: ClientScopedStorage;
   passkeyClient: PasskeyClient;
   rp: RpInfo;
   ecosystem?: Ecosystem;
@@ -141,11 +135,6 @@ export async function loginWithPasskey(options: {
   if (!options.passkeyClient.isAvailable()) {
     throw new Error("Passkeys are not available on this device");
   }
-  const storage = new ClientScopedStorage({
-    storage: options.storage,
-    clientId: options.client.clientId,
-    ecosystemId: options.ecosystem?.id,
-  });
   const fetchWithId = getClientFetch(options.client, options.ecosystem);
   // 1. request challenge from  server/iframe
   const res = await fetchWithId(getChallengePath("sign-in"));
@@ -155,7 +144,8 @@ export async function loginWithPasskey(options: {
   }
   const challenge = challengeData.challenge;
   // 1.2. find the user's credentialId in local storage
-  const credentialId = (await storage.getPasskeyCredentialId()) ?? undefined;
+  const credentialId =
+    (await options.storage.getPasskeyCredentialId()) ?? undefined;
   // 2. initiate login
   const authentication = await options.passkeyClient.authenticate({
     credentialId,
@@ -198,7 +188,7 @@ export async function loginWithPasskey(options: {
   }
 
   // 5. store the credentialId in local storage
-  await storage.savePasskeyCredentialId(authentication.credentialId);
+  await options.storage.savePasskeyCredentialId(authentication.credentialId);
 
   // 6. return the auth'd user type
   return verifData;

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

@@ -66,30 +66,25 @@ export type AuthArgsType = (MultiStepAuthArgsType | SingleStepAuthArgsType) & {
 };
 
 // TODO: remove usage of enums, instead use object with as const
-export enum RecoveryShareManagement {
-  USER_MANAGED = "USER_MANAGED",
-  CLOUD_MANAGED = "AWS_MANAGED",
-  ENCLAVE = "ENCLAVE",
-}
+type RecoveryShareManagement = "USER_MANAGED" | "AWS_MANAGED" | "ENCLAVE";
 
 // TODO: remove usage of enums, instead use object with as const
-export enum AuthProvider {
-  COGNITO = "Cognito",
-  GUEST = "Guest",
-  GOOGLE = "Google",
-  EMAIL_OTP = "EmailOtp",
-  CUSTOM_JWT = "CustomJWT",
-  CUSTOM_AUTH_ENDPOINT = "CustomAuthEndpoint",
-  FACEBOOK = "Facebook",
-  APPLE = "Apple",
-  PASSKEY = "Passkey",
-  DISCORD = "Discord",
-  COINBASE = "Coinbase",
-  X = "X",
-  LINE = "Line",
-  FARCASTER = "Farcaster",
-  TELEGRAM = "Telegram",
-}
+export type AuthProvider =
+  | "Cognito"
+  | "Guest"
+  | "Google"
+  | "EmailOtp"
+  | "CustomJWT"
+  | "CustomAuthEndpoint"
+  | "Facebook"
+  | "Apple"
+  | "Passkey"
+  | "Discord"
+  | "Coinbase"
+  | "X"
+  | "Line"
+  | "Farcaster"
+  | "Telegram";
 
 export type OAuthRedirectObject = {
   strategy: OAuthOption;
@@ -134,10 +129,15 @@ export type AuthAndWalletRpcReturnType = AuthStoredTokenWithCookieReturnType & {
   walletDetails: SetUpWalletRpcReturnType | WalletAddressObjectType;
 };
 
+export type AuthResultAndRecoveryCode = AuthStoredTokenWithCookieReturnType & {
+  deviceShareStored?: string;
+  encryptionKey?: string;
+};
+
 export type AuthLoginReturnType = { user: InitializedUser };
 
 // Auth Types
-type AuthDetails = (
+export type AuthDetails = (
   | {
       email?: string;
     }
@@ -153,21 +153,15 @@ type AuthDetails = (
 };
 
 type InitializedUser = {
-  status: UserWalletStatus.LOGGED_IN_WALLET_INITIALIZED;
+  status: "Logged In, Wallet Initialized";
   walletAddress: string;
   authDetails: AuthDetails;
   account: Account; // TODO (rn) this doesn't feel right here, should access it from the connector
 };
 
-// In APp Wallet Types
-export enum UserWalletStatus {
-  LOGGED_OUT = "Logged Out",
-  LOGGED_IN_WALLET_UNINITIALIZED = "Logged In, Wallet Uninitialized",
-  LOGGED_IN_NEW_DEVICE = "Logged In, New Device",
-  LOGGED_IN_WALLET_INITIALIZED = "Logged In, Wallet Initialized",
-}
+// In App Wallet Types
 
-export type WalletAddressObjectType = {
+type WalletAddressObjectType = {
   /**
    * User's wallet address
    */
@@ -199,33 +193,33 @@ export type LogoutReturnType = { success: boolean };
 // this is the return type from the InAppWallet Class getUserWalletStatus method iframe call
 export type GetUserWalletStatusRpcReturnType =
   | {
-      status: UserWalletStatus.LOGGED_OUT;
+      status: "Logged Out";
       user: undefined;
     }
   | {
-      status: UserWalletStatus.LOGGED_IN_WALLET_UNINITIALIZED;
+      status: "Logged In, Wallet Uninitialized";
       user: { authDetails: AuthDetails };
     }
   | {
-      status: UserWalletStatus.LOGGED_IN_NEW_DEVICE;
+      status: "Logged In, New Device";
       user: { authDetails: AuthDetails; walletAddress: string };
     }
   | {
-      status: UserWalletStatus.LOGGED_IN_WALLET_INITIALIZED;
+      status: "Logged In, Wallet Initialized";
       user: Omit<InitializedUser, "account" | "status">;
     };
 
 // this is the return type from the InAppWallet Class getUserWalletStatus method
 export type GetUser =
   | {
-      status: UserWalletStatus.LOGGED_OUT;
+      status: "Logged Out";
     }
   | {
-      status: UserWalletStatus.LOGGED_IN_WALLET_UNINITIALIZED;
+      status: "Logged In, Wallet Uninitialized";
       authDetails: AuthDetails;
     }
   | {
-      status: UserWalletStatus.LOGGED_IN_NEW_DEVICE;
+      status: "Logged In, New Device";
       authDetails: AuthDetails;
       walletAddress: string;
     }

package/src/wallets/in-app/{web/lib → core/wallet}/enclave-wallet.ts

@@ -11,19 +11,18 @@ import type {
   Account,
   SendTransactionOption,
 } from "../../../interfaces/wallet.js";
-import type { ClientScopedStorage } from "../../core/authentication/client-scoped-storage.js";
-import {
-  type GetUser,
-  RecoveryShareManagement,
-  UserWalletStatus,
-  type WalletAddressObjectType,
-} from "../../core/authentication/types.js";
-import type { Ecosystem } from "../../core/wallet/types.js";
-import { getUserStatus } from "./actions/get-enclave-user-status.js";
-import { signMessage as signEnclaveMessage } from "./actions/sign-message.enclave.js";
-import { signTransaction as signEnclaveTransaction } from "./actions/sign-transaction.enclave.js";
-import { signTypedData as signEnclaveTypedData } from "./actions/sign-typed-data.enclave.js";
-import type { IWebWallet, PostWalletSetup } from "./web-wallet.js";
+import { getUserStatus } from "../../web/lib/actions/get-enclave-user-status.js";
+import { signMessage as signEnclaveMessage } from "../../web/lib/actions/sign-message.enclave.js";
+import { signTransaction as signEnclaveTransaction } from "../../web/lib/actions/sign-transaction.enclave.js";
+import { signTypedData as signEnclaveTypedData } from "../../web/lib/actions/sign-typed-data.enclave.js";
+import type { ClientScopedStorage } from "../authentication/client-scoped-storage.js";
+import type {
+  AuthDetails,
+  AuthResultAndRecoveryCode,
+  GetUser,
+} from "../authentication/types.js";
+import type { Ecosystem } from "./types.js";
+import type { IWebWallet } from "./web-wallet.js";
 
 export type UserStatus = {
   linkedAccounts: {
@@ -74,12 +73,8 @@ export class EnclaveWallet implements IWebWallet {
    * @returns `{walletAddress: string }` The user's wallet details
    * @internal
    */
-  async postWalletSetUp({
-    walletAddress,
-    authToken,
-  }: PostWalletSetup): Promise<WalletAddressObjectType> {
-    await this.localStorage.saveAuthCookie(authToken);
-    return { walletAddress };
+  async postWalletSetUp(authResult: AuthResultAndRecoveryCode): Promise<void> {
+    await this.localStorage.saveAuthCookie(authResult.storedToken.cookieString);
   }
 
   /**
@@ -89,7 +84,7 @@ export class EnclaveWallet implements IWebWallet {
   async getUserWalletStatus(): Promise<GetUser> {
     const token = await this.localStorage.getAuthCookie();
     if (!token) {
-      return { status: UserWalletStatus.LOGGED_OUT };
+      return { status: "Logged Out" };
     }
 
     const userStatus = await getUserStatus({
@@ -99,11 +94,11 @@ export class EnclaveWallet implements IWebWallet {
     });
 
     if (!userStatus) {
-      return { status: UserWalletStatus.LOGGED_OUT };
+      return { status: "Logged Out" };
     }
     const wallet = userStatus.wallets[0];
 
-    const authDetails = {
+    const authDetails: AuthDetails = {
       email: userStatus.linkedAccounts.find(
         (account) => account.details.email !== undefined,
       )?.details.email,
@@ -111,18 +106,18 @@ export class EnclaveWallet implements IWebWallet {
         (account) => account.details.phone !== undefined,
       )?.details.phone,
       userWalletId: userStatus.id || "",
-      recoveryShareManagement: RecoveryShareManagement.ENCLAVE,
+      recoveryShareManagement: "ENCLAVE",
     };
 
     if (!wallet) {
       return {
-        status: UserWalletStatus.LOGGED_IN_WALLET_UNINITIALIZED,
+        status: "Logged In, Wallet Uninitialized",
         authDetails,
       };
     }
 
     return {
-      status: UserWalletStatus.LOGGED_IN_WALLET_INITIALIZED,
+      status: "Logged In, Wallet Initialized",
       walletAddress: wallet.address,
       authDetails,
       account: await this.getAccount(),
@@ -136,6 +131,7 @@ export class EnclaveWallet implements IWebWallet {
   async getAccount(): Promise<Account> {
     const client = this.client;
     const ecosystem = this.ecosystem;
+    const storage = this.localStorage;
 
     const _signTransaction = async (tx: SendTransactionOption) => {
       const rpcRequest = getRpcClient({
@@ -176,6 +172,7 @@ export class EnclaveWallet implements IWebWallet {
       return signEnclaveTransaction({
         client,
         ecosystem,
+        storage,
         payload: transaction,
       });
     };
@@ -223,6 +220,7 @@ export class EnclaveWallet implements IWebWallet {
           client,
           ecosystem,
           payload: messagePayload,
+          storage,
         });
         return signature as Hex;
       },
@@ -232,6 +230,7 @@ export class EnclaveWallet implements IWebWallet {
           client,
           ecosystem,
           payload: parsedTypedData,
+          storage,
         });
 
         return signature as Hex;

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

@@ -4,7 +4,10 @@ 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 {
+  CreateWalletArgs,
+  EcosystemWalletId,
+} from "../../../wallet-types.js";
 import type { InAppConnector } from "../interfaces/connector.js";
 import type { Ecosystem } from "./types.js";
 
@@ -33,15 +36,17 @@ export async function getOrCreateInAppWalletConnector(
 export function createInAppWallet(args: {
   createOptions?: CreateWalletArgs<"inApp">[1];
   connectorFactory: (client: ThirdwebClient) => Promise<InAppConnector>;
-}): Wallet<"inApp"> {
-  const { createOptions, connectorFactory } = args;
+  ecosystem?: Ecosystem;
+}): Wallet<"inApp" | EcosystemWalletId> {
+  const { createOptions, connectorFactory, ecosystem } = args;
+  const walletId = ecosystem ? ecosystem.id : "inApp";
   const emitter = createWalletEmitter<"inApp">();
   let account: Account | undefined = undefined;
   let chain: Chain | undefined = undefined;
   let client: ThirdwebClient | undefined;
 
   return {
-    id: "inApp",
+    id: walletId,
     subscribe: emitter.subscribe,
     getChain() {
       if (!chain) {
@@ -59,6 +64,7 @@ export function createInAppWallet(args: {
       const connector = await getOrCreateInAppWalletConnector(
         options.client,
         connectorFactory,
+        ecosystem,
       );
       const [connectedAccount, connectedChain] = await autoConnectInAppWallet(
         options,
@@ -72,7 +78,7 @@ export function createInAppWallet(args: {
       chain = connectedChain;
       trackConnect({
         client: options.client,
-        walletType: "inApp",
+        walletType: walletId,
         walletAddress: account.address,
       });
       // return only the account
@@ -83,6 +89,7 @@ export function createInAppWallet(args: {
       const connector = await getOrCreateInAppWalletConnector(
         options.client,
         connectorFactory,
+        ecosystem,
       );
 
       const [connectedAccount, connectedChain] = await connectInAppWallet(
@@ -96,7 +103,7 @@ export function createInAppWallet(args: {
       chain = connectedChain;
       trackConnect({
         client: options.client,
-        walletType: "inApp",
+        walletType: walletId,
         walletAddress: account.address,
       });
       // return only the account
@@ -108,6 +115,7 @@ export function createInAppWallet(args: {
         const connector = await getOrCreateInAppWalletConnector(
           client,
           connectorFactory,
+          ecosystem,
         );
         const result = await connector.logout();
         if (!result.success) {
@@ -125,6 +133,7 @@ export function createInAppWallet(args: {
         const connector = await getOrCreateInAppWalletConnector(
           client,
           connectorFactory,
+          ecosystem,
         );
         const [connectedAccount, connectedChain] = await autoConnectInAppWallet(
           {
@@ -142,5 +151,5 @@ export function createInAppWallet(args: {
       }
       emitter.emit("chainChanged", newChain);
     },
-  } as Wallet<"inApp">;
+  };
 }

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

@@ -12,7 +12,6 @@ import type {
   WalletAutoConnectionOption,
   WalletConnectionOption,
 } from "../../../wallet-types.js";
-import { UserWalletStatus } from "../authentication/types.js";
 import type { InAppConnector } from "../interfaces/connector.js";
 
 /**
@@ -142,7 +141,7 @@ async function convertToSmartAccount(options: {
 async function getAuthenticatedUser(connector: InAppConnector) {
   const user = await connector.getUser();
   switch (user.status) {
-    case UserWalletStatus.LOGGED_IN_WALLET_INITIALIZED: {
+    case "Logged In, Wallet Initialized": {
       return user;
     }
   }

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

@@ -0,0 +1,14 @@
+import type { Account } from "../../../interfaces/wallet.js";
+import type {
+  AuthResultAndRecoveryCode,
+  GetUser,
+} from "../authentication/types.js";
+
+/**
+ *
+ */
+export interface IWebWallet {
+  postWalletSetUp(authResult: AuthResultAndRecoveryCode): Promise<void>;
+  getUserWalletStatus(): Promise<GetUser>;
+  getAccount(): Promise<Account>;
+}

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

@@ -1,9 +1,8 @@
 import type { ThirdwebClient } from "../../../../client/client.js";
-import {
-  type AuthArgsType,
-  type GetAuthenticatedUserParams,
-  type PreAuthArgsType,
-  UserWalletStatus,
+import type {
+  AuthArgsType,
+  GetAuthenticatedUserParams,
+  PreAuthArgsType,
 } from "../../core/authentication/types.js";
 import { getOrCreateInAppWalletConnector } from "../../core/wallet/in-app-core.js";
 import type { Ecosystem } from "../../core/wallet/types.js";
@@ -47,7 +46,7 @@ async function getAuthenticatedUser(options: GetAuthenticatedUserParams) {
   const connector = await getInAppWalletConnector(client);
   const user = await connector.getUser();
   switch (user.status) {
-    case UserWalletStatus.LOGGED_IN_WALLET_INITIALIZED: {
+    case "Logged In, Wallet Initialized": {
       return user;
     }
   }