thirdweb 5.77.0 → 5.79.0-nightly-f91f6310e9396918d0ffc5217eeb4a44cef0b8c8-20241215000412

package/src/react/web/wallets/in-app/InputSelectionUI.test.tsx

@@ -0,0 +1,45 @@
+import { describe, expect, it, vi } from "vitest";
+import { render, screen } from "../../../../../test/src/react-render.js";
+import { getCountrySelector } from "./CountrySelector.js";
+import { InputSelectionUI } from "./InputSelectionUI.js";
+
+vi.mock("./CountrySelector.js", async (importOriginal) => ({
+  ...(await importOriginal()),
+  getCountrySelector: vi.fn(),
+}));
+
+describe("InputSelectionUI", () => {
+  it("should initialize countryCodeInfo with defaultSmsCountryCode", () => {
+    const mockGetCountrySelector = vi.mocked(getCountrySelector);
+    mockGetCountrySelector.mockReturnValue("CA +1");
+
+    render(
+      <InputSelectionUI
+        defaultSmsCountryCode="CA"
+        onSelect={vi.fn()}
+        placeholder=""
+        name=""
+        type=""
+        submitButtonText=""
+        format="phone"
+      />,
+    );
+
+    expect(screen.getByRole("combobox")).toHaveValue("CA +1");
+  });
+
+  it('should initialize countryCodeInfo with "US +1" if defaultSmsCountryCode is not provided', () => {
+    render(
+      <InputSelectionUI
+        onSelect={vi.fn()}
+        placeholder=""
+        name=""
+        type=""
+        submitButtonText=""
+        format="phone"
+      />,
+    );
+
+    expect(screen.getByRole("combobox")).toHaveValue("US +1");
+  });
+});

package/src/react/web/wallets/in-app/InputSelectionUI.tsx

@@ -10,7 +10,8 @@ import { Spacer } from "../../ui/components/Spacer.js";
 import { IconButton } from "../../ui/components/buttons.js";
 import { Input, InputContainer } from "../../ui/components/formElements.js";
 import { Text } from "../../ui/components/text.js";
