thirdweb 5.118.0 → 5.118.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/wallets/in-app/web/lib/get-url-token.js +41 -8
- package/dist/cjs/wallets/in-app/web/lib/get-url-token.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/in-app/web/lib/get-url-token.js +41 -8
- package/dist/esm/wallets/in-app/web/lib/get-url-token.js.map +1 -1
- package/dist/scripts/bridge-widget.js +3 -3
- package/dist/types/version.d.ts +1 -1
- package/dist/types/wallets/in-app/web/lib/get-url-token.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/react/web/ui/SiteLink.test.tsx +21 -0
- package/src/version.ts +1 -1
- package/src/wallets/in-app/web/lib/get-url-token.test.tsx +63 -7
- package/src/wallets/in-app/web/lib/get-url-token.ts +47 -8
package/dist/cjs/version.js
CHANGED
|
@@ -9,17 +9,36 @@ function getUrlToken() {
|
|
|
9
9
|
// Not in web
|
|
10
10
|
return undefined;
|
|
11
11
|
}
|
|
12
|
-
|
|
13
|
-
const params = new URLSearchParams(
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
const
|
|
18
|
-
|
|
12
|
+
// Read params from the standard query string
|
|
13
|
+
const params = new URLSearchParams(window.location.search);
|
|
14
|
+
// Also check for params embedded inside the hash fragment (e.g. #/route?walletId=...)
|
|
15
|
+
// This supports hash-routed apps where params may be placed after the hash path
|
|
16
|
+
let hashParams;
|
|
17
|
+
const hash = window.location.hash || "";
|
|
18
|
+
let cleanHash = hash;
|
|
19
|
+
const hashQueryIndex = hash.indexOf("?");
|
|
20
|
+
if (hashQueryIndex !== -1) {
|
|
21
|
+
hashParams = new URLSearchParams(hash.substring(hashQueryIndex));
|
|
22
|
+
cleanHash = hash.substring(0, hashQueryIndex);
|
|
23
|
+
}
|
|
24
|
+
const walletId = (params.get("walletId") ??
|
|
25
|
+
hashParams?.get("walletId") ??
|
|
26
|
+
undefined);
|
|
27
|
+
const authResultString = params.get("authResult") ?? hashParams?.get("authResult") ?? undefined;
|
|
28
|
+
const authProvider = (params.get("authProvider") ??
|
|
29
|
+
hashParams?.get("authProvider") ??
|
|
30
|
+
undefined);
|
|
31
|
+
const authCookie = (params.get("authCookie") ??
|
|
32
|
+
hashParams?.get("authCookie") ??
|
|
33
|
+
undefined);
|
|
34
|
+
const authFlow = (params.get("authFlow") ??
|
|
35
|
+
hashParams?.get("authFlow") ??
|
|
36
|
+
undefined);
|
|
19
37
|
if ((authCookie || authResultString) && walletId) {
|
|
20
38
|
const authResult = (() => {
|
|
21
39
|
if (authResultString) {
|
|
22
40
|
params.delete("authResult");
|
|
41
|
+
hashParams?.delete("authResult");
|
|
23
42
|
return JSON.parse(decodeURIComponent(authResultString));
|
|
24
43
|
}
|
|
25
44
|
})();
|
|
@@ -27,7 +46,21 @@ function getUrlToken() {
|
|
|
27
46
|
params.delete("authProvider");
|
|
28
47
|
params.delete("authCookie");
|
|
29
48
|
params.delete("authFlow");
|
|
30
|
-
|
|
49
|
+
hashParams?.delete("walletId");
|
|
50
|
+
hashParams?.delete("authProvider");
|
|
51
|
+
hashParams?.delete("authCookie");
|
|
52
|
+
hashParams?.delete("authFlow");
|
|
53
|
+
const remainingSearch = params.toString();
|
|
54
|
+
const searchString = remainingSearch ? `?${remainingSearch}` : "";
|
|
55
|
+
// Reconstruct hash, preserving the hash path and any remaining non-auth params
|
|
56
|
+
let hashString = cleanHash;
|
|
57
|
+
if (hashParams) {
|
|
58
|
+
const remainingHashParams = hashParams.toString();
|
|
59
|
+
if (remainingHashParams) {
|
|
60
|
+
hashString = `${cleanHash}?${remainingHashParams}`;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
window.history.pushState({}, "", `${window.location.pathname}${searchString}${hashString}`);
|
|
31
64
|
return { authCookie, authFlow, authProvider, authResult, walletId };
|
|
32
65
|
}
|
|
33
66
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-url-token.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/get-url-token.ts"],"names":[],"mappings":";;AAOA,
|
|
1
|
+
{"version":3,"file":"get-url-token.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/get-url-token.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.118.
|
|
1
|
+
export const version = "5.118.1";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -6,17 +6,36 @@ export function getUrlToken() {
|
|
|
6
6
|
// Not in web
|
|
7
7
|
return undefined;
|
|
8
8
|
}
|
|
9
|
-
|
|
10
|
-
const params = new URLSearchParams(
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
9
|
+
// Read params from the standard query string
|
|
10
|
+
const params = new URLSearchParams(window.location.search);
|
|
11
|
+
// Also check for params embedded inside the hash fragment (e.g. #/route?walletId=...)
|
|
12
|
+
// This supports hash-routed apps where params may be placed after the hash path
|
|
13
|
+
let hashParams;
|
|
14
|
+
const hash = window.location.hash || "";
|
|
15
|
+
let cleanHash = hash;
|
|
16
|
+
const hashQueryIndex = hash.indexOf("?");
|
|
17
|
+
if (hashQueryIndex !== -1) {
|
|
18
|
+
hashParams = new URLSearchParams(hash.substring(hashQueryIndex));
|
|
19
|
+
cleanHash = hash.substring(0, hashQueryIndex);
|
|
20
|
+
}
|
|
21
|
+
const walletId = (params.get("walletId") ??
|
|
22
|
+
hashParams?.get("walletId") ??
|
|
23
|
+
undefined);
|
|
24
|
+
const authResultString = params.get("authResult") ?? hashParams?.get("authResult") ?? undefined;
|
|
25
|
+
const authProvider = (params.get("authProvider") ??
|
|
26
|
+
hashParams?.get("authProvider") ??
|
|
27
|
+
undefined);
|
|
28
|
+
const authCookie = (params.get("authCookie") ??
|
|
29
|
+
hashParams?.get("authCookie") ??
|
|
30
|
+
undefined);
|
|
31
|
+
const authFlow = (params.get("authFlow") ??
|
|
32
|
+
hashParams?.get("authFlow") ??
|
|
33
|
+
undefined);
|
|
16
34
|
if ((authCookie || authResultString) && walletId) {
|
|
17
35
|
const authResult = (() => {
|
|
18
36
|
if (authResultString) {
|
|
19
37
|
params.delete("authResult");
|
|
38
|
+
hashParams?.delete("authResult");
|
|
20
39
|
return JSON.parse(decodeURIComponent(authResultString));
|
|
21
40
|
}
|
|
22
41
|
})();
|
|
@@ -24,7 +43,21 @@ export function getUrlToken() {
|
|
|
24
43
|
params.delete("authProvider");
|
|
25
44
|
params.delete("authCookie");
|
|
26
45
|
params.delete("authFlow");
|
|
27
|
-
|
|
46
|
+
hashParams?.delete("walletId");
|
|
47
|
+
hashParams?.delete("authProvider");
|
|
48
|
+
hashParams?.delete("authCookie");
|
|
49
|
+
hashParams?.delete("authFlow");
|
|
50
|
+
const remainingSearch = params.toString();
|
|
51
|
+
const searchString = remainingSearch ? `?${remainingSearch}` : "";
|
|
52
|
+
// Reconstruct hash, preserving the hash path and any remaining non-auth params
|
|
53
|
+
let hashString = cleanHash;
|
|
54
|
+
if (hashParams) {
|
|
55
|
+
const remainingHashParams = hashParams.toString();
|
|
56
|
+
if (remainingHashParams) {
|
|
57
|
+
hashString = `${cleanHash}?${remainingHashParams}`;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
window.history.pushState({}, "", `${window.location.pathname}${searchString}${hashString}`);
|
|
28
61
|
return { authCookie, authFlow, authProvider, authResult, walletId };
|
|
29
62
|
}
|
|
30
63
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-url-token.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/get-url-token.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,UAAU,WAAW;IASzB,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QACpC,aAAa;QACb,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"get-url-token.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/get-url-token.ts"],"names":[],"mappings":"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"}
|