thirdweb 5.102.0 → 5.102.2

package/src/pay/convert/fiatToCrypto.ts

@@ -1,3 +1,4 @@
+import { getV1TokensPrice } from "@thirdweb-dev/insight";
 import type { Address } from "abitype";
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
@@ -5,8 +6,10 @@ import { NATIVE_TOKEN_ADDRESS } from "../../constants/addresses.js";
 import { getBytecode } from "../../contract/actions/get-bytecode.js";
 import { getContract } from "../../contract/contract.js";
 import { isAddress } from "../../utils/address.js";
+import { getThirdwebDomains } from "../../utils/domains.js";
 import { getClientFetch } from "../../utils/fetch.js";
-import { getPayConvertFiatToCryptoEndpoint } from "../utils/definitions.js";
+import { stringify } from "../../utils/json.js";
+import { withCache } from "../../utils/promise/withCache.js";
 import type { SupportedFiatCurrency } from "./type.js";
 
 /**
@@ -91,21 +94,34 @@ export async function convertFiatToCrypto(
       );
     }
   }
-  const params = {
-    from,
-    to,
-    chainId: String(chain.id),
-    fromAmount: String(fromAmount),
-  };
-  const queryString = new URLSearchParams(params).toString();
-  const url = `${getPayConvertFiatToCryptoEndpoint()}?${queryString}`;
-  const response = await getClientFetch(client)(url);
-  if (!response.ok) {
+  const result = await withCache(
+    () =>
+      getV1TokensPrice({
+        baseUrl: `https://${getThirdwebDomains().insight}`,
+        fetch: getClientFetch(client),
+        query: {
+          address: to,
+          chain_id: [chain.id],
+        },
+      }),
+    {
+      cacheKey: `convert-fiat-to-crypto-${to}-${chain.id}`,
+      cacheTime: 1000 * 60, // 1 minute cache
+    },
+  );
+
+  if (result.error) {
     throw new Error(
-      `Failed to convert ${from} value to token (${to}) on chainId: ${chain.id}`,
+      `Failed to fetch ${from} value for token (${to}) on chainId: ${chain.id} - ${result.response.status} ${result.response.statusText} - ${result.error ? stringify(result.error) : "Unknown error"}`,
     );
   }
 
-  const data: { result: number } = await response.json();
-  return data;
+  const firstResult = result.data?.data[0];
+
+  if (!firstResult || firstResult.price_usd === 0) {
+    throw new Error(
+      `Failed to fetch ${from} value for token (${to}) on chainId: ${chain.id}`,
+    );
+  }
+  return { result: fromAmount / firstResult.price_usd };
 }

package/src/pay/utils/definitions.ts

@@ -28,9 +28,3 @@ export const getPayBuyWithCryptoHistoryEndpoint = () =>
  */
 export const getPayBuyHistoryEndpoint = () =>
   `${getPayBaseUrl()}/wallet/history/v1`;
-
-export const getPayConvertFiatToCryptoEndpoint = () =>
-  `${getPayBaseUrl()}/convert/fiat-to-crypto/v1`;
-
-export const getPayConvertCryptoToFiatEndpoint = () =>
-  `${getPayBaseUrl()}/convert/crypto-to-fiat/v1`;

package/src/react/native/hooks/wallets/useUnlinkProfile.test.tsx

@@ -40,6 +40,32 @@ describe("useUnlinkProfile", () => {
       client: TEST_CLIENT,
       ecosystem: undefined,
       profileToUnlink: mockProfile,
+      allowAccountDeletion: false,
+    });
+    expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
+      queryKey: ["profiles"],
+    });
+  });
+
+  it("should call unlinkProfile with allowAccountDeletion if true", async () => {
+    const { result } = renderHook(() => useUnlinkProfile(), {
+      wrapper,
+    });
+    const mutationFn = result.current.mutateAsync;
+
+    await act(async () => {
+      await mutationFn({
+        client: TEST_CLIENT,
+        profileToUnlink: mockProfile,
+        allowAccountDeletion: true,
+      });
+    });
+
+    expect(unlinkProfile).toHaveBeenCalledWith({
+      client: TEST_CLIENT,
+      ecosystem: undefined,
+      profileToUnlink: mockProfile,
+      allowAccountDeletion: true,
     });
     expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
       queryKey: ["profiles"],
@@ -70,6 +96,7 @@ describe("useUnlinkProfile", () => {
           ?.partnerId,
       },
       profileToUnlink: mockProfile,
+      allowAccountDeletion: false,
     });
   });
 });

package/src/react/native/hooks/wallets/useUnlinkProfile.ts