-import { CountrySelector } from "./CountrySelector.js";
+import { CountrySelector, getCountrySelector } from "./CountrySelector.js";
+import type { SupportedSmsCountry } from "./supported-sms-countries.js";
 
 export function InputSelectionUI(props: {
   onSelect: (data: string) => void;
@@ -22,8 +23,13 @@ export function InputSelectionUI(props: {
   submitButtonText: string;
   format?: "phone";
   disabled?: boolean;
+  defaultSmsCountryCode?: SupportedSmsCountry;
 }) {
-  const [countryCodeInfo, setCountryCodeInfo] = useState("US +1");
+  const [countryCodeInfo, setCountryCodeInfo] = useState(
+    props.defaultSmsCountryCode
+      ? getCountrySelector(props.defaultSmsCountryCode)
+      : "US +1",
+  );
   const [input, setInput] = useState("");
   const [error, setError] = useState<string | undefined>();
   const [showError, setShowError] = useState(false);

package/src/react/web/wallets/in-app/supported-sms-countries.ts

@@ -1,3 +1,5 @@
+export type SupportedSmsCountry =
+  (typeof supportedSmsCountries)[number]["countryIsoCode"];
 export const supportedSmsCountries = [
   {
     countryIsoCode: "AD",
@@ -1183,4 +1185,4 @@ export const supportedSmsCountries = [
     countryName: "Zimbabwe",
     phoneNumberCode: "263",
   },
-];
+] as const;

package/src/react/web/wallets/shared/ConnectWalletSocialOptions.tsx

@@ -448,6 +448,9 @@ export const ConnectWalletSocialOptions = (
             disabled={props.disabled}
             emptyErrorMessage={emptyErrorMessage}
             submitButtonText={locale.submitEmail}
+            defaultSmsCountryCode={
+              wallet.getConfig()?.auth?.defaultSmsCountryCode
+            }
           />
         ) : (
           <WalletTypeRowButton

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.77.0";
+export const version = "5.79.0-nightly-f91f6310e9396918d0ffc5217eeb4a44cef0b8c8-20241215000412";

package/src/wallets/ecosystem/types.ts

@@ -1,3 +1,4 @@
+import type { SupportedSmsCountry } from "../../react/web/wallets/in-app/supported-sms-countries.js";
 import type {
   InAppWalletAutoConnectOptions,
   InAppWalletConnectionOptions,
@@ -13,6 +14,10 @@ export type EcosystemWalletCreationOptions = {
      * Optional url to redirect to after authentication
      */
     redirectUrl?: string;
+    /**
+     * The default country code to use for SMS authentication
+     */
+    defaultSmsCountryCode?: SupportedSmsCountry;
   };
   /**
    * The partnerId of the ecosystem wallet to connect to

package/src/wallets/in-app/core/authentication/linkAccount.test.ts

@@ -0,0 +1,160 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createThirdwebClient } from "../../../../client/client.js";
+import { getClientFetch } from "../../../../utils/fetch.js";
+import type { ClientScopedStorage } from "./client-scoped-storage.js";
+import {
+  getLinkedProfilesInternal,
+  linkAccount,
+  unlinkAccount,
+} from "./linkAccount.js";
+import type { Profile } from "./types.js";
+
+vi.mock("../../../../utils/fetch.js");
+
+describe("Account linking functions", () => {
+  const mockClient = createThirdwebClient({ clientId: "mock-client-id" });
+  const mockStorage = {
+    getAuthCookie: vi.fn(),
+  } as unknown as ClientScopedStorage;
+  const mockFetch = vi.fn();
+  const mockLinkedAccounts = [
+    { type: "email", details: { email: "user@example.com" } },
+    { type: "phone", details: { phone: "1234567890" } },
+    { type: "wallet", details: { address: "0x123456789" } },
+  ] satisfies Profile[];
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(getClientFetch).mockReturnValue(mockFetch);
+    vi.mocked(mockStorage.getAuthCookie).mockResolvedValue("mock-token");
+    mockFetch.mockResolvedValue({
+      ok: true,
+      json: () => Promise.resolve({ linkedAccounts: mockLinkedAccounts }),
+    });
+  });
+
+  describe("linkAccount", () => {
+    it("should successfully link an account", async () => {
+      const result = await linkAccount({
+        client: mockClient,
+        tokenToLink: "token-to-link",
+        storage: mockStorage,
+      });
+
+      expect(mockFetch).toHaveBeenCalledWith(
+        "https://embedded-wallet.thirdweb.com/api/2024-05-05/account/connect",
+        {
+          method: "POST",
+          headers: {
+            Authorization: "Bearer iaw-auth-token:mock-token",
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            accountAuthTokenToConnect: "token-to-link",
+          }),
+        },
+      );
+      expect(result).toEqual(mockLinkedAccounts);
+    });
+
+    it("should throw error when no user is logged in", async () => {
+      vi.mocked(mockStorage.getAuthCookie).mockResolvedValue(null);
+
+      await expect(
+        linkAccount({
+          client: mockClient,
+          tokenToLink: "token-to-link",
+          storage: mockStorage,
+        }),
+      ).rejects.toThrow("Failed to link account, no user logged in");
+    });
+  });
+
+  describe("unlinkAccount", () => {
+    const profileToUnlink = {
+      type: "email",
+      details: { email: "user@example.com" },
+    } satisfies Profile;
+    it("should successfully unlink an account", async () => {
+      const result = await unlinkAccount({
+        client: mockClient,
+        profileToUnlink,
+        storage: mockStorage,
+      });
+
+      expect(mockFetch).toHaveBeenCalledWith(
+        "https://embedded-wallet.thirdweb.com/api/2024-05-05/account/disconnect",
+        {
+          method: "POST",
+          headers: {
+            Authorization: "Bearer iaw-auth-token:mock-token",
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify(profileToUnlink),
+        },
+      );
+      expect(result).toEqual(mockLinkedAccounts);
+    });
+
+    it("should throw error when no user is logged in", async () => {
+      vi.mocked(mockStorage.getAuthCookie).mockResolvedValue(null);
+
+      await expect(
+        unlinkAccount({
+          client: mockClient,
+          profileToUnlink,
+          storage: mockStorage,
+        }),
+      ).rejects.toThrow("Failed to unlink account, no user logged in");
+    });
+    it("should handle API errors", async () => {
+      mockFetch.mockResolvedValue({
+        ok: false,
+        json: () => Promise.resolve({ message: "API Error" }),
+      });
+
+      await expect(
+        unlinkAccount({
+          client: mockClient,
+          profileToUnlink,
+          storage: mockStorage,
+        }),
+      ).rejects.toThrow("API Error");
+    });
+  });
+
+  describe("getLinkedProfilesInternal", () => {
+    it("should successfully get linked profiles", async () => {
+      const result = await getLinkedProfilesInternal({
+        client: mockClient,
+        storage: mockStorage,
+      });
+
+      expect(mockFetch).toHaveBeenCalledWith(
+        "https://embedded-wallet.thirdweb.com/api/2024-05-05/accounts",
+        {
+          method: "GET",
+          headers: {
+            Authorization: "Bearer iaw-auth-token:mock-token",
+            "Content-Type": "application/json",
+          },
+        },
+      );
+      expect(result).toEqual(mockLinkedAccounts);
+    });
+
+    it("should handle API errors", async () => {
+      mockFetch.mockResolvedValue({
+        ok: false,
+        json: () => Promise.resolve({ message: "API Error" }),
+      });
+
+      await expect(
+        getLinkedProfilesInternal({
+          client: mockClient,
+          storage: mockStorage,
+        }),
+      ).rejects.toThrow("API Error");
+    });
+  });
+});

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

@@ -57,6 +57,55 @@ export async function linkAccount({
   return (linkedAccounts ?? []) satisfies Profile[];
 }
 
+/**
+ * @description
+ * Links a new account to the current one using an auth token.
+ * For the public-facing API, use `wallet.linkProfile` instead.
+ *
+ * @internal
+ */
+export async function unlinkAccount({
+  client,
+  ecosystem,
+  profileToUnlink,
+  storage,
+}: {
+  client: ThirdwebClient;
+  ecosystem?: Ecosystem;
+  profileToUnlink: Profile;
+  storage: ClientScopedStorage;
+}): Promise<Profile[]> {
+  const clientFetch = getClientFetch(client, ecosystem);
+  const IN_APP_URL = getThirdwebBaseUrl("inAppWallet");
+  const currentAccountToken = await storage.getAuthCookie();
+
+  if (!currentAccountToken) {
+    throw new Error("Failed to unlink account, no user logged in");
+  }
+
+  const headers: Record<string, string> = {
+    Authorization: `Bearer iaw-auth-token:${currentAccountToken}`,
+    "Content-Type": "application/json",
+  };
+  const linkedDetailsResp = await clientFetch(
+    `${IN_APP_URL}/api/2024-05-05/account/disconnect`,
+    {
+      method: "POST",
+      headers,
+      body: stringify(profileToUnlink),
+    },
+  );
+
+  if (!linkedDetailsResp.ok) {
+    const body = await linkedDetailsResp.json();
+    throw new Error(body.message || "Failed to unlink account.");
+  }
+
+  const { linkedAccounts } = await linkedDetailsResp.json();
+
+  return (linkedAccounts ?? []) satisfies Profile[];
+}
+
 /**
  * @description
  * Gets the linked accounts for the current user.

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

@@ -250,3 +250,9 @@ export type GetAuthenticatedUserParams = {
   client: ThirdwebClient;
   ecosystem?: Ecosystem;
 };
+
+export type UnlinkParams = {
+  client: ThirdwebClient;
+  ecosystem?: Ecosystem;
+  profileToUnlink: Profile;
+};

package/src/wallets/in-app/core/interfaces/connector.ts

@@ -36,5 +36,6 @@ export interface InAppConnector {
   ): Promise<AuthLoginReturnType>;
   logout(): Promise<LogoutReturnType>;
   linkProfile(args: AuthArgsType): Promise<Profile[]>;
+  unlinkProfile(args: Profile): Promise<Profile[]>;
   getProfiles(): Promise<Profile[]>;
 }

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

@@ -1,5 +1,7 @@
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
+import type { SupportedSmsCountry } from "../../../../react/web/wallets/in-app/supported-sms-countries.js";
+import type { Prettify } from "../../../../utils/type-utils.js";
 import type { SmartWalletOptions } from "../../../smart/types.js";
 import type {
   AuthOption,
@@ -19,14 +21,12 @@ export type Ecosystem = {
   partnerId?: string;
 };
 
-export type InAppWalletConnectionOptions = (
-  | MultiStepAuthArgsType
-  | SingleStepAuthArgsType
-) & {
-  client: ThirdwebClient;
-  chain?: Chain;
-  redirect?: boolean;
-};
+export type InAppWalletConnectionOptions = Prettify<
+  (MultiStepAuthArgsType | SingleStepAuthArgsType) & {
+    client: ThirdwebClient;
+    chain?: Chain;
+  }
+>;
 
 export type InAppWalletAutoConnectOptions = {
   client: ThirdwebClient;
@@ -59,6 +59,10 @@ export type InAppWalletCreationOptions =
          * The domain of the passkey to use for authentication
          */
         passkeyDomain?: string;
+        /**
+         * The default country code to use for SMS authentication
+         */
+        defaultSmsCountryCode?: SupportedSmsCountry;
       };
       /**
        * Metadata to display in the Connect Modal

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

@@ -3,6 +3,7 @@ import type {
   AuthArgsType,
   GetAuthenticatedUserParams,
   PreAuthArgsType,
+  UnlinkParams,
 } from "../../core/authentication/types.js";
 import { getOrCreateInAppWalletConnector } from "../../core/wallet/in-app-core.js";
 import type { Ecosystem } from "../../core/wallet/types.js";
@@ -146,9 +147,6 @@ export async function authenticate(args: AuthArgsType) {
  *
  * **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.
@@ -167,6 +165,36 @@ export async function linkProfile(args: AuthArgsType) {
   return await connector.linkProfile(args);
 }
 
+/**
+ * Disconnects an existing profile (authentication method) from the current user. Once disconnected, that profile can no longer be used to sign into the account.
+ *
+ * @param args - The object containing the profile that we want to unlink.
+ * @returns A promise that resolves to the updated linked profiles.
+ * @throws If the unlinking fails. This can happen if the account has no other associated profiles or if the profile that is being unlinked doesn't exists for the current logged in user.
+ *
+ * @example
+ * ```ts
+ * import { inAppWallet } from "thirdweb/wallets";
+ *
+ * const wallet = inAppWallet();
+ * wallet.connect({ strategy: "google" });
+ *
+ * const profiles = await getProfiles({
+ *  client,
+ * });
+ *
+ * const updatedProfiles = await unlinkProfile({
+ *  client,
+ *  profileToUnlink: profiles[0],
+ * });
+ * ```
+ * @wallet
+ */
+export async function unlinkProfile(args: UnlinkParams) {
+  const connector = await getInAppWalletConnector(args.client, args.ecosystem);
+  return await connector.unlinkProfile(args.profileToUnlink);
+}
+
 /**
  * Gets the linked profiles for the connected in-app or ecosystem wallet.
  *

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

@@ -10,6 +10,7 @@ import { customJwt } from "../core/authentication/jwt.js";
 import {
   getLinkedProfilesInternal,
   linkAccount,
+  unlinkAccount,
 } from "../core/authentication/linkAccount.js";
 import {
   loginWithPasskey,
@@ -24,6 +25,7 @@ import type {
   LogoutReturnType,
   MultiStepAuthArgsType,
   MultiStepAuthProviderType,
+  Profile,
   SingleStepAuthArgsType,
 } from "../core/authentication/types.js";
 import type { InAppConnector } from "../core/interfaces/connector.js";
@@ -332,6 +334,15 @@ export class InAppNativeConnector implements InAppConnector {
     });
   }
 
+  async unlinkProfile(profile: Profile) {
+    return await unlinkAccount({
+      client: this.client,
+      ecosystem: this.ecosystem,
+      storage: this.storage,
+      profileToUnlink: profile,
+    });
+  }
+
   async getProfiles() {
     return getLinkedProfilesInternal({
       client: this.client,

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

@@ -5,6 +5,7 @@ import type {
   GetAuthenticatedUserParams,
   PreAuthArgsType,
   SocialAuthArgsType,
+  UnlinkParams,
 } from "../../../core/authentication/types.js";
 import { getOrCreateInAppWalletConnector } from "../../../core/wallet/in-app-core.js";
 import type { Ecosystem } from "../../../core/wallet/types.js";
@@ -204,6 +205,36 @@ export async function linkProfile(args: AuthArgsType) {
   return await connector.linkProfile(args);
 }
 
+/**
+ * Disconnects an existing profile (authentication method) from the current user. Once disconnected, that profile can no longer be used to sign into the account.
+ *
+ * @param args - The object containing the profile that we want to unlink.
+ * @returns A promise that resolves to the updated linked profiles.
+ * @throws If the unlinking fails. This can happen if the account has no other associated profiles or if the profile that is being unlinked doesn't exists for the current logged in user.
+ *
+ * @example
+ * ```ts
+ * import { inAppWallet } from "thirdweb/wallets";
+ *
+ * const wallet = inAppWallet();
+ * wallet.connect({ strategy: "google" });
+ *
+ * const profiles = await getProfiles({
+ *  client,
+ * });
+ *
+ * const updatedProfiles = await unlinkProfile({
+ *  client,
+ *  profileToUnlink: profiles[0],
+ * });
+ * ```
+ * @wallet
+ */
+export async function unlinkProfile(args: UnlinkParams) {
+  const connector = await getInAppWalletConnector(args.client, args.ecosystem);
+  return await connector.unlinkProfile(args.profileToUnlink);
+}
+
 /**
  * Gets the linked profiles for the connected in-app or ecosystem wallet.
  *

package/src/wallets/in-app/web/lib/web-connector.ts

@@ -11,6 +11,7 @@ import { customJwt } from "../../core/authentication/jwt.js";
 import {
   getLinkedProfilesInternal,
   linkAccount,
+  unlinkAccount,
 } from "../../core/authentication/linkAccount.js";
 import {
   loginWithPasskey,
@@ -25,6 +26,7 @@ import type {
   LogoutReturnType,
   MultiStepAuthArgsType,
   MultiStepAuthProviderType,
+  Profile,
   SingleStepAuthArgsType,
 } from "../../core/authentication/types.js";
 import type { InAppConnector } from "../../core/interfaces/connector.js";
@@ -456,6 +458,15 @@ export class InAppWebConnector implements InAppConnector {
     });
   }
 
+  async unlinkProfile(profile: Profile) {
+    return await unlinkAccount({
+      client: this.client,
+      storage: this.storage,
+      ecosystem: this.ecosystem,
+      profileToUnlink: profile,
+    });
+  }
+
   async getProfiles() {
     return getLinkedProfilesInternal({
       client: this.client,