[SDK] Feature: Ecosystem account linking

.changeset/nine-ladybugs-doubt.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Enable account linking for ecosystem wallets

packages/thirdweb/src/react/core/hooks/others/useProfiles.ts

@@ -1,4 +1,5 @@
 import { type UseQueryResult, useQuery } from "@tanstack/react-query";
+import { isEcosystemWallet } from "../../../../wallets/ecosystem/is-ecosystem-wallet.js";
 import type { Profile } from "../../../../wallets/in-app/core/authentication/types.js";
 import { getProfiles } from "../../../../wallets/in-app/core/wallet/profiles.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
@@ -28,7 +29,7 @@
 
   return useQuery({
     queryKey: ["profiles", wallet?.id],
-    enabled: !!wallet && wallet.id === "inApp",
+    enabled: !!wallet && (wallet.id === "inApp" || isEcosystemWallet(wallet)),
     queryFn: async () => {
       return getProfiles(wallet as Wallet<"inApp">);
     },

packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkProfileScreen.tsx

@@ -3,10 +3,13 @@
 import { useQueryClient } from "@tanstack/react-query";
 import { Suspense, lazy } from "react";
 import type { ThirdwebClient } from "../../../../../client/client.js";
+import { isEcosystemWallet } from "../../../../../wallets/ecosystem/is-ecosystem-wallet.js";
 import type { Wallet } from "../../../../../wallets/interfaces/wallet.js";
+import type { EcosystemWalletId } from "../../../../../wallets/wallet-types.js";
 import { iconSize } from "../../../../core/design-system/index.js";
 import { useActiveWallet } from "../../../../core/hooks/wallets/useActiveWallet.js";
 import { useActiveWalletChain } from "../../../../core/hooks/wallets/useActiveWalletChain.js";
+import EcosystemWalletConnectUI from "../../../wallets/ecosystem/EcosystemWalletConnectUI.js";
 import { LoadingScreen } from "../../../wallets/shared/LoadingScreen.js";
 import { Container, Line, ModalHeader } from "../../components/basic.js";
 import { Text } from "../../components/text.js";
@@ -58,6 +61,30 @@
     );
   }
 