@@ -31,6 +31,23 @@ import { useConnectedWallets } from "../../../core/hooks/wallets/useConnectedWal
  * };
  * ```
  *
+ * ### Unlinking an email account with account deletion
+ *
+ * ```jsx
+ * import { useUnlinkProfile } from "thirdweb/react";
+ *
+ * const { mutate: unlinkProfile } = useUnlinkProfile();
+ *
+ * const onClick = () => {
+ *   unlinkProfile({
+ *     client,
+ *      // Select the profile you want to unlink
+ *     profileToUnlink: connectedProfiles[0],
+ *     allowAccountDeletion: true, // This will delete the account if it's the last profile linked to the account
+ *   });
+ * };
+ * ```
+ *
  * @wallet
  */
 export function useUnlinkProfile() {
@@ -40,7 +57,12 @@ export function useUnlinkProfile() {
     mutationFn: async ({
       client,
       profileToUnlink,
-    }: { client: ThirdwebClient; profileToUnlink: Profile }) => {
+      allowAccountDeletion = false,
+    }: {
+      client: ThirdwebClient;
+      profileToUnlink: Profile;
+      allowAccountDeletion?: boolean;
+    }) => {
       const ecosystemWallet = wallets.find((w) => isEcosystemWallet(w));
       const ecosystem: Ecosystem | undefined = ecosystemWallet
         ? {
@@ -53,6 +75,7 @@ export function useUnlinkProfile() {
         client,
         ecosystem,
         profileToUnlink,
+        allowAccountDeletion,
       });
     },
     onSuccess: () => {

package/src/react/web/hooks/wallets/useUnlinkProfile.test.tsx

@@ -40,6 +40,7 @@ describe("useUnlinkProfile", () => {
       client: TEST_CLIENT,
       ecosystem: undefined,
       profileToUnlink: mockProfile,
+      allowAccountDeletion: false,
     });
     expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
       queryKey: ["profiles"],
@@ -70,6 +71,7 @@ describe("useUnlinkProfile", () => {
           ?.partnerId,
       },
       profileToUnlink: mockProfile,
+      allowAccountDeletion: false,
     });
   });
 });

package/src/react/web/hooks/wallets/useUnlinkProfile.ts

@@ -31,6 +31,23 @@ import { useConnectedWallets } from "../../../core/hooks/wallets/useConnectedWal
  * };
  * ```
  *
+ * ### Unlinking an email account with account deletion
+ *
+ * ```jsx
+ * import { useUnlinkProfile } from "thirdweb/react";
+ *
+ * const { mutate: unlinkProfile } = useUnlinkProfile();
+ *
+ * const onClick = () => {
+ *   unlinkProfile({
+ *     client,
+ *      // Select the profile you want to unlink
+ *     profileToUnlink: connectedProfiles[0],
+ *     allowAccountDeletion: true, // This will delete the account if it's the last profile linked to the account
+ *   });
+ * };
+ * ```
+ *
  * @wallet
  */
 export function useUnlinkProfile() {
@@ -40,7 +57,12 @@ export function useUnlinkProfile() {
     mutationFn: async ({
       client,
       profileToUnlink,
-    }: { client: ThirdwebClient; profileToUnlink: Profile }) => {
+      allowAccountDeletion = false,
+    }: {
+      client: ThirdwebClient;
+      profileToUnlink: Profile;
+      allowAccountDeletion?: boolean;
+    }) => {
       const ecosystemWallet = wallets.find((w) => isEcosystemWallet(w));
       const ecosystem: Ecosystem | undefined = ecosystemWallet
         ? {
@@ -53,6 +75,7 @@ export function useUnlinkProfile() {
         client,
         ecosystem,
         profileToUnlink,
+        allowAccountDeletion,
       });
     },
     onSuccess: () => {

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.102.0";
+export const version = "5.102.2";

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

@@ -90,7 +90,37 @@ describe("Account linking functions", () => {
             Authorization: "Bearer iaw-auth-token:mock-token",
             "Content-Type": "application/json",
           },
-          body: JSON.stringify(profileToUnlink),
+          body: JSON.stringify({
+            type: profileToUnlink.type,
+            details: profileToUnlink.details,
+            allowAccountDeletion: false,
+          }),
+        },
+      );
+      expect(result).toEqual(mockLinkedAccounts);
+    });
+
+    it("should successfully unlink an account with allowAccountDeletion", async () => {
+      const result = await unlinkAccount({
+        client: mockClient,
+        profileToUnlink,
+        storage: mockStorage,
+        allowAccountDeletion: true,
+      });
+
+      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({
+            type: profileToUnlink.type,
+            details: profileToUnlink.details,
+            allowAccountDeletion: true,
+          }),
         },
       );
       expect(result).toEqual(mockLinkedAccounts);

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

