thirdweb 5.39.0 → 5.40.0-nightly-3848327373e49aa83c5902e6a16d5b8e96cf1eeb-20240726000343
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/react/core/hooks/wallets/useAutoConnect.js +16 -3
- package/dist/cjs/react/core/hooks/wallets/useAutoConnect.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/Modal/ConnectEmbed.js +7 -3
- package/dist/cjs/react/web/ui/ConnectWallet/Modal/ConnectEmbed.js.map +1 -1
- package/dist/cjs/react/web/wallets/shared/ConnectWalletSocialOptions.js +16 -5
- package/dist/cjs/react/web/wallets/shared/ConnectWalletSocialOptions.js.map +1 -1
- package/dist/cjs/react/web/wallets/shared/SocialLogin.js +18 -2
- package/dist/cjs/react/web/wallets/shared/SocialLogin.js.map +1 -1
- package/dist/cjs/react/web/wallets/shared/{openOauthSignInWindow.js → oauthSignIn.js} +2 -3
- package/dist/cjs/react/web/wallets/shared/oauthSignIn.js.map +1 -0
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/version.js.map +1 -1
- package/dist/cjs/wallets/in-app/core/wallet/index.js +15 -0
- package/dist/cjs/wallets/in-app/core/wallet/index.js.map +1 -1
- package/dist/cjs/wallets/in-app/web/in-app.js +10 -0
- package/dist/cjs/wallets/in-app/web/in-app.js.map +1 -1
- package/dist/cjs/wallets/in-app/web/lib/auth/index.js +2 -0
- package/dist/cjs/wallets/in-app/web/lib/auth/index.js.map +1 -1
- package/dist/cjs/wallets/in-app/web/lib/auth/oauth.js +9 -1
- package/dist/cjs/wallets/in-app/web/lib/auth/oauth.js.map +1 -1
- package/dist/cjs/wallets/in-app/web/lib/get-url-token.js +26 -0
- package/dist/cjs/wallets/in-app/web/lib/get-url-token.js.map +1 -0
- package/dist/cjs/wallets/in-app/web/lib/web-connector.js +13 -3
- package/dist/cjs/wallets/in-app/web/lib/web-connector.js.map +1 -1
- package/dist/esm/react/core/hooks/wallets/useAutoConnect.js +16 -3
- package/dist/esm/react/core/hooks/wallets/useAutoConnect.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/Modal/ConnectEmbed.js +7 -3
- package/dist/esm/react/web/ui/ConnectWallet/Modal/ConnectEmbed.js.map +1 -1
- package/dist/esm/react/web/wallets/shared/ConnectWalletSocialOptions.js +15 -4
- package/dist/esm/react/web/wallets/shared/ConnectWalletSocialOptions.js.map +1 -1
- package/dist/esm/react/web/wallets/shared/SocialLogin.js +17 -1
- package/dist/esm/react/web/wallets/shared/SocialLogin.js.map +1 -1
- package/dist/esm/react/web/wallets/shared/{openOauthSignInWindow.js → oauthSignIn.js} +2 -3
- package/dist/esm/react/web/wallets/shared/oauthSignIn.js.map +1 -0
- package/dist/esm/version.js +1 -1
- package/dist/esm/version.js.map +1 -1
- package/dist/esm/wallets/in-app/core/wallet/index.js +15 -0
- package/dist/esm/wallets/in-app/core/wallet/index.js.map +1 -1
- package/dist/esm/wallets/in-app/web/in-app.js +10 -0
- package/dist/esm/wallets/in-app/web/in-app.js.map +1 -1
- package/dist/esm/wallets/in-app/web/lib/auth/index.js +2 -0
- package/dist/esm/wallets/in-app/web/lib/auth/index.js.map +1 -1
- package/dist/esm/wallets/in-app/web/lib/auth/oauth.js +7 -0
- package/dist/esm/wallets/in-app/web/lib/auth/oauth.js.map +1 -1
- package/dist/esm/wallets/in-app/web/lib/get-url-token.js +23 -0
- package/dist/esm/wallets/in-app/web/lib/get-url-token.js.map +1 -0
- package/dist/esm/wallets/in-app/web/lib/web-connector.js +14 -4
- package/dist/esm/wallets/in-app/web/lib/web-connector.js.map +1 -1
- package/dist/types/exports/utils.d.ts +1 -0
- package/dist/types/exports/utils.d.ts.map +1 -1
- package/dist/types/react/core/hooks/wallets/useAutoConnect.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/Modal/ConnectEmbed.d.ts.map +1 -1
- package/dist/types/react/web/wallets/shared/ConnectWalletSocialOptions.d.ts.map +1 -1
- package/dist/types/react/web/wallets/shared/SocialLogin.d.ts.map +1 -1
- package/dist/types/react/web/wallets/shared/{openOauthSignInWindow.d.ts → oauthSignIn.d.ts} +1 -2
- package/dist/types/react/web/wallets/shared/oauthSignIn.d.ts.map +1 -0
- package/dist/types/version.d.ts +1 -1
- package/dist/types/version.d.ts.map +1 -1
- package/dist/types/wallets/ecosystem/types.d.ts +3 -0
- package/dist/types/wallets/ecosystem/types.d.ts.map +1 -1
- package/dist/types/wallets/in-app/core/interfaces/connector.d.ts +4 -1
- package/dist/types/wallets/in-app/core/interfaces/connector.d.ts.map +1 -1
- package/dist/types/wallets/in-app/core/wallet/index.d.ts.map +1 -1
- package/dist/types/wallets/in-app/core/wallet/types.d.ts +4 -1
- package/dist/types/wallets/in-app/core/wallet/types.d.ts.map +1 -1
- package/dist/types/wallets/in-app/web/in-app.d.ts +10 -0
- package/dist/types/wallets/in-app/web/in-app.d.ts.map +1 -1
- package/dist/types/wallets/in-app/web/lib/auth/index.d.ts +11 -2
- package/dist/types/wallets/in-app/web/lib/auth/index.d.ts.map +1 -1
- package/dist/types/wallets/in-app/web/lib/auth/oauth.d.ts +5 -0
- package/dist/types/wallets/in-app/web/lib/auth/oauth.d.ts.map +1 -1
- package/dist/types/wallets/in-app/web/lib/get-url-token.d.ts +12 -0
- package/dist/types/wallets/in-app/web/lib/get-url-token.d.ts.map +1 -0
- package/dist/types/wallets/in-app/web/lib/web-connector.d.ts +4 -1
- package/dist/types/wallets/in-app/web/lib/web-connector.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/exports/utils.ts +2 -0
- package/src/react/core/hooks/wallets/useAutoConnect.ts +17 -3
- package/src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx +9 -3
- package/src/react/web/wallets/shared/ConnectWalletSocialOptions.tsx +18 -4
- package/src/react/web/wallets/shared/SocialLogin.tsx +20 -1
- package/src/react/web/wallets/shared/{openOauthSignInWindow.ts → oauthSignIn.ts} +1 -2
- package/src/version.ts +1 -1
- package/src/wallets/ecosystem/types.ts +3 -0
- package/src/wallets/in-app/core/interfaces/connector.ts +6 -0
- package/src/wallets/in-app/core/wallet/index.ts +22 -0
- package/src/wallets/in-app/core/wallet/types.ts +4 -0
- package/src/wallets/in-app/web/in-app.ts +10 -0
- package/src/wallets/in-app/web/lib/auth/index.ts +14 -3
- package/src/wallets/in-app/web/lib/auth/oauth.ts +12 -0
- package/src/wallets/in-app/web/lib/get-url-token.ts +36 -0
- package/src/wallets/in-app/web/lib/web-connector.ts +18 -4
- package/dist/cjs/react/web/wallets/shared/openOauthSignInWindow.js.map +0 -1
- package/dist/esm/react/web/wallets/shared/openOauthSignInWindow.js.map +0 -1
- package/dist/types/react/web/wallets/shared/openOauthSignInWindow.d.ts.map +0 -1
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.useAutoConnectCore = useAutoConnectCore;
|
|
4
4
|
const react_query_1 = require("@tanstack/react-query");
|
|
5
|
+
const get_url_token_js_1 = require("../../../../wallets/in-app/web/lib/get-url-token.js");
|
|
5
6
|
const index_js_1 = require("../../../../wallets/manager/index.js");
|
|
7
|
+
const storage_js_1 = require("../../utils/storage.js");
|
|
6
8
|
const timeoutPromise_js_1 = require("../../utils/timeoutPromise.js");
|
|
7
9
|
const useConnect_js_1 = require("./useConnect.js");
|
|
8
10
|
const useSetActiveWalletConnectionStatus_js_1 = require("./useSetActiveWalletConnectionStatus.js");
|
|
@@ -21,11 +23,21 @@ function useAutoConnectCore(manager, storage, props, getInstalledWallets) {
|
|
|
21
23
|
const autoConnect = async () => {
|
|
22
24
|
let autoConnected = false;
|
|
23
25
|
isAutoConnecting.setValue(true);
|
|
24
|
-
|
|
26
|
+
let [lastConnectedWalletIds, lastActiveWalletId] = await Promise.all([
|
|
25
27
|
(0, index_js_1.getStoredConnectedWalletIds)(storage),
|
|
26
28
|
(0, index_js_1.getStoredActiveWalletId)(storage),
|
|
27
29
|
]);
|
|
28
|
-
|
|
30
|
+
const { authResult, walletId, authProvider } = (0, get_url_token_js_1.getUrlToken)();
|
|
31
|
+
if (authResult && walletId) {
|
|
32
|
+
lastActiveWalletId = walletId;
|
|
33
|
+
lastConnectedWalletIds = lastConnectedWalletIds?.includes(walletId)
|
|
34
|
+
? lastConnectedWalletIds
|
|
35
|
+
: [walletId, ...(lastConnectedWalletIds || [])];
|
|
36
|
+
}
|
|
37
|
+
if (authProvider) {
|
|
38
|
+
await (0, storage_js_1.setLastAuthProvider)(authProvider, storage);
|
|
39
|
+
}
|
|
40
|
+
// if no wallets were last connected or we didn't receive an auth token
|
|
29
41
|
if (!lastConnectedWalletIds) {
|
|
30
42
|
return autoConnected;
|
|
31
43
|
}
|
|
@@ -34,6 +46,7 @@ function useAutoConnectCore(manager, storage, props, getInstalledWallets) {
|
|
|
34
46
|
return wallet.autoConnect({
|
|
35
47
|
client: props.client,
|
|
36
48
|
chain: lastConnectedChain ?? undefined,
|
|
49
|
+
authResult,
|
|
37
50
|
});
|
|
38
51
|
}
|
|
39
52
|
const availableWallets = [...wallets, ...(getInstalledWallets?.() ?? [])];
|
|
@@ -44,7 +57,7 @@ function useAutoConnectCore(manager, storage, props, getInstalledWallets) {
|
|
|
44
57
|
setConnectionStatus("connecting"); // only set connecting status if we are connecting the last active EOA
|
|
45
58
|
await (0, timeoutPromise_js_1.timeoutPromise)(handleWalletConnection(activeWallet), {
|
|
46
59
|
ms: timeout,
|
|
47
|
-
message: `AutoConnect timeout
|
|
60
|
+
message: `AutoConnect timeout: ${timeout}ms limit exceeded.`,
|
|
48
61
|
});
|
|
49
62
|
// connected wallet could be activeWallet or smart wallet
|
|
50
63
|
const connectedWallet = await connect(activeWallet);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAutoConnect.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAutoConnect.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"useAutoConnect.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAutoConnect.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,17 +107,21 @@ const ConnectEmbedContent = (props) => {
|
|
|
107
107
|
welcomeScreen: undefined,
|
|
108
108
|
wallets: props.wallets,
|
|
109
109
|
});
|
|
110
|
-
const { setScreen, initialScreen } = screenSetup;
|
|
110
|
+
const { setScreen, initialScreen, screen } = screenSetup;
|
|
111
111
|
const activeWallet = (0, useActiveWallet_js_1.useActiveWallet)();
|
|
112
112
|
const siweAuth = (0, useSiweAuth_js_1.useSiweAuth)(activeWallet, props.auth);
|
|
113
113
|
const activeAccount = (0, useActiveAccount_js_1.useActiveAccount)();
|
|
114
114
|
const isAutoConnecting = (0, useIsAutoConnecting_js_1.useIsAutoConnecting)();
|
|
115
115
|
let content = null;
|
|
116
|
+
// if sign in is required but connect embed is showing the initial screen - change to sign in screen
|
|
116
117
|
(0, react_1.useEffect)(() => {
|
|
117
|
-
if (siweAuth.requiresAuth &&
|
|
118
|
+
if (siweAuth.requiresAuth &&
|
|
119
|
+
!siweAuth.isLoggedIn &&
|
|
120
|
+
activeAccount &&
|
|
121
|
+
screen === initialScreen) {
|
|
118
122
|
setScreen(constants_js_1.reservedScreens.signIn);
|
|
119
123
|
}
|
|
120
|
-
}, [siweAuth, setScreen, activeAccount]);
|
|
124
|
+
}, [siweAuth, setScreen, activeAccount, screen, initialScreen]);
|
|
121
125
|
const modalSize = !(0, canFitWideModal_js_1.canFitWideModal)()
|
|
122
126
|
? "compact"
|
|
123
127
|
: props.modalSize || "compact";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectEmbed.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ConnectEmbed.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ const react_1 = require("react");
|
|
|
9
9
|
const webStorage_js_1 = require("../../../../utils/storage/webStorage.js");
|
|
10
10
|
const get_ecosystem_wallet_auth_options_js_1 = require("../../../../wallets/ecosystem/get-ecosystem-wallet-auth-options.js");
|
|
11
11
|
const is_ecosystem_wallet_js_1 = require("../../../../wallets/ecosystem/is-ecosystem-wallet.js");
|
|
12
|
+
const oauth_js_1 = require("../../../../wallets/in-app/web/lib/auth/oauth.js");
|
|
12
13
|
const types_js_1 = require("../../../../wallets/types.js");
|
|
13
14
|
const CustomThemeProvider_js_1 = require("../../../core/design-system/CustomThemeProvider.js");
|
|
14
15
|
const index_js_1 = require("../../../core/design-system/index.js");
|
|
@@ -23,7 +24,7 @@ const buttons_js_1 = require("../../ui/components/buttons.js");
|
|
|
23
24
|
const InputSelectionUI_js_1 = require("../in-app/InputSelectionUI.js");
|
|
24
25
|
const validateEmail_js_1 = require("../in-app/validateEmail.js");
|
|
25
26
|
const LoadingScreen_js_1 = require("./LoadingScreen.js");
|
|
26
|
-
const
|
|
27
|
+
const oauthSignIn_js_1 = require("./oauthSignIn.js");
|
|
27
28
|
const defaultAuthOptions = [
|
|
28
29
|
"email",
|
|
29
30
|
"phone",
|
|
@@ -103,8 +104,18 @@ const ConnectWalletSocialOptions = (props) => {
|
|
|
103
104
|
: undefined;
|
|
104
105
|
// Need to trigger login on button click to avoid popup from being blocked
|
|
105
106
|
const handleSocialLogin = async (strategy) => {
|
|
107
|
+
const walletConfig = wallet.getConfig();
|
|
108
|
+
if (walletConfig &&
|
|
109
|
+
"auth" in walletConfig &&
|
|
110
|
+
walletConfig?.auth?.mode === "redirect") {
|
|
111
|
+
return (0, oauth_js_1.loginWithOauthRedirect)({
|
|
112
|
+
authOption: strategy,
|
|
113
|
+
client: props.client,
|
|
114
|
+
ecosystem: ecosystemInfo,
|
|
115
|
+
});
|
|
116
|
+
}
|
|
106
117
|
try {
|
|
107
|
-
const socialLoginWindow = (0,
|
|
118
|
+
const socialLoginWindow = (0, oauthSignIn_js_1.openOauthSignInWindow)({
|
|
108
119
|
authOption: strategy,
|
|
109
120
|
themeObj,
|
|
110
121
|
client: props.client,
|
|
@@ -139,11 +150,11 @@ const ConnectWalletSocialOptions = (props) => {
|
|
|
139
150
|
},
|
|
140
151
|
});
|
|
141
152
|
props.select(); // show Connect UI
|
|
142
|
-
// Note: do not call done() here, it will be called
|
|
143
|
-
// we simply trigger the connect and save promise here - its resolution is handled in
|
|
153
|
+
// Note: do not call done() here, it will be called SocialLogin component
|
|
154
|
+
// we simply trigger the connect and save promise here - its resolution is handled in SocialLogin
|
|
144
155
|
}
|
|
145
156
|
catch (e) {
|
|
146
|
-
console.error(`Error
|
|
157
|
+
console.error(`Error signing in with ${strategy}`, e);
|
|
147
158
|
}
|
|
148
159
|
};
|
|
149
160
|
function handlePassKeyLogin() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectWalletSocialOptions.js","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/ConnectWalletSocialOptions.tsx"],"names":[],"mappings":";AAAA,YAAY,CAAC;;;;AACb,4CAAqC;AACrC,uDAAiD;AACjD,iCAA0C;AAG1C,2EAA0E;AAC1E,6HAAmH;AACnH,iGAAyF;
|
|
1
|
+
{"version":3,"file":"ConnectWalletSocialOptions.js","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/ConnectWalletSocialOptions.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const jsx_runtime_1 = require("react/jsx-runtime");
|
|
|
6
6
|
const react_1 = require("react");
|
|
7
7
|
const webStorage_js_1 = require("../../../../utils/storage/webStorage.js");
|
|
8
8
|
const is_ecosystem_wallet_js_1 = require("../../../../wallets/ecosystem/is-ecosystem-wallet.js");
|
|
9
|
+
const oauth_js_1 = require("../../../../wallets/in-app/web/lib/auth/oauth.js");
|
|
9
10
|
const CustomThemeProvider_js_1 = require("../../../core/design-system/CustomThemeProvider.js");
|
|
10
11
|
const storage_js_1 = require("../../../core/utils/storage.js");
|
|
11
12
|
const Spacer_js_1 = require("../../ui/components/Spacer.js");
|
|
@@ -13,7 +14,7 @@ const Spinner_js_1 = require("../../ui/components/Spinner.js");
|
|
|
13
14
|
const basic_js_1 = require("../../ui/components/basic.js");
|
|
14
15
|
const buttons_js_1 = require("../../ui/components/buttons.js");
|
|
15
16
|
const text_js_1 = require("../../ui/components/text.js");
|
|
16
|
-
const
|
|
17
|
+
const oauthSignIn_js_1 = require("./oauthSignIn.js");
|
|
17
18
|
/**
|
|
18
19
|
* @internal
|
|
19
20
|
*/
|
|
@@ -25,8 +26,23 @@ function SocialLogin(props) {
|
|
|
25
26
|
const { done, wallet } = props;
|
|
26
27
|
const [status, setStatus] = (0, react_1.useState)("connecting");
|
|
27
28
|
const handleSocialLogin = async () => {
|
|
29
|
+
const walletConfig = wallet.getConfig();
|
|
30
|
+
if (walletConfig &&
|
|
31
|
+
"auth" in walletConfig &&
|
|
32
|
+
walletConfig?.auth?.mode === "redirect") {
|
|
33
|
+
return (0, oauth_js_1.loginWithOauthRedirect)({
|
|
34
|
+
authOption: props.socialAuth,
|
|
35
|
+
client: props.client,
|
|
36
|
+
ecosystem: (0, is_ecosystem_wallet_js_1.isEcosystemWallet)(wallet)
|
|
37
|
+
? {
|
|
38
|
+
id: wallet.id,
|
|
39
|
+
partnerId: wallet.getConfig()?.partnerId,
|
|
40
|
+
}
|
|
41
|
+
: undefined,
|
|
42
|
+
});
|
|
43
|
+
}
|
|
28
44
|
try {
|
|
29
|
-
const socialWindow = (0,
|
|
45
|
+
const socialWindow = (0, oauthSignIn_js_1.openOauthSignInWindow)({
|
|
30
46
|
authOption: props.socialAuth,
|
|
31
47
|
themeObj,
|
|
32
48
|
client: props.client,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SocialLogin.js","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/SocialLogin.tsx"],"names":[],"mappings":";AAAA,YAAY,CAAC;;
|
|
1
|
+
{"version":3,"file":"SocialLogin.js","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/SocialLogin.tsx"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,6 @@ function getOauthLoginPath(authOption, client, ecosystem) {
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
/**
|
|
35
|
-
*
|
|
36
35
|
* @internal
|
|
37
36
|
*/
|
|
38
37
|
function openOauthSignInWindow({ authOption, themeObj, client, ecosystem, }) {
|
|
@@ -110,8 +109,8 @@ const spinnerWindowHtml = `
|
|
|
110
109
|
@keyframes spin {
|
|
111
110
|
100% {
|
|
112
111
|
transform: rotate(360deg);
|
|
113
|
-
|
|
112
|
+
}
|
|
114
113
|
}
|
|
115
114
|
</style>
|
|
116
115
|
`;
|
|
117
|
-
//# sourceMappingURL=
|
|
116
|
+
//# sourceMappingURL=oauthSignIn.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthSignIn.js","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/oauthSignIn.ts"],"names":[],"mappings":";;AA6CA,sDAqCC;AAjFD,oGAAwG;AAKxG,SAAS,YAAY,CAAC,UAAiC;IACrD,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,QAAQ;YACX,OAAO,2BAA2B,CAAC;QACrC;YACE,OAAO,aAAa,UAAU;iBAC3B,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;iBACX,WAAW,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,UAAiC;IAC1D,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,UAAU;YACb,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QACrC;YACE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACvC,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CACxB,UAAiC,EACjC,MAAsB,EACtB,SAAqB;IAErB,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,OAAO,CAAC;QACb,KAAK,UAAU,CAAC;QAChB,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,IAAA,wCAAsB,EAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC/D;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CAAC,EACpC,UAAU,EACV,QAAQ,EACR,MAAM,EACN,SAAS,GAMV;IACC,6CAA6C;IAC7C,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CACrB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAChD,SAAS,EACT,SAAS,KAAK,YAAY,MAAM,SAAS,GAAG,UAAU,IAAI,EAAE,CAC7D,CAAC;IACF,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,KAAK,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QACvC,GAAG,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;QAC3B,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC;QAChD,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;QAC7D,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC;IAC7D,CAAC;IAED,sDAAsD;IACtD,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,CAAC,gBAAgB,CAAC,cAAc,EAAE,GAAG,EAAE;YAC3C,GAAG,EAAE,KAAK,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,iBAAiB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyDzB,CAAC"}
|
package/dist/cjs/version.js
CHANGED
package/dist/cjs/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,wEAAwE,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.isInAppWallet = isInAppWallet;
|
|
|
4
4
|
exports.connectInAppWallet = connectInAppWallet;
|
|
5
5
|
exports.autoConnectInAppWallet = autoConnectInAppWallet;
|
|
6
6
|
const ethereum_js_1 = require("../../../../chains/chain-definitions/ethereum.js");
|
|
7
|
+
const types_js_1 = require("../../../../wallets/types.js");
|
|
7
8
|
const type_js_1 = require("../authentication/type.js");
|
|
8
9
|
/**
|
|
9
10
|
* Checks if the provided wallet is an in-app wallet.
|
|
@@ -18,6 +19,17 @@ function isInAppWallet(wallet) {
|
|
|
18
19
|
* @internal
|
|
19
20
|
*/
|
|
20
21
|
async function connectInAppWallet(options, createOptions, connector) {
|
|
22
|
+
if (createOptions?.auth?.mode === "redirect" &&
|
|
23
|
+
connector.authenticateWithRedirect) {
|
|
24
|
+
const strategy = options.strategy;
|
|
25
|
+
if (!types_js_1.socialAuthOptions.includes(strategy)) {
|
|
26
|
+
throw new Error("This authentication method does not support redirects");
|
|
27
|
+
}
|
|
28
|
+
connector.authenticateWithRedirect(strategy);
|
|
29
|
+
}
|
|
30
|
+
// If we don't have authenticateWithRedirect then it's likely react native, so the default is to redirect and we can carry on
|
|
31
|
+
// IF WE EVER ADD MORE CONNECTOR TYPES, this could cause redirect to be ignored despite being specified
|
|
32
|
+
// TODO: In V6, make everything redirect auth
|
|
21
33
|
const authResult = await connector.authenticate(options);
|
|
22
34
|
const authAccount = authResult.user.account;
|
|
23
35
|
if (createOptions &&
|
|
@@ -36,6 +48,9 @@ async function connectInAppWallet(options, createOptions, connector) {
|
|
|
36
48
|
* @internal
|
|
37
49
|
*/
|
|
38
50
|
async function autoConnectInAppWallet(options, createOptions, connector) {
|
|
51
|
+
if (options.authResult && connector.loginWithAuthToken) {
|
|
52
|
+
await connector.loginWithAuthToken(options.authResult);
|
|
53
|
+
}
|
|
39
54
|
const user = await getAuthenticatedUser(connector);
|
|
40
55
|
if (!user) {
|
|
41
56
|
throw new Error("Failed to authenticate user.");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,6 +52,16 @@ const in_app_core_js_1 = require("../core/wallet/in-app-core.js");
|
|
|
52
52
|
* hidePrivateKeyExport: true
|
|
53
53
|
* });
|
|
54
54
|
* ```
|
|
55
|
+
*
|
|
56
|
+
* Open the Oauth window in the same tab
|
|
57
|
+
* ```ts
|
|
58
|
+
* import { inAppWallet } from "thirdweb/wallets";
|
|
59
|
+
* const wallet = inAppWallet({
|
|
60
|
+
* auth: {
|
|
61
|
+
* mode: "redirect"
|
|
62
|
+
* }
|
|
63
|
+
* });
|
|
64
|
+
* ```
|
|
55
65
|
* @wallet
|
|
56
66
|
*/
|
|
57
67
|
function inAppWallet(createOptions) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-app.js","sourceRoot":"","sources":["../../../../../src/wallets/in-app/web/in-app.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"in-app.js","sourceRoot":"","sources":["../../../../../src/wallets/in-app/web/in-app.ts"],"names":[],"mappings":";;AAmEA,kCAYC;AA5ED,kEAAkE;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6DG;AACH,SAAgB,WAAW,CACzB,aAA4C;IAE5C,OAAO,IAAA,kCAAiB,EAAC;QACvB,aAAa;QACb,gBAAgB,EAAE,KAAK,EAAE,MAAsB,EAAE,EAAE;YACjD,MAAM,EAAE,iBAAiB,EAAE,GAAG,2CAAa,wBAAwB,EAAC,CAAC;YACrE,OAAO,IAAI,iBAAiB,CAAC;gBAC3B,MAAM;aACP,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -127,6 +127,8 @@ async function preAuthenticate(args) {
|
|
|
127
127
|
*/
|
|
128
128
|
async function authenticate(args) {
|
|
129
129
|
const connector = await getInAppWalletConnector(args.client, args.ecosystem);
|
|
130
|
+
if (args.redirect && connector.authenticateWithRedirect)
|
|
131
|
+
return connector.authenticateWithRedirect(args.strategy);
|
|
130
132
|
return connector.authenticate(args);
|
|
131
133
|
}
|
|
132
134
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/index.ts"],"names":[],"mappings":";;AAkDA,oDAYC;AAeD,oCAMC;AAeD,gDAMC;AAmBD,0CAGC;AAmBD,oCAeC;AA7JD,kEAK8C;AAC9C,wEAAsF;AAGtF,sEAAsE;AACtE,iEAAiE;AAEjE;;GAEG;AACH,KAAK,UAAU,uBAAuB,CACpC,MAAsB,EACtB,SAAqB;IAErB,OAAO,IAAA,gDAA+B,EACpC,MAAM,EACN,KAAK,EAAE,MAAM,EAAE,EAAE;QACf,MAAM,EAAE,iBAAiB,EAAE,GAAG,2CAAa,qBAAqB,EAAC,CAAC;QAClE,OAAO,IAAI,iBAAiB,CAAC;YAC3B,MAAM,EAAE,MAAM;YACd,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;IACL,CAAC,EACD,SAAS,CACV,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACI,KAAK,UAAU,oBAAoB,CACxC,OAAmC;IAEnC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,SAAS,GAAG,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACxD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;IACvC,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;QACpB,KAAK,0BAAgB,CAAC,4BAA4B,CAAC,CAAC,CAAC;YACnD,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,YAAY,CAAC,OAAmC;IACpE,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,IAAI,IAAI,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IAChC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,kBAAkB,CAAC,OAAmC;IAC1E,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,IAAI,IAAI,aAAa,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC;IACtC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACI,KAAK,UAAU,eAAe,CAAC,IAAqB;IACzD,MAAM,SAAS,GAAG,MAAM,uBAAuB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC7E,OAAO,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACI,KAAK,UAAU,YAAY,CAChC,IAQC;IAED,MAAM,SAAS,GAAG,MAAM,uBAAuB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC7E,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,wBAAwB;QACrD,OAAO,SAAS,CAAC,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3D,OAAO,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.loginWithOauth = exports.getSocialAuthLoginPath = void 0;
|
|
3
|
+
exports.loginWithOauth = exports.loginWithOauthRedirect = exports.getSocialAuthLoginPath = void 0;
|
|
4
4
|
const domains_js_1 = require("../../../../../utils/domains.js");
|
|
5
5
|
const constants_js_1 = require("./constants.js");
|
|
6
6
|
const closeWindow = ({ isWindowOpenedByFn, win, closeOpenedWindow, }) => {
|
|
@@ -27,6 +27,14 @@ const getSocialAuthLoginPath = (authOption, client, ecosystem) => {
|
|
|
27
27
|
return baseUrl;
|
|
28
28
|
};
|
|
29
29
|
exports.getSocialAuthLoginPath = getSocialAuthLoginPath;
|
|
30
|
+
const loginWithOauthRedirect = (options) => {
|
|
31
|
+
const redirectUrl = new URL(window.location.href);
|
|
32
|
+
redirectUrl.searchParams.set("walletId", options.ecosystem?.id || "inApp");
|
|
33
|
+
redirectUrl.searchParams.set("authProvider", options.authOption);
|
|
34
|
+
const loginUrl = `${(0, exports.getSocialAuthLoginPath)(options.authOption, options.client, options.ecosystem)}&redirectUrl=${encodeURIComponent(redirectUrl.toString())}`;
|
|
35
|
+
window.location.href = loginUrl;
|
|
36
|
+
};
|
|
37
|
+
exports.loginWithOauthRedirect = loginWithOauthRedirect;
|
|
30
38
|
const loginWithOauth = async (options) => {
|
|
31
39
|
let win = options.openedWindow;
|
|
32
40
|
let isWindowOpenedByFn = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/oauth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getUrlToken = getUrlToken;
|
|
4
|
+
/**
|
|
5
|
+
* Checks for an auth token and associated metadata in the current URL
|
|
6
|
+
*/
|
|
7
|
+
function getUrlToken() {
|
|
8
|
+
if (!window) {
|
|
9
|
+
throw new Error("Attempted to fetch a URL token on the server");
|
|
10
|
+
}
|
|
11
|
+
const queryString = window.location.search;
|
|
12
|
+
const params = new URLSearchParams(queryString);
|
|
13
|
+
const authResultString = params.get("authResult");
|
|
14
|
+
const walletId = params.get("walletId");
|
|
15
|
+
const authProvider = params.get("authProvider");
|
|
16
|
+
if (authResultString && walletId) {
|
|
17
|
+
const authResult = JSON.parse(authResultString);
|
|
18
|
+
params.delete("authResult");
|
|
19
|
+
params.delete("walletId");
|
|
20
|
+
params.delete("authProvider");
|
|
21
|
+
window.history.pushState({}, "", `${window.location.pathname}?${params.toString()}`);
|
|
22
|
+
return { walletId, authResult, authProvider };
|
|
23
|
+
}
|
|
24
|
+
return {};
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=get-url-token.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-url-token.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/get-url-token.ts"],"names":[],"mappings":";;AAOA,kCA4BC;AA/BD;;GAEG;AACH,SAAgB,WAAW;IAKzB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,WAAW,CAAC,CAAC;IAChD,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAyB,CAAC;IAChE,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc,CAA2B,CAAC;IAE1E,IAAI,gBAAgB,IAAI,QAAQ,EAAE,CAAC;QACjC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAChD,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC5B,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC1B,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,SAAS,CACtB,EAAE,EACF,EAAE,EACF,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CACnD,CAAC;QACF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;IAChD,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -141,6 +141,16 @@ class InAppWebConnector {
|
|
|
141
141
|
assertUnreachable(strategy, `Provider: ${strategy} doesn't require pre-authentication`);
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
|
+
authenticateWithRedirect(strategy) {
|
|
145
|
+
(0, oauth_js_1.loginWithOauthRedirect)({
|
|
146
|
+
authOption: strategy,
|
|
147
|
+
client: this.wallet.client,
|
|
148
|
+
ecosystem: this.wallet.ecosystem,
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
async loginWithAuthToken(authResult) {
|
|
152
|
+
return this.auth.loginWithAuthToken(authResult);
|
|
153
|
+
}
|
|
144
154
|
async authenticate(args) {
|
|
145
155
|
const strategy = args.strategy;
|
|
146
156
|
switch (strategy) {
|
|
@@ -184,14 +194,14 @@ class InAppWebConnector {
|
|
|
184
194
|
authenticatorType: args.authenticatorType,
|
|
185
195
|
username: args.passkeyName,
|
|
186
196
|
});
|
|
187
|
-
return this.
|
|
197
|
+
return this.loginWithAuthToken(authToken);
|
|
188
198
|
}
|
|
189
199
|
const authToken = await (0, passkeys_js_1.loginWithPasskey)({
|
|
190
200
|
client: this.wallet.client,
|
|
191
201
|
ecosystem: this.wallet.ecosystem,
|
|
192
202
|
authenticatorType: args.authenticatorType,
|
|
193
203
|
});
|
|
194
|
-
return this.
|
|
204
|
+
return this.loginWithAuthToken(authToken);
|
|
195
205
|
}
|
|
196
206
|
case "apple":
|
|
197
207
|
case "facebook":
|
|
@@ -204,7 +214,7 @@ class InAppWebConnector {
|
|
|
204
214
|
closeOpenedWindow: args.closeOpenedWindow,
|
|
205
215
|
openedWindow: args.openedWindow,
|
|
206
216
|
});
|
|
207
|
-
return this.
|
|
217
|
+
return this.loginWithAuthToken(authToken);
|
|
208
218
|
}
|
|
209
219
|
default:
|
|
210
220
|
assertUnreachable(strategy);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-connector.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/web-connector.ts"],"names":[],"mappings":";;;AACA,6DAAkE;
|
|
1
|
+
{"version":3,"file":"web-connector.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/web/lib/web-connector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { useQuery } from "@tanstack/react-query";
|
|
2
|
+
import { getUrlToken } from "../../../../wallets/in-app/web/lib/get-url-token.js";
|
|
2
3
|
import { getLastConnectedChain, getStoredActiveWalletId, getStoredConnectedWalletIds, } from "../../../../wallets/manager/index.js";
|
|
4
|
+
import { setLastAuthProvider } from "../../utils/storage.js";
|
|
3
5
|
import { timeoutPromise } from "../../utils/timeoutPromise.js";
|
|
4
6
|
import { useConnectCore } from "./useConnect.js";
|
|
5
7
|
import { useSetActiveWalletConnectionStatusCore } from "./useSetActiveWalletConnectionStatus.js";
|
|
@@ -18,11 +20,21 @@ export function useAutoConnectCore(manager, storage, props, getInstalledWallets)
|
|
|
18
20
|
const autoConnect = async () => {
|
|
19
21
|
let autoConnected = false;
|
|
20
22
|
isAutoConnecting.setValue(true);
|
|
21
|
-
|
|
23
|
+
let [lastConnectedWalletIds, lastActiveWalletId] = await Promise.all([
|
|
22
24
|
getStoredConnectedWalletIds(storage),
|
|
23
25
|
getStoredActiveWalletId(storage),
|
|
24
26
|
]);
|
|
25
|
-
|
|
27
|
+
const { authResult, walletId, authProvider } = getUrlToken();
|
|
28
|
+
if (authResult && walletId) {
|
|
29
|
+
lastActiveWalletId = walletId;
|
|
30
|
+
lastConnectedWalletIds = lastConnectedWalletIds?.includes(walletId)
|
|
31
|
+
? lastConnectedWalletIds
|
|
32
|
+
: [walletId, ...(lastConnectedWalletIds || [])];
|
|
33
|
+
}
|
|
34
|
+
if (authProvider) {
|
|
35
|
+
await setLastAuthProvider(authProvider, storage);
|
|
36
|
+
}
|
|
37
|
+
// if no wallets were last connected or we didn't receive an auth token
|
|
26
38
|
if (!lastConnectedWalletIds) {
|
|
27
39
|
return autoConnected;
|
|
28
40
|
}
|
|
@@ -31,6 +43,7 @@ export function useAutoConnectCore(manager, storage, props, getInstalledWallets)
|
|
|
31
43
|
return wallet.autoConnect({
|
|
32
44
|
client: props.client,
|
|
33
45
|
chain: lastConnectedChain ?? undefined,
|
|
46
|
+
authResult,
|
|
34
47
|
});
|
|
35
48
|
}
|
|
36
49
|
const availableWallets = [...wallets, ...(getInstalledWallets?.() ?? [])];
|
|
@@ -41,7 +54,7 @@ export function useAutoConnectCore(manager, storage, props, getInstalledWallets)
|
|
|
41
54
|
setConnectionStatus("connecting"); // only set connecting status if we are connecting the last active EOA
|
|
42
55
|
await timeoutPromise(handleWalletConnection(activeWallet), {
|
|
43
56
|
ms: timeout,
|
|
44
|
-
message: `AutoConnect timeout
|
|
57
|
+
message: `AutoConnect timeout: ${timeout}ms limit exceeded.`,
|
|
45
58
|
});
|
|
46
59
|
// connected wallet could be activeWallet or smart wallet
|
|
47
60
|
const connectedWallet = await connect(activeWallet);
|