test: add test coverage on autoConnectCore

Author: ElasticBottle

packages/thirdweb/src/wallets/connection/autoConnectCore.test.ts

@@ -1,19 +1,29 @@
+import { beforeEach } from "node:test";
 import { isAddress } from "ethers6";
 import { describe, expect, it, vi } from "vitest";
 import { MockStorage } from "~test/mocks/storage.js";
 import { TEST_CLIENT } from "~test/test-clients.js";
 import { TEST_ACCOUNT_A } from "~test/test-wallets.js";
 import { createWalletAdapter } from "../../adapters/wallet-adapter.js";
 import { ethereum } from "../../chains/chain-definitions/ethereum.js";
+import { AUTH_TOKEN_LOCAL_STORAGE_NAME } from "../in-app/core/constants/settings.js";
+import { getUrlToken } from "../in-app/web/lib/get-url-token.js";
 import { createConnectionManager } from "../manager/index.js";
 import type { WalletId } from "../wallet-types.js";
 import { autoConnectCore, handleWalletConnection } from "./autoConnectCore.js";
 
+vi.mock("../in-app/web/lib/get-url-token.ts");
+
 describe("useAutoConnectCore", () => {
   const mockStorage = new MockStorage();
   const manager = createConnectionManager(mockStorage);
 
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+
   it("should return a useQuery result", async () => {
+    vi.mocked(getUrlToken).mockReturnValue({});
     const wallet = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
       client: TEST_CLIENT,
@@ -45,6 +55,8 @@ describe("useAutoConnectCore", () => {
   });
 
   it("should return `false` if there's no lastConnectedWalletIds", async () => {
+    vi.mocked(getUrlToken).mockReturnValue({});
+
     const wallet = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
       client: TEST_CLIENT,
@@ -76,6 +88,8 @@ describe("useAutoConnectCore", () => {
   });
 
   it("should call onTimeout on ... timeout", async () => {
+    vi.mocked(getUrlToken).mockReturnValue({});
+
     const wallet = createWalletAdapter({
       adaptedAccount: TEST_ACCOUNT_A,
       client: TEST_CLIENT,
@@ -124,6 +138,113 @@ describe("useAutoConnectCore", () => {
     expect(infoSpy).toHaveBeenCalledWith("TIMEOUTTED");
     warnSpy.mockRestore();
   });
+
+  it("should handle auth cookie storage correctly", async () => {
+    const mockAuthCookie = "mock-auth-cookie";
+    const wallet = createWalletAdapter({
+      adaptedAccount: TEST_ACCOUNT_A,
+      client: TEST_CLIENT,
+      chain: ethereum,
+      onDisconnect: () => {},
+      switchChain: () => {},
+    });
+    vi.mocked(getUrlToken).mockReturnValue({
+      authCookie: mockAuthCookie,
+      walletId: wallet.id,
+    });
+
+    await autoConnectCore({
+      storage: mockStorage,
+      props: {
+        wallets: [wallet],
+        client: TEST_CLIENT,
+      },
+      createWalletFn: () => wallet,
+      manager,
+    });
+
+    const storedCookie = await mockStorage.getItem(
+      AUTH_TOKEN_LOCAL_STORAGE_NAME(TEST_CLIENT.clientId),
+    );
+    expect(storedCookie).toBe(mockAuthCookie);
+  });
+
+  it("should handle error when manager connection fails", async () => {
+    const wallet1 = createWalletAdapter({
+      adaptedAccount: TEST_ACCOUNT_A,
+      client: TEST_CLIENT,
+      chain: ethereum,
+      onDisconnect: () => {},
+      switchChain: () => {},
+    });
+
+    mockStorage.setItem("thirdweb:active-wallet-id", wallet1.id);
+    mockStorage.setItem(
+      "thirdweb:connected-wallet-ids",
+      JSON.stringify([wallet1.id]),
+    );
+
+    const addConnectedWalletSpy = vi
+      .spyOn(manager, "connect")
+      .mockRejectedValue(new Error("Connection failed"));
+
+    await autoConnectCore({
+      storage: mockStorage,
+      props: {
+        wallets: [wallet1],
+        client: TEST_CLIENT,
+      },
+      createWalletFn: () => wallet1,
+      manager,
+    });
+    expect(addConnectedWalletSpy).toHaveBeenCalled();
+  });
+
+  it("should connect multiple wallets correctly", async () => {
+    const wallet1 = createWalletAdapter({
+      adaptedAccount: TEST_ACCOUNT_A,
+      client: TEST_CLIENT,
+      chain: ethereum,
+      onDisconnect: () => {},
+      switchChain: () => {},
+    });
+
+    const wallet2 = createWalletAdapter({
+      adaptedAccount: { ...TEST_ACCOUNT_A, address: "0x123" },
+      client: TEST_CLIENT,
+      chain: ethereum,
+      onDisconnect: () => {},
+      switchChain: () => {},
+    });
+    wallet2.id = "io.metamask" as unknown as "adapter";
+
+    mockStorage.setItem("thirdweb:active-wallet-id", wallet1.id);
+    mockStorage.setItem(
+      "thirdweb:connected-wallet-ids",
+      JSON.stringify([wallet1.id, wallet2.id]),
+    );
+
+    const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+    const addConnectedWalletSpy = vi.spyOn(manager, "addConnectedWallet");
+
+    await autoConnectCore({
+      storage: mockStorage,
+      props: {
+        wallets: [wallet1, wallet2],
+        client: TEST_CLIENT,
+      },
+      createWalletFn: () => wallet1,
+      manager,
+    });
+
+    expect(addConnectedWalletSpy).toHaveBeenCalledWith(wallet2);
+
+    expect(warnSpy).toHaveBeenCalled();
+    expect(warnSpy).toHaveBeenCalledWith(
+      "Error auto connecting wallet:",
+      "Connection failed",
+    );
+  });
 });
 
 describe("handleWalletConnection", () => {

packages/thirdweb/src/wallets/connection/autoConnectCore.ts

@@ -100,26 +100,26 @@ export const autoConnectCore = async ({
       createWalletFn(lastActiveWalletId));
 
   if (activeWallet) {
-    try {
-      manager.activeWalletConnectionStatusStore.setValue("connecting"); // only set connecting status if we are connecting the last active EOA
-      await timeoutPromise(
-        handleWalletConnection({
-          wallet: activeWallet,
-          client: props.client,
-          lastConnectedChain,
-          authResult,
-        }),
-        {
-          ms: timeout,
-          message: `AutoConnect timeout: ${timeout}ms limit exceeded.`,
-        },
-      ).catch((err) => {
-        console.warn(err.message);
-        if (props.onTimeout) {
-          props.onTimeout();
-        }
-      });
+    manager.activeWalletConnectionStatusStore.setValue("connecting"); // only set connecting status if we are connecting the last active EOA
+    await timeoutPromise(
+      handleWalletConnection({
+        wallet: activeWallet,
+        client: props.client,
+        lastConnectedChain,
+        authResult,
+      }),
+      {
+        ms: timeout,
+        message: `AutoConnect timeout: ${timeout}ms limit exceeded.`,
+      },
+    ).catch((err) => {
+      console.warn(err.message);
+      if (props.onTimeout) {
+        props.onTimeout();
+      }
+    });
 
+    try {
       // connected wallet could be activeWallet or smart wallet
       const connectedWallet = await (connectOverride
         ? connectOverride(activeWallet)
@@ -154,7 +154,6 @@ export const autoConnectCore = async ({
   const otherWallets = availableWallets.filter(
     (w) => w.id !== lastActiveWalletId && lastConnectedWalletIds.includes(w.id),
   );
-
   for (const wallet of otherWallets) {
     try {
       await handleWalletConnection({