thirdweb 5.118.0 → 5.118.1

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "5.118.0";
+export declare const version = "5.118.1";
 //# sourceMappingURL=version.d.ts.map

package/dist/types/wallets/in-app/web/lib/get-url-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-url-token.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/get-url-token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,oCAAoC,CAAC;AAE9F;;GAEG;AACH,wBAAgB,WAAW,IACvB;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,mCAAmC,CAAC;IACjD,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CAC/B,GACD,SAAS,CAiCZ"}
+{"version":3,"file":"get-url-token.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/get-url-token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,oCAAoC,CAAC;AAE9F;;GAEG;AACH,wBAAgB,WAAW,IACvB;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,mCAAmC,CAAC;IACjD,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CAC/B,GACD,SAAS,CAwEZ"}

package/package.json

@@ -400,7 +400,7 @@
     }
   },
   "typings": "./dist/types/exports/thirdweb.d.ts",
-  "version": "5.118.0",
+  "version": "5.118.1",
   "scripts": {
     "bench": "vitest -c ./test/vitest.config.ts bench",
     "bench:compare": "bun run ./benchmarks/run.ts",

package/src/react/web/ui/SiteLink.test.tsx

@@ -62,4 +62,25 @@ describe("SiteLink", () => {
     expect(anchor).toBeTruthy();
     await waitFor(() => expect(anchor?.href).toContain("walletId=inApp"));
   });
+
+  it("preserves hash fragment for hash-routed URLs", async () => {
+    const testUrl = "https://snapshot.org/#/s:wampei.eth";
+    const { container } = render(
+      <SiteLink client={TEST_CLIENT} href={testUrl}>
+        Test Link
+      </SiteLink>,
+      {
+        setConnectedWallet: true,
+      },
+    );
+
+    const anchor = container.querySelector("a");
+    expect(anchor).toBeTruthy();
+    await waitFor(() => {
+      const href = anchor?.href ?? "";
+      // Hash fragment must be preserved in the URL
+      expect(href).toContain("#/s:wampei.eth");
+      expect(href).toContain("walletId=");
+    });
+  });
 });

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.118.0";
+export const version = "5.118.1";

package/src/wallets/in-app/web/lib/get-url-token.test.tsx