@@ -66,11 +66,13 @@ export async function unlinkAccount({
   client,
   ecosystem,
   profileToUnlink,
+  allowAccountDeletion = false,
   storage,
 }: {
   client: ThirdwebClient;
   ecosystem?: Ecosystem;
   profileToUnlink: Profile;
+  allowAccountDeletion?: boolean;
   storage: ClientScopedStorage;
 }): Promise<Profile[]> {
   const clientFetch = getClientFetch(client, ecosystem);
@@ -90,7 +92,11 @@ export async function unlinkAccount({
     {
       method: "POST",
       headers,
-      body: stringify(profileToUnlink),
+      body: stringify({
+        type: profileToUnlink.type,
+        details: profileToUnlink.details,
+        allowAccountDeletion,
+      }),
     },
   );
 

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

@@ -259,4 +259,5 @@ export type UnlinkParams = {
   client: ThirdwebClient;
   ecosystem?: Ecosystem;
   profileToUnlink: Profile;
+  allowAccountDeletion?: boolean;
 };

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

@@ -37,7 +37,10 @@ export interface InAppConnector {
   ): Promise<AuthLoginReturnType>;
   logout(): Promise<LogoutReturnType>;
   linkProfile(args: AuthArgsType): Promise<Profile[]>;
-  unlinkProfile(args: Profile): Promise<Profile[]>;
+  unlinkProfile(
+    args: Profile,
+    allowAccountDeletion?: boolean,
+  ): Promise<Profile[]>;
   getProfiles(): Promise<Profile[]>;
   storage: ClientScopedStorage;
 }

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

@@ -203,7 +203,10 @@ export async function linkProfile(args: AuthArgsType) {
  */
 export async function unlinkProfile(args: UnlinkParams) {
   const connector = await getInAppWalletConnector(args.client, args.ecosystem);
-  return await connector.unlinkProfile(args.profileToUnlink);
+  return await connector.unlinkProfile(
+    args.profileToUnlink,
+    args.allowAccountDeletion,
+  );
 }
 
 /**

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

@@ -367,7 +367,7 @@ export class InAppNativeConnector implements InAppConnector {
     });
   }
 
-  async unlinkProfile(profile: Profile) {
+  async unlinkProfile(profile: Profile, allowAccountDeletion?: boolean) {
     const { unlinkAccount } = await import(
       "../core/authentication/linkAccount.js"
     );
@@ -376,6 +376,7 @@ export class InAppNativeConnector implements InAppConnector {
       ecosystem: this.ecosystem,
       storage: this.storage,
       profileToUnlink: profile,
+      allowAccountDeletion,
     });
   }
 

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

@@ -224,6 +224,8 @@ export async function linkProfile(args: AuthArgsType) {
  * @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
+ * ### Unlinking an authentication method
+ *
  * ```ts
  * import { inAppWallet } from "thirdweb/wallets";
  *
@@ -239,11 +241,41 @@ export async function linkProfile(args: AuthArgsType) {
  *  profileToUnlink: profiles[0],
  * });
  * ```
+ *
+ * ### Unlinking an authentication for ecosystems
+ *
+ * ```ts
+ * import { unlinkProfile } from "thirdweb/wallets/in-app";
+ *
+ * const updatedProfiles = await unlinkProfile({
+ *  client,
+ *  ecosystem: {
+ *    id: "ecosystem.your-ecosystem-id",
+ *  },
+ *  profileToUnlink: profiles[0],
+ * });
+ * ```
+ *
+ * ### Unlinking an authentication method with account deletion
+ *
+ * ```ts
+ * import { unlinkProfile } from "thirdweb/wallets/in-app";
+ *
+ * const updatedProfiles = await unlinkProfile({
+ *  client,
+ *  profileToUnlink: profiles[0],
+ *  allowAccountDeletion: true, // This will delete the account if it's the last profile linked to the account
+ * });
+ * ```
+ *
  * @wallet
  */
 export async function unlinkProfile(args: UnlinkParams) {
   const connector = await getInAppWalletConnector(args.client, args.ecosystem);
-  return await connector.unlinkProfile(args.profileToUnlink);
+  return await connector.unlinkProfile(
+    args.profileToUnlink,
+    args.allowAccountDeletion,
+  );
 }
 
 /**

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

@@ -470,12 +470,13 @@ export class InAppWebConnector implements InAppConnector {
     });
   }
 
-  async unlinkProfile(profile: Profile) {
+  async unlinkProfile(profile: Profile, allowAccountDeletion?: boolean) {
     return await unlinkAccount({
       client: this.client,
       storage: this.storage,
       ecosystem: this.ecosystem,
       profileToUnlink: profile,
+      allowAccountDeletion,
     });
   }