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

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

@@ -1,68 +1,27 @@
 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 type { ClientScopedStorage } from "../../core/authentication/client-scoped-storage.js";
 import { getLoginUrl } from "../../core/authentication/getLoginPath.js";
-import { guestAuthenticate } from "../../core/authentication/guest.js";
-import { siweAuthenticate } from "../../core/authentication/siwe.js";
 import type {
   AuthStoredTokenWithCookieReturnType,
-  MultiStepAuthArgsType,
   OAuthRedirectObject,
 } from "../../core/authentication/types.js";
 import type { Ecosystem } from "../../core/wallet/types.js";
-import { verifyOtp } from "../../web/lib/auth/otp.js";
-import {
-  deleteAccount,
-  getSessionHeaders,
-  verifyClientId,
-} from "../helpers/api/fetchers.js";
-import { postAuth, postAuthUserManaged } from "../helpers/auth/middleware.js";
-import {
-  ROUTE_AUTH_ENDPOINT_CALLBACK,
-  ROUTE_AUTH_JWT_CALLBACK,
-} from "../helpers/constants.js";
+import { deleteAccount, verifyClientId } from "../helpers/api/fetchers.js";
 import { createErrorMessage } from "../helpers/errors.js";
 
-export async function otpLogin(
-  options: MultiStepAuthArgsType & {
-    client: ThirdwebClient;
-    ecosystem?: Ecosystem;
-  },
-): Promise<AuthStoredTokenWithCookieReturnType> {
-  const { storedToken } = await verifyOtp(options);
-  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: options.client });
-
-    return { storedToken };
-  } catch (e) {
-    throw new Error(
-      createErrorMessage("Malformed response from post authentication", e),
-    );
-  }
-}
-
-export async function authenticate(
-  auth: OAuthRedirectObject,
-  client: ThirdwebClient,
-): Promise<AuthStoredTokenWithCookieReturnType> {
+export async function socialAuth(args: {
+  auth: OAuthRedirectObject;
+  client: ThirdwebClient;
+  ecosystem?: Ecosystem;
+}): Promise<AuthStoredTokenWithCookieReturnType> {
+  const { auth, client, ecosystem } = args;
   const loginUrl = getLoginUrl({
     authOption: auth.strategy,
     client,
     mode: "window",
     redirectUrl: auth.redirectUrl,
+    ecosystem,
   });
 
   const result = await WebBrowser.openAuthSessionAsync(
@@ -99,204 +58,17 @@ export async function authenticate(
   return JSON.parse(authResult);
 }
 
-export async function socialLogin(
-  auth: OAuthRedirectObject,
-  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,
-  wallet: Wallet,
-  chain: Chain,
-  ecosystem?: Ecosystem,
-): Promise<AuthStoredTokenWithCookieReturnType> {
-  const { storedToken } = await siweAuthenticate({
-    client,
-    ecosystem,
-    wallet,
-    chain,
-  });
-  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 guestLogin(
-  client: ThirdwebClient,
-  ecosystem?: Ecosystem,
-): Promise<AuthStoredTokenWithCookieReturnType> {
-  const { storedToken } = await guestAuthenticate({
-    client,
-    ecosystem,
-    storage: nativeLocalStorage,
-  });
-  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 customJwt(
-  authOptions: { jwt: string; password: string },
-  client: ThirdwebClient,
-): Promise<AuthStoredTokenWithCookieReturnType> {
-  const { jwt, password } = authOptions;
-
-  const resp = await fetch(ROUTE_AUTH_JWT_CALLBACK, {
-    method: "POST",
-    headers: {
-      ...getSessionHeaders(),
-    },
-    body: JSON.stringify({
-      jwt: jwt,
-      developerClientId: client.clientId,
-    }),
-  });
-  if (!resp.ok) {
-    const error = await resp.json();
-    throw new Error(`JWT authentication error: ${error.message}`);
-  }
-
-  try {
-    const { verifiedToken, verifiedTokenJwtString } = await resp.json();
-
-    const toStoreToken: AuthStoredTokenWithCookieReturnType["storedToken"] = {
-      jwtToken: verifiedToken.jwtToken,
-      authProvider: verifiedToken.authProvider,
-      authDetails: {
-        ...verifiedToken.authDetails,
-        email: verifiedToken.authDetails.email,
-      },
-      developerClientId: verifiedToken.developerClientId,
-      cookieString: verifiedTokenJwtString,
-      shouldStoreCookieString: true,
-      isNewUser: verifiedToken.isNewUser,
-    };
-
-    await postAuthUserManaged(toStoreToken, client, password);
-
-    return { storedToken: verifiedToken };
-  } catch (e) {
-    throw new Error(
-      createErrorMessage("Malformed response from post jwt authentication", e),
-    );
-  }
-}
-
-export async function authEndpoint(
-  authOptions: { payload: string; encryptionKey: string },
-  client: ThirdwebClient,
-): Promise<AuthStoredTokenWithCookieReturnType> {
-  const { payload, encryptionKey } = authOptions;
-
-  const resp = await fetch(ROUTE_AUTH_ENDPOINT_CALLBACK, {
-    method: "POST",
-    headers: {
-      ...getSessionHeaders(),
-    },
-    body: JSON.stringify({
-      payload: payload,
-      developerClientId: client.clientId,
-    }),
-  });
-  if (!resp.ok) {
-    const error = await resp.json();
-    throw new Error(
-      `Custom auth endpoint authentication error: ${error.message}`,
-    );
-  }
-
-  try {
-    const { verifiedToken, verifiedTokenJwtString } = await resp.json();
-
-    const toStoreToken: AuthStoredTokenWithCookieReturnType["storedToken"] = {
-      jwtToken: verifiedToken.jwtToken,
-      authProvider: verifiedToken.authProvider,
-      authDetails: {
-        ...verifiedToken.authDetails,
-        email: verifiedToken.authDetails.email,
-      },
-      developerClientId: verifiedToken.developerClientId,
-      cookieString: verifiedTokenJwtString,
-      shouldStoreCookieString: true,
-      isNewUser: verifiedToken.isNewUser,
-    };
-
-    await postAuthUserManaged(toStoreToken, client, encryptionKey);
-
-    return { storedToken: verifiedToken };
-  } catch (e) {
-    throw new Error(
-      createErrorMessage(
-        "Malformed response from post auth_endpoint authentication",
-        e,
-      ),
-    );
-  }
-}
-
 export async function deleteActiveAccount(options: {
   client: ThirdwebClient;
+  storage: ClientScopedStorage;
 }): Promise<boolean> {
   await verifyClientId(options.client);
 
   try {
-    return deleteAccount(options.client);
+    return deleteAccount({
+      client: options.client,
+      storage: options.storage,
+    });
   } catch (e) {
     throw new Error(createErrorMessage("Error deleting the active account", e));
   }

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

@@ -0,0 +1,89 @@
+import type { ThirdwebClient } from "../../../client/client.js";
+import type { Wallet } from "../../interfaces/wallet.js";
+import type {
+  CreateWalletArgs,
+  EcosystemWalletId,
+} from "../../wallet-types.js";
+import { createInAppWallet } from "../core/wallet/in-app-core.js";
+
+/**
+ * Creates an [Ecosystem Wallet](https://portal.thirdweb.com/connect/ecosystems/overview) based on various authentication methods.
+ *
+ * Available authentication methods:
+ * - Email
+ * - Phone
+ * - Passkey
+ * - Google
+ * - Apple
+ * - Facebook
+ * - Discord
+ * - LINE
+ * - X
+ * - Farcaster
+ *
+ * Can also be configured to use Account Abstraction to directly connect to a ERC4337 smart account based on those authentication methods.
+ *
+ * Refer to [inAppWallet](https://portal.thirdweb.com/references/typescript/v5/inAppWallet) for detailed usage examples.
+ *
+ * @param createOptions - configuration options
+ * Refer to [EcosystemWalletCreationOptions](https://portal.thirdweb.com/references/typescript/v5/EcosystemWalletCreationOptions) for more details.
+ * @returns The created ecosystem wallet.
+ * @example
+ *
+ * ### Connect to an ecosystem wallet
+ *
+ * ```ts
+ * import { ecosystemWallet } from "thirdweb/wallets";
+ *
+ * const wallet = ecosystemWallet("ecosystem.hooli");
+ *
+ * const account = await wallet.connect({
+ *   client,
+ *   chain,
+ *   strategy: "google",
+ * });
+ * ```
+ *
+ * [View all connection options](https://portal.thirdweb.com/references/typescript/v5/EcosystemWalletConnectionOptions)
+ *
+ * ### Connect to a restricted ecosystem wallet with your designated partner ID
+ *
+ * The parnter ID will be provided to you by the ecosystem with which you're integrating.
+ *
+ * ```ts
+ * import { ecosystemWallet } from "thirdweb/wallets";
+ * const wallet = ecosystemWallet("ecosystem.hooli", {
+ *  partnerId: "..."
+ * });
+ * ```
+ *
+ * Refer to [inAppWallet](https://portal.thirdweb.com/references/typescript/v5/inAppWallet) for more usage examples.
+ *
+ * @wallet
+ */
+export function ecosystemWallet(
+  ...args: CreateWalletArgs<EcosystemWalletId>
+): Wallet<EcosystemWalletId> {
+  const [ecosystemId, createOptions] = args;
+  const ecosystem = {
+    id: ecosystemId,
+    partnerId: createOptions?.partnerId,
+  };
+  return createInAppWallet({
+    ecosystem,
+    createOptions: {
+      auth: {
+        ...createOptions?.auth,
+        options: [], // controlled by ecosystem
+      },
+    },
+    connectorFactory: async (client: ThirdwebClient) => {
+      const { InAppNativeConnector } = await import("./native-connector.js");
+      return new InAppNativeConnector({
+        client,
+        ecosystem,
+        // TODO (enclave): passkeyDomain for ecosystem wallets
+      });
+    },
+  }) as Wallet<EcosystemWalletId>;
+}

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

@@ -2,6 +2,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 { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
 import type { UserDetailsApiType } from "../../../core/authentication/types.js";
 import {
   ROUTE_EMBEDDED_WALLET_DETAILS,
@@ -10,7 +11,6 @@ import {
   THIRDWEB_SESSION_NONCE_HEADER,
 } from "../constants.js";
 import { createErrorMessage } from "../errors.js";
-import { getAuthTokenClient } from "../storage/local.js";
 
 const EMBEDDED_WALLET_TOKEN_HEADER = "embedded-wallet-token";
 const PAPER_CLIENT_ID_HEADER = "x-thirdweb-client-id";
@@ -46,13 +46,15 @@ export const verifyClientId = async (client: ThirdwebClient) => {
   };
 };
 
-export const authFetchEmbeddedWalletUser = async (
-  client: ThirdwebClient,
-  url: string,
-  props: Parameters<typeof fetch>[1],
-  retries = 3,
-): Promise<Response> => {
-  const authTokenClient = await getAuthTokenClient(client.clientId);
+export async function authFetchEmbeddedWalletUser(args: {
+  client: ThirdwebClient;
+  url: string;
+  props: Parameters<typeof fetch>[1];
+  storage: ClientScopedStorage;
+  retries?: number;
+}): Promise<Response> {
+  const { client, url, props, storage, retries = 0 } = args;
+  const authTokenClient = await storage.getAuthCookie();
   const params = { ...props };
   params.headers = params?.headers
     ? {
@@ -76,20 +78,22 @@ export const authFetchEmbeddedWalletUser = async (
   } catch (e) {
     if (retries > 0) {
       await new Promise((resolve) => setTimeout(resolve, 500));
-      return await authFetchEmbeddedWalletUser(
+      return await authFetchEmbeddedWalletUser({
         client,
         url,
-        params,
-        retries - 1,
-      );
+        props: params,
+        storage,
+        retries: retries - 1,
+      });
     }
     throw e;
   }
-};
+}
 
 export async function fetchUserDetails(args: {
   email?: string;
   client: ThirdwebClient;
+  storage: ClientScopedStorage;
 }): Promise<UserDetailsApiType> {
   const url = new URL(ROUTE_EMBEDDED_WALLET_DETAILS);
   if (args) {
@@ -97,8 +101,13 @@ export async function fetchUserDetails(args: {
     url.searchParams.append("email", args.email ?? "none");
     url.searchParams.append("clientId", args.client.clientId);
   }
-  const resp = await authFetchEmbeddedWalletUser(args.client, url.href, {
-    method: "GET",
+  const resp = await authFetchEmbeddedWalletUser({
+    client: args.client,
+    url: url.href,
+    props: {
+      method: "GET",
+    },
+    storage: args.storage,
   });
   if (!resp.ok) {
     const error = await resp.json();
@@ -115,6 +124,7 @@ export async function storeUserShares({
   walletAddress,
   maybeEncryptedRecoveryShares,
   authShare,
+  storage,
 }: {
   client: ThirdwebClient;
   walletAddress: string;
@@ -123,11 +133,12 @@ export async function storeUserShares({
     isClientEncrypted: boolean;
   }[];
   authShare?: string;
+  storage: ClientScopedStorage;
 }) {
-  const resp = await authFetchEmbeddedWalletUser(
+  const resp = await authFetchEmbeddedWalletUser({
     client,
-    ROUTE_STORE_USER_SHARES,
-    {
+    url: ROUTE_STORE_USER_SHARES,
+    props: {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
@@ -136,7 +147,8 @@ export async function storeUserShares({
         authShare,
       }),
     },
-  );
+    storage,
+  });
 
   if (!resp.ok) {
     const error = await resp.json();
@@ -151,9 +163,18 @@ export async function storeUserShares({
   }
 }
 
-export async function getUserShares(client: ThirdwebClient, getShareUrl: URL) {
-  const resp = await authFetchEmbeddedWalletUser(client, getShareUrl.href, {
-    method: "GET",
+export async function getUserShares(args: {
+  client: ThirdwebClient;
+  getShareUrl: URL;
+  storage: ClientScopedStorage;
+}) {
+  const resp = await authFetchEmbeddedWalletUser({
+    client: args.client,
+    url: args.getShareUrl.href,
+    props: {
+      method: "GET",
+    },
+    storage: args.storage,
   });
   if (!resp.ok) {
     const error = await resp.json();
@@ -179,10 +200,18 @@ export async function getUserShares(client: ThirdwebClient, getShareUrl: URL) {
   }
 }
 
-export async function deleteAccount(client: ThirdwebClient) {
+export async function deleteAccount(args: {
+  client: ThirdwebClient;
+  storage: ClientScopedStorage;
+}) {
   const url = new URL(ROUTE_EMBEDDED_WALLET_DETAILS);
-  const resp = await authFetchEmbeddedWalletUser(client, url.href, {
-    method: "DELETE",
+  const resp = await authFetchEmbeddedWalletUser({
+    client: args.client,
+    url: url.href,
+    props: {
+      method: "DELETE",
+    },
+    storage: args.storage,
   });
   if (!resp.ok) {
     const error = await resp.json();

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

@@ -1,12 +1,13 @@
+import type { ThirdwebClient } from "../../../../../client/client.js";
+import type { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
 import type { LogoutReturnType } from "../../../core/authentication/types.js";
-import {
-  removeAuthTokenInClient,
-  removeLoggedInWalletUserId,
-} from "../storage/local.js";
-
-export async function logoutUser(clientId: string): Promise<LogoutReturnType> {
-  const isLoggedUserOutIncognito = await removeAuthTokenInClient(clientId);
-  await removeLoggedInWalletUserId(clientId);
+import { removeLoggedInWalletUserId } from "../storage/local.js";
 
+export async function logoutUser(args: {
+  client: ThirdwebClient;
+  storage: ClientScopedStorage;
+}): Promise<LogoutReturnType> {
+  const isLoggedUserOutIncognito = await args.storage.removeAuthCookie();
+  await removeLoggedInWalletUserId(args.client.clientId); // TODO (enclave): move this to client scoped storage
   return { success: isLoggedUserOutIncognito };
 }