@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { getUrlToken } from "./get-url-token.js";
 
 describe.runIf(global.window !== undefined)("getUrlToken", () => {
@@ -48,9 +48,9 @@ describe.runIf(global.window !== undefined)("getUrlToken", () => {
     const result = getUrlToken();
 
     expect(result).toEqual({
-      authCookie: null,
-      authFlow: null,
-      authProvider: null,
+      authCookie: undefined,
+      authFlow: undefined,
+      authProvider: undefined,
       authResult: { token: "abc" },
       walletId: "123",
     });
@@ -63,8 +63,8 @@ describe.runIf(global.window !== undefined)("getUrlToken", () => {
 
     expect(result).toEqual({
       authCookie: "myCookie",
-      authFlow: null,
-      authProvider: null,
+      authFlow: undefined,
+      authProvider: undefined,
       authResult: undefined,
       walletId: "123",
     });
@@ -81,7 +81,7 @@ describe.runIf(global.window !== undefined)("getUrlToken", () => {
 
     expect(result).toEqual({
       authCookie: "myCookie",
-      authFlow: null,
+      authFlow: undefined,
       authProvider: "provider1",
       authResult: { token: "xyz" },
       walletId: "123",
@@ -92,4 +92,60 @@ describe.runIf(global.window !== undefined)("getUrlToken", () => {
       "?walletId=123&authResult=%7B%22token%22%3A%22xyz%22%7D&authProvider=provider1&authCookie=myCookie",
     );
   });
+
+  it("should preserve hash fragment when cleaning up URL", () => {
+    Object.defineProperty(window, "location", {
+      value: {
+        ...window.location,
+        search: "?walletId=123&authCookie=myCookie",
+        hash: "#/s:wampei.eth",
+        pathname: "/",
+      },
+      writable: true,
+    });
+
+    const pushStateSpy = vi.spyOn(window.history, "pushState");
+
+    const result = getUrlToken();
+
+    expect(result).toEqual({
+      authCookie: "myCookie",
+      authFlow: undefined,
+      authProvider: undefined,
+      authResult: undefined,
+      walletId: "123",
+    });
+
+    // Verify pushState was called with the hash preserved
+    expect(pushStateSpy).toHaveBeenCalledWith({}, "", "/#/s:wampei.eth");
+    pushStateSpy.mockRestore();
+  });
+
+  it("should parse auth params embedded inside the hash fragment", () => {
+    Object.defineProperty(window, "location", {
+      value: {
+        ...window.location,
+        search: "",
+        hash: "#/s:wampei.eth?walletId=123&authCookie=myCookie",
+        pathname: "/",
+      },
+      writable: true,
+    });
+
+    const pushStateSpy = vi.spyOn(window.history, "pushState");
+
+    const result = getUrlToken();
+
+    expect(result).toEqual({
+      authCookie: "myCookie",
+      authFlow: undefined,
+      authProvider: undefined,
+      authResult: undefined,
+      walletId: "123",
+    });
+
+    // Verify pushState preserves hash path but strips auth params from it
+    expect(pushStateSpy).toHaveBeenCalledWith({}, "", "/#/s:wampei.eth");
+    pushStateSpy.mockRestore();
+  });
 });

package/src/wallets/in-app/web/lib/get-url-token.ts

@@ -19,18 +19,40 @@ export function getUrlToken():
     return undefined;
   }
 
-  const queryString = window.location.search;
-  const params = new URLSearchParams(queryString);
-  const authResultString = params.get("authResult");
-  const walletId = params.get("walletId") as WalletId | undefined;
-  const authProvider = params.get("authProvider") as AuthOption | undefined;
-  const authCookie = params.get("authCookie") as string | undefined;
-  const authFlow = params.get("authFlow") as "connect" | "link" | undefined;
+  // Read params from the standard query string
+  const params = new URLSearchParams(window.location.search);
+
+  // Also check for params embedded inside the hash fragment (e.g. #/route?walletId=...)
+  // This supports hash-routed apps where params may be placed after the hash path
+  let hashParams: URLSearchParams | undefined;
+  const hash = window.location.hash || "";
+  let cleanHash = hash;
+  const hashQueryIndex = hash.indexOf("?");
+  if (hashQueryIndex !== -1) {
+    hashParams = new URLSearchParams(hash.substring(hashQueryIndex));
+    cleanHash = hash.substring(0, hashQueryIndex);
+  }
+
+  const walletId = (params.get("walletId") ??
+    hashParams?.get("walletId") ??
+    undefined) as WalletId | undefined;
+  const authResultString =
+    params.get("authResult") ?? hashParams?.get("authResult") ?? undefined;
+  const authProvider = (params.get("authProvider") ??
+    hashParams?.get("authProvider") ??
+    undefined) as AuthOption | undefined;
+  const authCookie = (params.get("authCookie") ??
+    hashParams?.get("authCookie") ??
+    undefined) as string | undefined;
+  const authFlow = (params.get("authFlow") ??
+    hashParams?.get("authFlow") ??
+    undefined) as "connect" | "link" | undefined;
 
   if ((authCookie || authResultString) && walletId) {
     const authResult = (() => {
       if (authResultString) {
         params.delete("authResult");
+        hashParams?.delete("authResult");
         return JSON.parse(decodeURIComponent(authResultString));
       }
     })();
@@ -38,10 +60,27 @@ export function getUrlToken():
     params.delete("authProvider");
     params.delete("authCookie");
     params.delete("authFlow");
+    hashParams?.delete("walletId");
+    hashParams?.delete("authProvider");
+    hashParams?.delete("authCookie");
+    hashParams?.delete("authFlow");
+
+    const remainingSearch = params.toString();
+    const searchString = remainingSearch ? `?${remainingSearch}` : "";
+
+    // Reconstruct hash, preserving the hash path and any remaining non-auth params
+    let hashString = cleanHash;
+    if (hashParams) {
+      const remainingHashParams = hashParams.toString();
+      if (remainingHashParams) {
+        hashString = `${cleanHash}?${remainingHashParams}`;
+      }
+    }
+
     window.history.pushState(
       {},
       "",
-      `${window.location.pathname}?${params.toString()}`,
+      `${window.location.pathname}${searchString}${hashString}`,
     );
     return { authCookie, authFlow, authProvider, authResult, walletId };
   }