+  if (isEcosystemWallet(activeWallet)) {
+    return (
+      <Suspense fallback={<LoadingScreen />}>
+        <EcosystemWalletConnectUI
+          wallet={activeWallet as Wallet<EcosystemWalletId>}
+          done={() => {
+            queryClient.invalidateQueries({ queryKey: ["profiles"] });
+            props.onBack();
+          }}
+          connectLocale={props.locale}
+          client={props.client}
+          size="compact"
+          chain={chain}
+          meta={{
+            title: props.locale.manageWallet.linkProfile,
+            showThirdwebBranding: false,
+          }}
+          isLinking={true}
+          goBack={props.onBack}
+        />
+      </Suspense>
+    );
+  }
+
   return (
     <Container
       style={{

packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx

@@ -1,6 +1,7 @@
 "use client";
 import { ShuffleIcon } from "@radix-ui/react-icons";
 import type { ThirdwebClient } from "../../../../../client/client.js";
+import { isEcosystemWallet } from "../../../../../wallets/ecosystem/is-ecosystem-wallet.js";
 import { isInAppWallet } from "../../../../../wallets/in-app/core/wallet/index.js";
 import { injectedProvider } from "../../../../../wallets/injected/mipdStore.js";
 import { fontSize, iconSize } from "../../../../core/design-system/index.js";
@@ -56,21 +57,23 @@
           />
 
           {/* Multi-auth */}
-          {activeWallet?.id === "inApp" && (
-            <MenuButton
-              onClick={() => {
-                props.setScreen("linked-profiles");
-              }}
-              style={{
-                fontSize: fontSize.sm,
-              }}
-            >
-              <MultiUserIcon size={iconSize.md} />
-              <Text color="primaryText">
-                {props.locale.manageWallet.linkedProfiles}
-              </Text>
-            </MenuButton>
-          )}
+          {activeWallet &&
+            (activeWallet?.id === "inApp" ||
+              isEcosystemWallet(activeWallet)) && (
+              <MenuButton
+                onClick={() => {
+                  props.setScreen("linked-profiles");
+                }}
+                style={{
+                  fontSize: fontSize.sm,
+                }}
+              >
+                <MultiUserIcon size={iconSize.md} />
+                <Text color="primaryText">
+                  {props.locale.manageWallet.linkedProfiles}
+                </Text>
+              </MenuButton>
+            )}
 
           {/* Wallet Connect Receiver */}
           <MenuButton

packages/thirdweb/src/react/web/wallets/ecosystem/EcosystemWalletConnectUI.tsx

@@ -47,12 +47,12 @@
     return <LoadingScreen />;
   }
 
-  const goBackToMain =
-    props.size === "compact"
-      ? props.goBack
-      : () => {
-          setSelectionData({});
-        };
+  const goBackToMain = () => {
+    if (props.size === "compact") {
+      props.goBack?.();
+    }
+    setSelectionData({});
+  };
 
   const done = () => {
     props.done();

packages/thirdweb/src/react/web/wallets/shared/ConnectWalletSocialOptions.tsx

@@ -266,7 +266,7 @@
 
       const connectPromise = (() => {
         if (props.isLinking) {
-          if (wallet.id !== "inApp") {
+          if (wallet.id !== "inApp" && !isEcosystemWallet(wallet)) {
             throw new Error("Only in-app wallets support multi-auth");
           }
           return linkProfile(wallet, connectOptions);

packages/thirdweb/src/wallets/in-app/core/authentication/linkAccount.ts

@@ -1,5 +1,7 @@
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
+import { getClientFetch } from "../../../../utils/fetch.js";
+import type { Ecosystem } from "../../web/types.js";
 import type { Profile } from "./types.js";
 
 /**
@@ -11,27 +13,28 @@
  */
 export async function linkAccount({
   client,
+  ecosystem,
   tokenToLink,
 }: {
   client: ThirdwebClient;
+  ecosystem?: Ecosystem;
   tokenToLink: string;
 }): Promise<Profile[]> {
+  const clientFetch = getClientFetch(client, ecosystem);
   const IN_APP_URL = getThirdwebBaseUrl("inAppWallet");
   const currentAccountToken = localStorage.getItem(
-    `walletToken-${client.clientId}`,
+    `walletToken-${client.clientId}${ecosystem?.id ? `-${ecosystem.id}` : ""}`,
   );
 
   if (!currentAccountToken) {
     throw new Error("Failed to link account, no user logged in");
   }
 
   const headers: Record<string, string> = {
-    "Content-Type": "application/json",
     Authorization: `Bearer iaw-auth-token:${currentAccountToken}`,
-    "x-thirdweb-client-id": client.clientId,
+    "Content-Type": "application/json",
   };
-
-  const linkedDetailsResp = await fetch(
+  const linkedDetailsResp = await clientFetch(
     `${IN_APP_URL}/api/2024-05-05/account/connect`,
     {
       method: "POST",
@@ -61,23 +64,23 @@
  */
 export async function getLinkedProfilesInternal({
   client,
-}: { client: ThirdwebClient }): Promise<Profile[]> {
+  ecosystem,
+}: { client: ThirdwebClient; ecosystem?: Ecosystem }): Promise<Profile[]> {
+  const clientFetch = getClientFetch(client, ecosystem);
   const IN_APP_URL = getThirdwebBaseUrl("inAppWallet");
   const currentAccountToken = localStorage.getItem(
-    `walletToken-${client.clientId}`,
+    `walletToken-${client.clientId}${ecosystem?.id ? `-${ecosystem.id}` : ""}`,
   );
 
-  if (!currentAccountToken) {
-    throw new Error("Failed to get linked accounts, no user logged in");
-  }
-
   const headers: Record<string, string> = {
-    "Content-Type": "application/json",
     Authorization: `Bearer iaw-auth-token:${currentAccountToken}`,
-    "x-thirdweb-client-id": client.clientId,
+    "Content-Type": "application/json",
   };
+  if (!currentAccountToken) {
+    throw new Error("Failed to get linked accounts, no user logged in");
+  }
 
-  const linkedAccountsResp = await fetch(
+  const linkedAccountsResp = await clientFetch(
     `${IN_APP_URL}/api/2024-05-05/accounts`,
     {
       method: "GET",

packages/thirdweb/src/wallets/in-app/core/wallet/ecosystem-core.ts

@@ -8,6 +8,16 @@
   CreateWalletArgs,
   EcosystemWalletId,
 } from "../../../wallet-types.js";
+import type { Ecosystem } from "../../web/types.js";
+import {
+  getLinkedProfilesInternal,
+  linkAccount as linkProfileWithToken,
+} from "../authentication/linkAccount.js";
+import type {
+  MultiStepAuthArgsType,
+  Profile,
+  SingleStepAuthArgsType,
+} from "../authentication/types.js";
 import type { InAppConnector } from "../interfaces/connector.js";
 import { getOrCreateInAppWalletConnector } from "./in-app-core.js";
 
@@ -25,6 +35,10 @@
   let account: Account | undefined = undefined;
   let chain: Chain | undefined = undefined;
   let client: ThirdwebClient | undefined;
+  const ecosystem: Ecosystem = {
+    id,
+    partnerId: createOptions?.partnerId,
+  };
 
   return {
     id,
@@ -38,18 +52,21 @@
       return chain;
     },
     getConfig: () => createOptions,
+    getProfiles: async () => {
+      if (!client) {
+        return [];
+      }
 
+      return getLinkedProfilesInternal({ client, ecosystem });
+    },
     getAccount: () => account,
     autoConnect: async (options) => {
       const { autoConnectInAppWallet } = await import("./index.js");
 
       const connector = await getOrCreateInAppWalletConnector(
         options.client,
         connectorFactory,
-        {
-          id,
-          partnerId: createOptions?.partnerId,
-        },
+        ecosystem,
       );
 
       const [connectedAccount, connectedChain] = await autoConnectInAppWallet(
@@ -75,10 +92,7 @@
       const connector = await getOrCreateInAppWalletConnector(
         options.client,
         connectorFactory,
-        {
-          id,
-          partnerId: createOptions?.partnerId,
-        },
+        ecosystem,
       );
 
       const [connectedAccount, connectedChain] = await connectInAppWallet(
@@ -104,10 +118,7 @@
         const connector = await getOrCreateInAppWalletConnector(
           client,
           connectorFactory,
-          {
-            id,
-            partnerId: createOptions?.partnerId,
-          },
+          ecosystem,
         );
         const result = await connector.logout();
         if (!result.success) {
@@ -122,5 +133,28 @@
       chain = newChain;
       emitter.emit("chainChanged", newChain);
     },
-  };
+    // This is not included on the global interface but is force-resolved in linkProfile
+    linkProfile: async (
+      options: SingleStepAuthArgsType | MultiStepAuthArgsType,
+    ): Promise<Profile[]> => {
+      if (!client) {
+        throw new Error(
+          "No client found, please connect the wallet before linking a profile",
+        );
+      }
+
+      const connector = await getOrCreateInAppWalletConnector(
+        client,
+        connectorFactory,
+        ecosystem,
+      );
+
+      const { storedToken } = await connector.authenticate(options);
+      return await linkProfileWithToken({
+        client,
+        ecosystem,
+        tokenToLink: storedToken.cookieString,
+      });
+    },
+  } as Wallet<EcosystemWalletId>;
 }

packages/thirdweb/src/wallets/in-app/core/wallet/profiles.ts

@@ -1,3 +1,5 @@
+import { isEcosystemWallet } from "../../../../wallets/ecosystem/is-ecosystem-wallet.js";
+import type { EcosystemWalletId } from "../../../../wallets/wallet-types.js";
 import type { Wallet } from "../../../interfaces/wallet.js";
 import type {
   MultiStepAuthArgsType,
@@ -25,8 +27,8 @@
  * ```
  * @wallet
  */
-export async function getProfiles(wallet: Wallet<"inApp">) {
-  if (wallet.id !== "inApp") {
+export async function getProfiles(wallet: Wallet<"inApp" | EcosystemWalletId>) {
+  if (wallet.id !== "inApp" && !isEcosystemWallet(wallet)) {
     throw new Error("Multi-auth currently only supports in-app wallets");
   }
 
@@ -59,10 +61,10 @@
  * @wallet
  */
 export async function linkProfile(
-  wallet: Wallet<"inApp">,
+  wallet: Wallet<"inApp" | EcosystemWalletId>,
   auth: MultiStepAuthArgsType | SingleStepAuthArgsType,
 ): Promise<Profile[]> {
-  if (wallet.id !== "inApp") {
+  if (wallet.id !== "inApp" && !isEcosystemWallet(wallet)) {
     throw new Error("Multi-auth currently only supports in-app wallets");
   }