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

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

@@ -1,15 +1,8 @@
 import type { ThirdwebClient } from "../../../../../client/client.js";
-import {
-  AuthProvider,
-  type AuthStoredTokenWithCookieReturnType,
-  RecoveryShareManagement,
-} from "../../../core/authentication/types.js";
+import type { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
+import type { AuthStoredTokenWithCookieReturnType } from "../../../core/authentication/types.js";
 import { ErrorMessages } from "../errors.js";
-import {
-  getDeviceShare,
-  setAuthTokenClient,
-  setWallerUserDetails,
-} from "../storage/local.js";
+import { getDeviceShare, setWallerUserDetails } from "../storage/local.js";
 import { setUpNewUserWallet } from "../wallet/creation.js";
 import {
   getCognitoRecoveryPasswordV1,
@@ -20,14 +13,16 @@ import { setUpShareForNewDevice } from "../wallet/retrieval.js";
 export async function postAuth({
   storedToken,
   client,
-  recoveryCode,
+  encryptionKey,
+  storage,
 }: {
   storedToken: AuthStoredTokenWithCookieReturnType["storedToken"];
   client: ThirdwebClient;
-  recoveryCode?: string;
+  encryptionKey?: string;
+  storage: ClientScopedStorage;
 }) {
   if (storedToken.shouldStoreCookieString) {
-    await setAuthTokenClient(storedToken.cookieString, client.clientId);
+    await storage.saveAuthCookie(storedToken.cookieString);
   }
 
   await setWallerUserDetails({
@@ -42,25 +37,31 @@ export async function postAuth({
   });
 
   if (storedToken.isNewUser) {
-    const _recoveryCode = await getRecoveryCode(
+    const _recoveryCode = await getRecoveryCode({
       storedToken,
       client,
-      recoveryCode,
-    );
+      recoveryCode: encryptionKey,
+      storage,
+    });
     if (!_recoveryCode) {
       throw new Error(ErrorMessages.missingRecoveryCode);
     }
-    await setUpNewUserWallet(_recoveryCode, client);
+    await setUpNewUserWallet({
+      client,
+      recoveryCode: _recoveryCode,
+      storage,
+    });
   } else {
     try {
       // existing device share
       await getDeviceShare(client.clientId);
     } catch {
-      const _recoveryCode = await getRecoveryCode(
+      const _recoveryCode = await getRecoveryCode({
         storedToken,
         client,
-        recoveryCode,
-      );
+        recoveryCode: encryptionKey,
+        storage,
+      });
       if (!_recoveryCode) {
         throw new Error(ErrorMessages.missingRecoveryCode);
       }
@@ -68,6 +69,7 @@ export async function postAuth({
         await setUpShareForNewDevice({
           client: client,
           recoveryCode: _recoveryCode,
+          storage,
         });
       } catch (error) {
         console.error("Error setting up wallet on device", error);
@@ -79,63 +81,17 @@ export async function postAuth({
   return storedToken;
 }
 
-export async function postAuthUserManaged(
-  storedToken: AuthStoredTokenWithCookieReturnType["storedToken"],
-  client: ThirdwebClient,
-  password: string,
-) {
-  const _password = await getRecoveryCode(storedToken, client, password);
-
-  if (storedToken.shouldStoreCookieString) {
-    await setAuthTokenClient(storedToken.cookieString, client.clientId);
-  }
-
-  await setWallerUserDetails({
-    clientId: client.clientId,
-    userId: storedToken.authDetails.userWalletId,
-    email:
-      "email" in storedToken.authDetails
-        ? storedToken.authDetails.email
-        : "phoneNumber" in storedToken.authDetails
-          ? storedToken.authDetails.phoneNumber
-          : undefined,
-  });
-
-  if (storedToken.isNewUser) {
-    await setUpNewUserWallet(_password, client);
-  } else {
-    try {
-      // existing device share
-      await getDeviceShare(client.clientId);
-    } catch {
-      // trying to recreate device share from recovery code to derive wallet
-      try {
-        await setUpShareForNewDevice({
-          client,
-          recoveryCode: _password,
-        });
-      } catch (error) {
-        console.error("Error setting up wallet on device", error);
-        throw error;
-      }
-    }
-  }
-
-  return storedToken;
-}
-
-async function getRecoveryCode(
-  storedToken: AuthStoredTokenWithCookieReturnType["storedToken"],
-  client: ThirdwebClient,
-  recoveryCode?: string,
-): Promise<string> {
-  if (
-    storedToken.authDetails.recoveryShareManagement ===
-    RecoveryShareManagement.CLOUD_MANAGED
-  ) {
+async function getRecoveryCode(args: {
+  storedToken: AuthStoredTokenWithCookieReturnType["storedToken"];
+  client: ThirdwebClient;
+  storage: ClientScopedStorage;
+  recoveryCode?: string;
+}): Promise<string> {
+  const { storedToken, client, storage, recoveryCode } = args;
+  if (storedToken.authDetails.recoveryShareManagement === "AWS_MANAGED") {
     if (
-      storedToken.authProvider === AuthProvider.CUSTOM_JWT ||
-      storedToken.authProvider === AuthProvider.CUSTOM_AUTH_ENDPOINT
+      storedToken.authProvider === "CustomJWT" ||
+      storedToken.authProvider === "CustomAuthEndpoint"
     ) {
       if (!recoveryCode) {
         throw new Error(
@@ -145,15 +101,16 @@ async function getRecoveryCode(
       return recoveryCode;
     }
     try {
-      return await getCognitoRecoveryPasswordV2(client);
+      return await getCognitoRecoveryPasswordV2({ client, storage });
     } catch {
-      return await getCognitoRecoveryPasswordV1(client).catch(() => {
-        throw new Error("Something went wrong getting cognito recovery code");
-      });
+      return await getCognitoRecoveryPasswordV1({ client, storage }).catch(
+        () => {
+          throw new Error("Something went wrong getting cognito recovery code");
+        },
+      );
     }
   } else if (
-    storedToken.authDetails.recoveryShareManagement ===
-    RecoveryShareManagement.USER_MANAGED
+    storedToken.authDetails.recoveryShareManagement === "USER_MANAGED"
   ) {
     if (recoveryCode) {
       return recoveryCode;

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

@@ -1,6 +1,5 @@
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import {
-  AUTH_TOKEN_LOCAL_STORAGE_NAME,
   DEVICE_SHARE_LOCAL_STORAGE_NAME,
   WALLET_USER_DETAILS_LOCAL_STORAGE_NAME,
   WALLET_USER_ID_LOCAL_STORAGE_NAME,
@@ -22,28 +21,28 @@ const removeItemInAsyncStorage = async (key: string) => {
   await AsyncStorage.removeItem(key);
 };
 
-export async function getAuthTokenClient(clientId: string) {
-  return getItemFromAsyncStorage(AUTH_TOKEN_LOCAL_STORAGE_NAME(clientId));
-}
-
-export async function setAuthTokenClient(
-  cookieString: string,
-  clientId: string,
-): Promise<void> {
-  const authToken = AUTH_TOKEN_LOCAL_STORAGE_NAME(clientId);
-  await setItemInAsyncStorage(authToken, cookieString);
-}
-
-export async function removeAuthTokenInClient(
-  clientId: string,
-): Promise<boolean> {
-  const verifiedTokenString = await getAuthTokenClient(clientId);
-  if (verifiedTokenString) {
-    await removeItemInAsyncStorage(AUTH_TOKEN_LOCAL_STORAGE_NAME(clientId));
-    return true;
-  }
-  return false;
-}
+// export async function getAuthTokenClient(clientId: string) {
+//   return getItemFromAsyncStorage(AUTH_TOKEN_LOCAL_STORAGE_NAME(clientId));
+// }
+
+// export async function setAuthTokenClient(
+//   cookieString: string,
+//   clientId: string,
+// ): Promise<void> {
+//   const authToken = AUTH_TOKEN_LOCAL_STORAGE_NAME(clientId);
+//   await setItemInAsyncStorage(authToken, cookieString);
+// }
+
+// export async function removeAuthTokenInClient(
+//   clientId: string,
+// ): Promise<boolean> {
+//   const verifiedTokenString = await getAuthTokenClient(clientId);
+//   if (verifiedTokenString) {
+//     await removeItemInAsyncStorage(AUTH_TOKEN_LOCAL_STORAGE_NAME(clientId));
+//     return true;
+//   }
+//   return false;
+// }
 
 export async function setWallerUserDetails({
   clientId,

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

@@ -2,6 +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 { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
 import type { SetUpWalletRpcReturnType } from "../../../core/authentication/types.js";
 import { storeUserShares } from "../api/fetchers.js";
 import { logoutUser } from "../auth/logout.js";
@@ -15,18 +16,21 @@ import { createErrorMessage } from "../errors.js";
 import { setDeviceShare } from "../storage/local.js";
 import { encryptShareWeb } from "./encryption.js";
 
-export async function setUpNewUserWallet(
-  recoveryCode: string,
-  client: ThirdwebClient,
-) {
+export async function setUpNewUserWallet(args: {
+  recoveryCode: string;
+  client: ThirdwebClient;
+  storage: ClientScopedStorage;
+}) {
+  const { client, recoveryCode, storage } = args;
   try {
     return await generateWallet({
       client,
       recoveryCode: recoveryCode,
+      storage,
     });
   } catch (e) {
     // we log user out so they aren't in the weird state where they are logged in but the wallet is not initialized
-    await logoutUser(client.clientId);
+    await logoutUser({ client, storage });
     throw new Error(
       `Error creating new ews account. Please try signing in again. Original Error: ${e}`,
     );
@@ -37,9 +41,11 @@ export async function setUpNewUserWallet(
 async function generateWallet({
   client,
   recoveryCode,
+  storage,
 }: {
   client: ThirdwebClient;
   recoveryCode: string;
+  storage: ClientScopedStorage;
 }): Promise<
   {
     recoveryCode: string;
@@ -49,6 +55,7 @@ async function generateWallet({
 
   const maybeDeviceShare = await storeShares({
     client,
+    storage,
     walletAddress: walletDetails.publicAddress,
     authShare: walletDetails.shares[AUTH_SHARE_INDEX],
     deviceShare: walletDetails.shares[DEVICE_SHARE_INDEX],
@@ -112,6 +119,7 @@ export async function storeShares<R extends string | undefined>({
   authShare,
   deviceShare,
   recoveryShares,
+  storage,
 }: {
   client: ThirdwebClient;
   walletAddress: string;
@@ -120,6 +128,7 @@ export async function storeShares<R extends string | undefined>({
   recoveryShares?: R extends string
     ? { share: R; recoveryCode: string }[]
     : never;
+  storage: ClientScopedStorage;
 }): Promise<{ deviceShareStored: string } | undefined> {
   let maybeEncryptedRecoveryShares:
     | { share: string; isClientEncrypted: boolean }[]
@@ -144,6 +153,7 @@ export async function storeShares<R extends string | undefined>({
     client,
     maybeEncryptedRecoveryShares,
     walletAddress,
+    storage,
   });
 
   try {

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

@@ -5,6 +5,7 @@ import {
 } from "@aws-sdk/credential-providers";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { stringToBytes } from "../../../../../utils/encoding/to-bytes.js";
+import type { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
 import { authFetchEmbeddedWalletUser } from "../api/fetchers.js";
 import {
   AWS_REGION,
@@ -16,14 +17,18 @@ import {
   ROUTE_COGNITO_IDENTITY_POOL_URL,
 } from "../constants.js";
 
-export async function getCognitoRecoveryPasswordV1(client: ThirdwebClient) {
-  const idTokenResponse = await authFetchEmbeddedWalletUser(
-    client,
-    ROUTE_AUTH_COGNITO_ID_TOKEN_V1,
-    {
+export async function getCognitoRecoveryPasswordV1(args: {
+  client: ThirdwebClient;
+  storage: ClientScopedStorage;
+}) {
+  const idTokenResponse = await authFetchEmbeddedWalletUser({
+    client: args.client,
+    url: ROUTE_AUTH_COGNITO_ID_TOKEN_V1,
+    props: {
       method: "GET",
     },
-  );
+    storage: args.storage,
+  });
   if (!idTokenResponse.ok) {
     throw new Error(
       `Failed to fetch id token from Cognito: ${JSON.stringify(
@@ -73,14 +78,18 @@ export async function getCognitoRecoveryPasswordV1(client: ThirdwebClient) {
   return result;
 }
 
-export async function getCognitoRecoveryPasswordV2(client: ThirdwebClient) {
-  const idTokenResponse = await authFetchEmbeddedWalletUser(
-    client,
-    ROUTE_AUTH_COGNITO_ID_TOKEN_V2,
-    {
+export async function getCognitoRecoveryPasswordV2(args: {
+  client: ThirdwebClient;
+  storage: ClientScopedStorage;
+}) {
+  const idTokenResponse = await authFetchEmbeddedWalletUser({
+    client: args.client,
+    url: ROUTE_AUTH_COGNITO_ID_TOKEN_V2,
+    props: {
       method: "GET",
     },
-  );
+    storage: args.storage,
+  });
   if (!idTokenResponse.ok) {
     throw new Error(
       `Failed to fetch id token from Cognito: ${JSON.stringify(

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

@@ -6,6 +6,7 @@ import {
 } from "../../../../../utils/encoding/hex.js";
 import type { Account } from "../../../../interfaces/wallet.js";
 import { privateKeyToAccount } from "../../../../private-key.js";
+import type { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
 import type { SetUpWalletRpcReturnType } from "../../../core/authentication/types.js";
 import { getUserShares } from "../api/fetchers.js";
 import {
@@ -20,13 +21,17 @@ import { decryptShareWeb } from "./encryption.js";
  * For users on a known device and logged in.
  * Will throw if called on a new device // user not logged in
  */
-export async function getExistingUserAccount(args: { client: ThirdwebClient }) {
-  const { client } = args;
+export async function getExistingUserAccount(args: {
+  client: ThirdwebClient;
+  storage: ClientScopedStorage;
+}) {
+  const { client, storage } = args;
   const { authShare, deviceShare } = await getShares({
     client,
     authShare: { toRetrieve: true },
     deviceShare: { toRetrieve: true },
     recoveryShare: { toRetrieve: false },
+    storage,
   });
   return getAccountFromShares({
     client,
@@ -74,6 +79,7 @@ async function getShares<
   authShare,
   deviceShare,
   recoveryShare,
+  storage,
 }: {
   client: ThirdwebClient;
   authShare: { toRetrieve: A };
@@ -86,6 +92,7 @@ async function getShares<
         toRetrieve: R;
       };
   deviceShare: { toRetrieve: D };
+  storage: ClientScopedStorage;
 }): Promise<{
   authShare: A extends true ? string : undefined;
   recoveryShare: R extends true ? string : undefined;
@@ -119,7 +126,7 @@ async function getShares<
     );
   }
 
-  const userShares = await getUserShares(client, getShareUrl);
+  const userShares = await getUserShares({ client, getShareUrl, storage });
   const { authShare: _authShare, maybeEncryptedRecoveryShares } = userShares;
 
   let recoverShareToReturn: string | undefined;
@@ -180,15 +187,18 @@ async function getAccountAddressFromShares(args: {
 export async function setUpShareForNewDevice({
   recoveryCode,
   client,
+  storage,
 }: {
   recoveryCode: string;
   client: ThirdwebClient;
+  storage: ClientScopedStorage;
 }): Promise<SetUpWalletRpcReturnType> {
   const { recoveryShare, authShare } = await getShares({
     client,
     authShare: { toRetrieve: true },
     recoveryShare: { toRetrieve: true, recoveryCode },
     deviceShare: { toRetrieve: false },
+    storage,
   });
   // instead of recreating a new share, just save the recovery one as the new device share
   const deviceShare = recoveryShare;
@@ -201,6 +211,7 @@ export async function setUpShareForNewDevice({
     client,
     walletAddress,
     deviceShare,
+    storage,
   });
 
   if (!maybeDeviceShare?.deviceShareStored) {

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

@@ -0,0 +1,72 @@
+import type { ThirdwebClient } from "../../../../../client/client.js";
+import type { Account } from "../../../../interfaces/wallet.js";
+import type { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
+import type {
+  AuthResultAndRecoveryCode,
+  GetUser,
+} from "../../../core/authentication/types.js";
+import type { IWebWallet } from "../../../core/wallet/web-wallet.js";
+import { fetchUserDetails } from "../api/fetchers.js";
+import { postAuth } from "../auth/middleware.js";
+import { getWalletUserDetails } from "../storage/local.js";
+import { getExistingUserAccount } from "./retrieval.js";
+
+export class ShardedWallet implements IWebWallet {
+  private client: ThirdwebClient;
+  private storage: ClientScopedStorage;
+
+  constructor(args: {
+    client: ThirdwebClient;
+    storage: ClientScopedStorage;
+  }) {
+    this.client = args.client;
+    this.storage = args.storage;
+  }
+
+  async postWalletSetUp(authResult: AuthResultAndRecoveryCode): Promise<void> {
+    await postAuth({
+      storedToken: authResult.storedToken,
+      client: this.client,
+      storage: this.storage,
+      encryptionKey: authResult.encryptionKey,
+    });
+  }
+
+  async getUserWalletStatus(): Promise<GetUser> {
+    const localData = await getWalletUserDetails(this.client.clientId);
+    const userStatus = await fetchUserDetails({
+      client: this.client,
+      email: localData?.email,
+      storage: this.storage,
+    });
+    if (userStatus.status === "Logged In, Wallet Initialized") {
+      return {
+        status: userStatus.status,
+        authDetails: userStatus.storedToken.authDetails,
+        walletAddress: userStatus.walletAddress,
+        account: await this.getAccount(),
+      };
+    }
+    if (userStatus.status === "Logged In, New Device") {
+      return {
+        status: "Logged In, New Device",
+        authDetails: userStatus.storedToken.authDetails,
+        walletAddress: userStatus.walletAddress,
+      };
+    }
+    if (userStatus.status === "Logged In, Wallet Uninitialized") {
+      return {
+        status: "Logged In, Wallet Uninitialized",
+        authDetails: userStatus.storedToken.authDetails,
+      };
+    }
+    // Logged out
+    return { status: "Logged Out" };
+  }
+  getAccount(): Promise<Account> {
+    return getExistingUserAccount({
+      client: this.client,
+      storage: this.storage,
+    });
+  }
+}

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

@@ -67,5 +67,5 @@ export function inAppWallet(
         passkeyDomain: createOptions?.auth?.passkeyDomain,
       });
     },
-  });
+  }) as Wallet<"inApp">;
 }