WIP connect params

Author: joaquim-verges

.changeset/strong-panthers-notice.md

@@ -1,5 +1,5 @@
 ---
-"@thirdweb-dev/wagmi-adapter": major
+"@thirdweb-dev/wagmi-adapter": minor
 ---
 
 Wagmi connector for in-app wallets

packages/thirdweb/src/exports/wallets.native.ts

@@ -89,8 +89,14 @@ export type {
    * @deprecated use InAppWalletSocialAuth instead
    */
   InAppWalletSocialAuth as EmbeddedWalletSocialAuth,
+  InAppWalletCreationOptions,
 } from "../wallets/in-app/core/wallet/types.js";
 
+export type {
+  MultiStepAuthArgsType,
+  SingleStepAuthArgsType,
+} from "../wallets/in-app/core/authentication/types.js";
+
 export {
   preAuthenticate,
   authenticate,

packages/thirdweb/src/exports/wallets.ts

@@ -96,8 +96,14 @@ export type {
    * @deprecated use InAppWalletSocialAuth instead
    */
   InAppWalletSocialAuth as EmbeddedWalletSocialAuth,
+  InAppWalletCreationOptions,
 } from "../wallets/in-app/core/wallet/types.js";
 
+export type {
+  MultiStepAuthArgsType,
+  SingleStepAuthArgsType,
+} from "../wallets/in-app/core/authentication/types.js";
+
 export {
   preAuthenticate,
   authenticate,

packages/thirdweb/src/exports/wallets/in-app.native.ts

@@ -17,6 +17,12 @@ export type {
   InAppWalletAuth,
   InAppWalletSocialAuth,
   InAppWalletConnectionOptions,
+  InAppWalletAutoConnectOptions,
 } from "../../wallets/in-app/core/wallet/types.js";
 
+export type {
+  MultiStepAuthArgsType,
+  SingleStepAuthArgsType,
+} from "../../wallets/in-app/core/authentication/types.js";
+
 export { hasStoredPasskey } from "../../wallets/in-app/native/auth/passkeys.js";

packages/thirdweb/src/exports/wallets/in-app.ts

@@ -17,8 +17,14 @@ export type {
   InAppWalletAuth,
   InAppWalletSocialAuth,
   InAppWalletConnectionOptions,
+  InAppWalletAutoConnectOptions,
 } from "../../wallets/in-app/core/wallet/types.js";
 
+export type {
+  MultiStepAuthArgsType,
+  SingleStepAuthArgsType,
+} from "../../wallets/in-app/core/authentication/types.js";
+
 export { hasStoredPasskey } from "../../wallets/in-app/web/lib/auth/passkeys.js";
 
 export {

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

@@ -1,5 +1,6 @@
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
+import type { Prettify } from "../../../../utils/type-utils.js";
 import type { SmartWalletOptions } from "../../../smart/types.js";
 import type {
   AuthOption,
@@ -19,14 +20,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;

packages/thirdweb/src/wallets/manager/connection-manager.test.ts

@@ -199,157 +199,157 @@ describe.runIf(process.env.TW_SECRET_KEY)("Connection Manager", () => {
     const definedChain = manager.activeWalletChainStore.getValue();
     expect(definedChain).toEqual(newChain);
   });
-});
-
-describe("handleSmartWalletConnection", () => {
-  let client: ThirdwebClient;
-  let eoaWallet: Wallet;
-  let smartWalletOptions: SmartWalletOptions;
 
-  beforeEach(() => {
-    client = TEST_CLIENT;
-    eoaWallet = {
-      id: "eoa-wallet-id",
-      getAccount: vi.fn().mockReturnValue(TEST_ACCOUNT_A),
-      subscribe: vi.fn().mockReturnValue(vi.fn()),
-      disconnect: vi.fn(),
-      switchChain: vi.fn(),
-      getChain: vi.fn().mockReturnValue(sepolia),
-      getConfig: vi.fn(),
-    } as unknown as Wallet;
-    smartWalletOptions = {
-      chain: sepolia,
-    } as SmartWalletOptions;
-  });
-
-  it("should connect a smart wallet and subscribe to disconnect event", async () => {
-    const onWalletDisconnect = vi.fn();
-    const smartWallet = await handleSmartWalletConnection(
-      eoaWallet,
-      client,
-      smartWalletOptions,
-      onWalletDisconnect,
-    );
-
-    expect(smartWallet.getAccount()).toBeTruthy();
-
-    expect(eoaWallet.subscribe).toHaveBeenCalledWith(
-      "disconnect",
-      expect.any(Function),
-    );
-  });
-
-  it("should call onWalletDisconnect when EOA wallet disconnects", async () => {
-    const onWalletDisconnect = vi.fn();
-    const smartWallet = await handleSmartWalletConnection(
-      eoaWallet,
-      client,
-      smartWalletOptions,
-      onWalletDisconnect,
-    );
+  describe("handleSmartWalletConnection", () => {
+    let client: ThirdwebClient;
+    let eoaWallet: Wallet;
+    let smartWalletOptions: SmartWalletOptions;
+
+    beforeEach(() => {
+      client = TEST_CLIENT;
+      eoaWallet = {
+        id: "eoa-wallet-id",
+        getAccount: vi.fn().mockReturnValue(TEST_ACCOUNT_A),
+        subscribe: vi.fn().mockReturnValue(vi.fn()),
+        disconnect: vi.fn(),
+        switchChain: vi.fn(),
+        getChain: vi.fn().mockReturnValue(sepolia),
+        getConfig: vi.fn(),
+      } as unknown as Wallet;
+      smartWalletOptions = {
+        chain: sepolia,
+      } as SmartWalletOptions;
+    });
 
-    // biome-ignore lint/suspicious/noExplicitAny: Mocked function
-    const disconnectCallback = (eoaWallet.subscribe as any).mock.calls[0][1];
-    disconnectCallback();
+    it("should connect a smart wallet and subscribe to disconnect event", async () => {
+      const onWalletDisconnect = vi.fn();
+      const smartWallet = await handleSmartWalletConnection(
+        eoaWallet,
+        client,
+        smartWalletOptions,
+        onWalletDisconnect,
+      );
 
-    expect(onWalletDisconnect).toHaveBeenCalledWith(smartWallet);
-  });
+      expect(smartWallet.getAccount()).toBeTruthy();
 
-  it("should throw an error if EOA wallet has no account", async () => {
-    eoaWallet.getAccount = vi.fn().mockReturnValue(null);
+      expect(eoaWallet.subscribe).toHaveBeenCalledWith(
+        "disconnect",
+        expect.any(Function),
+      );
+    });
 
-    await expect(
-      handleSmartWalletConnection(
+    it("should call onWalletDisconnect when EOA wallet disconnects", async () => {
+      const onWalletDisconnect = vi.fn();
+      const smartWallet = await handleSmartWalletConnection(
         eoaWallet,
         client,
         smartWalletOptions,
-        vi.fn(),
-      ),
-    ).rejects.toThrow("Cannot set a wallet without an account as active");
-  });
-});
+        onWalletDisconnect,
+      );
 
-describe("Connection Manager Error Handling", () => {
-  let storage: AsyncStorage;
-  let client: ThirdwebClient;
-  let wallet: Wallet;
+      // biome-ignore lint/suspicious/noExplicitAny: Mocked function
+      const disconnectCallback = (eoaWallet.subscribe as any).mock.calls[0][1];
+      disconnectCallback();
 
-  beforeEach(() => {
-    storage = {
-      getItem: vi.fn(),
-      setItem: vi.fn(),
-      removeItem: vi.fn(),
-    };
-    client = TEST_CLIENT;
-    wallet = {
-      id: "wallet-id",
-      getAccount: vi.fn().mockReturnValue(null), // Simulate wallet without an account
-      subscribe: vi.fn(),
-      disconnect: vi.fn(),
-      switchChain: vi.fn(),
-      getChain: vi.fn().mockReturnValue(sepolia),
-      getConfig: vi.fn(),
-    } as unknown as Wallet;
-  });
-
-  it("should throw an error if trying to set a wallet without an account as active", async () => {
-    const manager = createConnectionManager(storage);
+      expect(onWalletDisconnect).toHaveBeenCalledWith(smartWallet);
+    });
 
-    await expect(manager.setActiveWallet(wallet)).rejects.toThrow(
-      "Cannot set a wallet without an account as active",
-    );
+    it("should throw an error if EOA wallet has no account", async () => {
+      eoaWallet.getAccount = vi.fn().mockReturnValue(null);
+
+      await expect(
+        handleSmartWalletConnection(
+          eoaWallet,
+          client,
+          smartWalletOptions,
+          vi.fn(),
+        ),
+      ).rejects.toThrow("Cannot set a wallet without an account as active");
+    });
   });
 
-  it("should throw an error if handleConnection is called with a wallet without an account", async () => {
-    const manager = createConnectionManager(storage);
+  describe("Connection Manager Error Handling", () => {
+    let storage: AsyncStorage;
+    let client: ThirdwebClient;
+    let wallet: Wallet;
+
+    beforeEach(() => {
+      storage = {
+        getItem: vi.fn(),
+        setItem: vi.fn(),
+        removeItem: vi.fn(),
+      };
+      client = TEST_CLIENT;
+      wallet = {
+        id: "wallet-id",
+        getAccount: vi.fn().mockReturnValue(null), // Simulate wallet without an account
+        subscribe: vi.fn(),
+        disconnect: vi.fn(),
+        switchChain: vi.fn(),
+        getChain: vi.fn().mockReturnValue(sepolia),
+        getConfig: vi.fn(),
+      } as unknown as Wallet;
+    });
 
-    await expect(manager.handleConnection(wallet, { client })).rejects.toThrow(
-      "Cannot set a wallet without an account as active",
-    );
-  });
-});
+    it("should throw an error if trying to set a wallet without an account as active", async () => {
+      const manager = createConnectionManager(storage);
 
-describe("Connection Manager Event Subscriptions", () => {
-  let storage: AsyncStorage;
-  let client: ThirdwebClient;
-  let wallet: Wallet;
-  let account: Account;
+      await expect(manager.setActiveWallet(wallet)).rejects.toThrow(
+        "Cannot set a wallet without an account as active",
+      );
+    });
 
-  beforeEach(() => {
-    storage = {
-      getItem: vi.fn(),
-      setItem: vi.fn(),
-      removeItem: vi.fn(),
-    };
-    client = TEST_CLIENT;
-    account = TEST_ACCOUNT_A;
-    wallet = {
-      id: "wallet-id",
-      getAccount: vi.fn().mockReturnValue(account),
-      subscribe: vi.fn().mockReturnValue(vi.fn()),
-      disconnect: vi.fn(),
-      switchChain: vi.fn(),
-      getChain: vi.fn().mockReturnValue(sepolia),
-      getConfig: vi.fn(),
-    } as unknown as Wallet;
-  });
+    it("should throw an error if handleConnection is called with a wallet without an account", async () => {
+      const manager = createConnectionManager(storage);
 
-  it("should subscribe to accountChanged, chainChanged, and disconnect events", async () => {
-    const manager = createConnectionManager(storage);
+      await expect(
+        manager.handleConnection(wallet, { client }),
+      ).rejects.toThrow("Cannot set a wallet without an account as active");
+    });
+  });
 
-    await manager.handleConnection(wallet, { client });
+  describe("Connection Manager Event Subscriptions", () => {
+    let storage: AsyncStorage;
+    let client: ThirdwebClient;
+    let wallet: Wallet;
+    let account: Account;
+
+    beforeEach(() => {
+      storage = {
+        getItem: vi.fn(),
+        setItem: vi.fn(),
+        removeItem: vi.fn(),
+      };
+      client = TEST_CLIENT;
+      account = TEST_ACCOUNT_A;
+      wallet = {
+        id: "wallet-id",
+        getAccount: vi.fn().mockReturnValue(account),
+        subscribe: vi.fn().mockReturnValue(vi.fn()),
+        disconnect: vi.fn(),
+        switchChain: vi.fn(),
+        getChain: vi.fn().mockReturnValue(sepolia),
+        getConfig: vi.fn(),
+      } as unknown as Wallet;
+    });
 
-    expect(wallet.subscribe).toHaveBeenCalledWith(
-      "accountChanged",
-      expect.any(Function),
-    );
-    expect(wallet.subscribe).toHaveBeenCalledWith(
-      "chainChanged",
-      expect.any(Function),
-    );
-    expect(wallet.subscribe).toHaveBeenCalledWith(
-      "disconnect",
-      expect.any(Function),
-    );
+    it("should subscribe to accountChanged, chainChanged, and disconnect events", async () => {
+      const manager = createConnectionManager(storage);
+
+      await manager.handleConnection(wallet, { client });
+
+      expect(wallet.subscribe).toHaveBeenCalledWith(
+        "accountChanged",
+        expect.any(Function),
+      );
+      expect(wallet.subscribe).toHaveBeenCalledWith(
+        "chainChanged",
+        expect.any(Function),
+      );
+      expect(wallet.subscribe).toHaveBeenCalledWith(
+        "disconnect",
+        expect.any(Function),
+      );
+    });
   });
 });