@web3auth/modal 9.0.0-alpha.0 → 9.0.0-alpha.2
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/lib.cjs/config.js +10 -22
- package/dist/lib.cjs/modalManager.js +28 -28
- package/dist/lib.esm/config.js +10 -22
- package/dist/lib.esm/modalManager.js +25 -25
- package/dist/modal.cjs.js +41 -53
- package/dist/modal.esm.js +35 -47
- package/dist/modal.umd.min.js +1 -1
- package/package.json +9 -9
package/dist/lib.cjs/config.js
CHANGED
|
@@ -11,14 +11,8 @@ const defaultSolanaDappModalConfig = {
|
|
|
11
11
|
showOnMobile: true,
|
|
12
12
|
showOnDesktop: true
|
|
13
13
|
},
|
|
14
|
-
[base.SOLANA_ADAPTERS.
|
|
15
|
-
label: "
|
|
16
|
-
showOnModal: true,
|
|
17
|
-
showOnMobile: true,
|
|
18
|
-
showOnDesktop: true
|
|
19
|
-
},
|
|
20
|
-
[base.SOLANA_ADAPTERS.PHANTOM]: {
|
|
21
|
-
label: "Phantom",
|
|
14
|
+
[base.SOLANA_ADAPTERS.AUTH]: {
|
|
15
|
+
label: "Auth",
|
|
22
16
|
showOnModal: true,
|
|
23
17
|
showOnMobile: true,
|
|
24
18
|
showOnDesktop: true
|
|
@@ -34,14 +28,8 @@ const defaultEvmDappModalConfig = {
|
|
|
34
28
|
showOnMobile: true,
|
|
35
29
|
showOnDesktop: true
|
|
36
30
|
},
|
|
37
|
-
[base.EVM_ADAPTERS.
|
|
38
|
-
label: "
|
|
39
|
-
showOnModal: true,
|
|
40
|
-
showOnMobile: true,
|
|
41
|
-
showOnDesktop: true
|
|
42
|
-
},
|
|
43
|
-
[base.EVM_ADAPTERS.OPENLOGIN]: {
|
|
44
|
-
label: "OpenLogin",
|
|
31
|
+
[base.EVM_ADAPTERS.AUTH]: {
|
|
32
|
+
label: "Auth",
|
|
45
33
|
showOnModal: true,
|
|
46
34
|
showOnMobile: true,
|
|
47
35
|
showOnDesktop: true
|
|
@@ -57,8 +45,8 @@ const defaultEvmDappModalConfig = {
|
|
|
57
45
|
const defaultSolanaWalletModalConfig = {
|
|
58
46
|
chainNamespace: base.CHAIN_NAMESPACES.SOLANA,
|
|
59
47
|
adapters: {
|
|
60
|
-
[base.SOLANA_ADAPTERS.
|
|
61
|
-
label: "
|
|
48
|
+
[base.SOLANA_ADAPTERS.AUTH]: {
|
|
49
|
+
label: "Auth",
|
|
62
50
|
showOnModal: true,
|
|
63
51
|
showOnMobile: true,
|
|
64
52
|
showOnDesktop: true
|
|
@@ -68,8 +56,8 @@ const defaultSolanaWalletModalConfig = {
|
|
|
68
56
|
const defaultEvmWalletModalConfig = {
|
|
69
57
|
chainNamespace: base.CHAIN_NAMESPACES.EIP155,
|
|
70
58
|
adapters: {
|
|
71
|
-
[base.EVM_ADAPTERS.
|
|
72
|
-
label: "
|
|
59
|
+
[base.EVM_ADAPTERS.AUTH]: {
|
|
60
|
+
label: "Auth",
|
|
73
61
|
showOnModal: true,
|
|
74
62
|
showOnMobile: true,
|
|
75
63
|
showOnDesktop: true
|
|
@@ -79,8 +67,8 @@ const defaultEvmWalletModalConfig = {
|
|
|
79
67
|
const defaultOtherModalConfig = {
|
|
80
68
|
chainNamespace: base.CHAIN_NAMESPACES.OTHER,
|
|
81
69
|
adapters: {
|
|
82
|
-
[base.EVM_ADAPTERS.
|
|
83
|
-
label: "
|
|
70
|
+
[base.EVM_ADAPTERS.AUTH]: {
|
|
71
|
+
label: "Auth",
|
|
84
72
|
showOnModal: true,
|
|
85
73
|
showOnMobile: true,
|
|
86
74
|
showOnDesktop: true
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
|
|
4
4
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
5
|
+
var authAdapter = require('@web3auth/auth-adapter');
|
|
5
6
|
var base = require('@web3auth/base');
|
|
6
7
|
var baseProvider = require('@web3auth/base-provider');
|
|
7
8
|
var noModal = require('@web3auth/no-modal');
|
|
8
|
-
var openloginAdapter = require('@web3auth/openlogin-adapter');
|
|
9
9
|
var ui = require('@web3auth/ui');
|
|
10
10
|
var deepmerge = require('deepmerge');
|
|
11
11
|
var config = require('./config.js');
|
|
@@ -59,11 +59,11 @@ class Web3Auth extends noModal.Web3AuthNoModal {
|
|
|
59
59
|
if (smsOtpEnabled !== undefined) {
|
|
60
60
|
var _params;
|
|
61
61
|
const adapterConfig = {
|
|
62
|
-
[base.WALLET_ADAPTERS.
|
|
63
|
-
label: base.WALLET_ADAPTERS.
|
|
62
|
+
[base.WALLET_ADAPTERS.AUTH]: {
|
|
63
|
+
label: base.WALLET_ADAPTERS.AUTH,
|
|
64
64
|
loginMethods: {
|
|
65
|
-
[
|
|
66
|
-
name:
|
|
65
|
+
[authAdapter.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
|
|
66
|
+
name: authAdapter.LOGIN_PROVIDER.SMS_PASSWORDLESS,
|
|
67
67
|
showOnModal: smsOtpEnabled,
|
|
68
68
|
showOnDesktop: smsOtpEnabled,
|
|
69
69
|
showOnMobile: smsOtpEnabled
|
|
@@ -104,9 +104,9 @@ class Web3Auth extends noModal.Web3AuthNoModal {
|
|
|
104
104
|
// and if adapter is not hidden by user
|
|
105
105
|
if (!adapter && (_this$modalConfig$ada3 = this.modalConfig.adapters) !== null && _this$modalConfig$ada3 !== void 0 && _this$modalConfig$ada3[adapterName].showOnModal) {
|
|
106
106
|
// Adapters to be shown on modal should be pre-configured.
|
|
107
|
-
if (adapterName === base.WALLET_ADAPTERS.
|
|
107
|
+
if (adapterName === base.WALLET_ADAPTERS.AUTH) {
|
|
108
108
|
var _this$coreOptions$cha;
|
|
109
|
-
const defaultOptions =
|
|
109
|
+
const defaultOptions = authAdapter.getAuthDefaultOptions();
|
|
110
110
|
const {
|
|
111
111
|
clientId,
|
|
112
112
|
useCoreKitKey,
|
|
@@ -119,14 +119,14 @@ class Web3Auth extends noModal.Web3AuthNoModal {
|
|
|
119
119
|
if (!privateKeyProvider) {
|
|
120
120
|
throw base.WalletInitializationError.invalidParams("privateKeyProvider is required");
|
|
121
121
|
}
|
|
122
|
-
const
|
|
122
|
+
const finalAuthAdapterSettings = _objectSpread(_objectSpread({}, defaultOptions.adapterSettings), {}, {
|
|
123
123
|
clientId,
|
|
124
124
|
network: web3AuthNetwork,
|
|
125
125
|
whiteLabel: this.options.uiConfig
|
|
126
126
|
});
|
|
127
127
|
if (smsOtpEnabled !== undefined) {
|
|
128
|
-
|
|
129
|
-
[
|
|
128
|
+
finalAuthAdapterSettings.loginConfig = {
|
|
129
|
+
[authAdapter.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
|
|
130
130
|
showOnModal: smsOtpEnabled,
|
|
131
131
|
showOnDesktop: smsOtpEnabled,
|
|
132
132
|
showOnMobile: smsOtpEnabled,
|
|
@@ -135,21 +135,21 @@ class Web3Auth extends noModal.Web3AuthNoModal {
|
|
|
135
135
|
};
|
|
136
136
|
}
|
|
137
137
|
if (whitelist) {
|
|
138
|
-
|
|
138
|
+
finalAuthAdapterSettings.originData = whitelist.signed_urls;
|
|
139
139
|
}
|
|
140
140
|
if (this.options.uiConfig.uxMode) {
|
|
141
|
-
|
|
141
|
+
finalAuthAdapterSettings.uxMode = this.options.uiConfig.uxMode;
|
|
142
142
|
}
|
|
143
|
-
const
|
|
143
|
+
const authAdapter$1 = new authAdapter.AuthAdapter(_objectSpread(_objectSpread({}, defaultOptions), {}, {
|
|
144
144
|
clientId,
|
|
145
145
|
useCoreKitKey,
|
|
146
146
|
chainConfig: _objectSpread({}, finalChainConfig),
|
|
147
|
-
adapterSettings:
|
|
147
|
+
adapterSettings: finalAuthAdapterSettings,
|
|
148
148
|
sessionTime,
|
|
149
149
|
web3AuthNetwork,
|
|
150
150
|
privateKeyProvider
|
|
151
151
|
}));
|
|
152
|
-
this.walletAdapters[adapterName] =
|
|
152
|
+
this.walletAdapters[adapterName] = authAdapter$1;
|
|
153
153
|
return adapterName;
|
|
154
154
|
}
|
|
155
155
|
throw base.WalletInitializationError.invalidParams(`Adapter ${adapterName} is not configured`);
|
|
@@ -174,21 +174,21 @@ class Web3Auth extends noModal.Web3AuthNoModal {
|
|
|
174
174
|
chainConfig
|
|
175
175
|
});
|
|
176
176
|
}
|
|
177
|
-
if (adapterName === base.WALLET_ADAPTERS.
|
|
177
|
+
if (adapterName === base.WALLET_ADAPTERS.AUTH) {
|
|
178
178
|
var _this$options$uiConfi;
|
|
179
|
-
const
|
|
179
|
+
const authAdapter$1 = this.walletAdapters[adapterName];
|
|
180
180
|
if (this.coreOptions.privateKeyProvider) {
|
|
181
|
-
if (
|
|
182
|
-
throw base.WalletInitializationError.incompatibleChainNameSpace("private key provider is not compatible with provided chainNamespace for
|
|
181
|
+
if (authAdapter$1.currentChainNamespace !== this.coreOptions.privateKeyProvider.currentChainConfig.chainNamespace) {
|
|
182
|
+
throw base.WalletInitializationError.incompatibleChainNameSpace("private key provider is not compatible with provided chainNamespace for auth adapter");
|
|
183
183
|
}
|
|
184
|
-
|
|
184
|
+
authAdapter$1.setAdapterSettings({
|
|
185
185
|
privateKeyProvider: this.coreOptions.privateKeyProvider
|
|
186
186
|
});
|
|
187
187
|
}
|
|
188
188
|
if (smsOtpEnabled !== undefined) {
|
|
189
|
-
|
|
189
|
+
authAdapter$1.setAdapterSettings({
|
|
190
190
|
loginConfig: {
|
|
191
|
-
[
|
|
191
|
+
[authAdapter.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
|
|
192
192
|
showOnModal: smsOtpEnabled,
|
|
193
193
|
showOnDesktop: smsOtpEnabled,
|
|
194
194
|
showOnMobile: smsOtpEnabled,
|
|
@@ -198,20 +198,20 @@ class Web3Auth extends noModal.Web3AuthNoModal {
|
|
|
198
198
|
});
|
|
199
199
|
}
|
|
200
200
|
if (whitelist) {
|
|
201
|
-
|
|
201
|
+
authAdapter$1.setAdapterSettings({
|
|
202
202
|
originData: whitelist.signed_urls
|
|
203
203
|
});
|
|
204
204
|
}
|
|
205
205
|
if ((_this$options$uiConfi = this.options.uiConfig) !== null && _this$options$uiConfi !== void 0 && _this$options$uiConfi.uxMode) {
|
|
206
|
-
|
|
206
|
+
authAdapter$1.setAdapterSettings({
|
|
207
207
|
uxMode: this.options.uiConfig.uxMode
|
|
208
208
|
});
|
|
209
209
|
}
|
|
210
|
-
|
|
210
|
+
authAdapter$1.setAdapterSettings({
|
|
211
211
|
whiteLabel: this.options.uiConfig
|
|
212
212
|
});
|
|
213
|
-
if (!
|
|
214
|
-
throw base.WalletInitializationError.invalidParams("privateKeyProvider is required for
|
|
213
|
+
if (!authAdapter$1.privateKeyProvider) {
|
|
214
|
+
throw base.WalletInitializationError.invalidParams("privateKeyProvider is required for auth adapter");
|
|
215
215
|
}
|
|
216
216
|
} else if (adapterName === base.WALLET_ADAPTERS.WALLET_CONNECT_V2) {
|
|
217
217
|
const walletConnectAdapter = this.walletAdapters[adapterName];
|
|
@@ -373,7 +373,7 @@ class Web3Auth extends noModal.Web3AuthNoModal {
|
|
|
373
373
|
base.log.info("adapterInitResults", adapterName);
|
|
374
374
|
if (this.walletAdapters[adapterName].type === base.ADAPTER_CATEGORY.IN_APP) {
|
|
375
375
|
var _adapterName, _this$options$uiConfi2, _this$options$uiConfi3, _this$options$uiConfi4;
|
|
376
|
-
this.loginModal.addSocialLogins(adapterName, ui.getAdapterSocialLogins(adapterName, (_adapterName = this.modalConfig.adapters[adapterName]) === null || _adapterName === void 0 ? void 0 : _adapterName.loginMethods), ((_this$options$uiConfi2 = this.options.uiConfig) === null || _this$options$uiConfi2 === void 0 ? void 0 : _this$options$uiConfi2.loginMethodsOrder) || ui.
|
|
376
|
+
this.loginModal.addSocialLogins(adapterName, ui.getAdapterSocialLogins(adapterName, (_adapterName = this.modalConfig.adapters[adapterName]) === null || _adapterName === void 0 ? void 0 : _adapterName.loginMethods), ((_this$options$uiConfi2 = this.options.uiConfig) === null || _this$options$uiConfi2 === void 0 ? void 0 : _this$options$uiConfi2.loginMethodsOrder) || ui.AUTH_PROVIDERS, _objectSpread(_objectSpread({}, this.options.uiConfig), {}, {
|
|
377
377
|
loginGridCol: ((_this$options$uiConfi3 = this.options.uiConfig) === null || _this$options$uiConfi3 === void 0 ? void 0 : _this$options$uiConfi3.loginGridCol) || 3,
|
|
378
378
|
primaryButton: ((_this$options$uiConfi4 = this.options.uiConfig) === null || _this$options$uiConfi4 === void 0 ? void 0 : _this$options$uiConfi4.primaryButton) || "socialLogin"
|
|
379
379
|
}));
|
package/dist/lib.esm/config.js
CHANGED
|
@@ -9,14 +9,8 @@ const defaultSolanaDappModalConfig = {
|
|
|
9
9
|
showOnMobile: true,
|
|
10
10
|
showOnDesktop: true
|
|
11
11
|
},
|
|
12
|
-
[SOLANA_ADAPTERS.
|
|
13
|
-
label: "
|
|
14
|
-
showOnModal: true,
|
|
15
|
-
showOnMobile: true,
|
|
16
|
-
showOnDesktop: true
|
|
17
|
-
},
|
|
18
|
-
[SOLANA_ADAPTERS.PHANTOM]: {
|
|
19
|
-
label: "Phantom",
|
|
12
|
+
[SOLANA_ADAPTERS.AUTH]: {
|
|
13
|
+
label: "Auth",
|
|
20
14
|
showOnModal: true,
|
|
21
15
|
showOnMobile: true,
|
|
22
16
|
showOnDesktop: true
|
|
@@ -32,14 +26,8 @@ const defaultEvmDappModalConfig = {
|
|
|
32
26
|
showOnMobile: true,
|
|
33
27
|
showOnDesktop: true
|
|
34
28
|
},
|
|
35
|
-
[EVM_ADAPTERS.
|
|
36
|
-
label: "
|
|
37
|
-
showOnModal: true,
|
|
38
|
-
showOnMobile: true,
|
|
39
|
-
showOnDesktop: true
|
|
40
|
-
},
|
|
41
|
-
[EVM_ADAPTERS.OPENLOGIN]: {
|
|
42
|
-
label: "OpenLogin",
|
|
29
|
+
[EVM_ADAPTERS.AUTH]: {
|
|
30
|
+
label: "Auth",
|
|
43
31
|
showOnModal: true,
|
|
44
32
|
showOnMobile: true,
|
|
45
33
|
showOnDesktop: true
|
|
@@ -55,8 +43,8 @@ const defaultEvmDappModalConfig = {
|
|
|
55
43
|
const defaultSolanaWalletModalConfig = {
|
|
56
44
|
chainNamespace: CHAIN_NAMESPACES.SOLANA,
|
|
57
45
|
adapters: {
|
|
58
|
-
[SOLANA_ADAPTERS.
|
|
59
|
-
label: "
|
|
46
|
+
[SOLANA_ADAPTERS.AUTH]: {
|
|
47
|
+
label: "Auth",
|
|
60
48
|
showOnModal: true,
|
|
61
49
|
showOnMobile: true,
|
|
62
50
|
showOnDesktop: true
|
|
@@ -66,8 +54,8 @@ const defaultSolanaWalletModalConfig = {
|
|
|
66
54
|
const defaultEvmWalletModalConfig = {
|
|
67
55
|
chainNamespace: CHAIN_NAMESPACES.EIP155,
|
|
68
56
|
adapters: {
|
|
69
|
-
[EVM_ADAPTERS.
|
|
70
|
-
label: "
|
|
57
|
+
[EVM_ADAPTERS.AUTH]: {
|
|
58
|
+
label: "Auth",
|
|
71
59
|
showOnModal: true,
|
|
72
60
|
showOnMobile: true,
|
|
73
61
|
showOnDesktop: true
|
|
@@ -77,8 +65,8 @@ const defaultEvmWalletModalConfig = {
|
|
|
77
65
|
const defaultOtherModalConfig = {
|
|
78
66
|
chainNamespace: CHAIN_NAMESPACES.OTHER,
|
|
79
67
|
adapters: {
|
|
80
|
-
[EVM_ADAPTERS.
|
|
81
|
-
label: "
|
|
68
|
+
[EVM_ADAPTERS.AUTH]: {
|
|
69
|
+
label: "Auth",
|
|
82
70
|
showOnModal: true,
|
|
83
71
|
showOnMobile: true,
|
|
84
72
|
showOnDesktop: true
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import _objectSpread from '@babel/runtime/helpers/objectSpread2';
|
|
2
2
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
3
|
+
import { LOGIN_PROVIDER, getAuthDefaultOptions, AuthAdapter } from '@web3auth/auth-adapter';
|
|
3
4
|
import { cloneDeep, WalletInitializationError, fetchProjectConfig, log, fetchWalletRegistry, WALLET_ADAPTERS, getChainConfig, ADAPTER_CATEGORY, ADAPTER_STATUS, ADAPTER_EVENTS } from '@web3auth/base';
|
|
4
5
|
import { CommonJRPCProvider } from '@web3auth/base-provider';
|
|
5
6
|
import { Web3AuthNoModal } from '@web3auth/no-modal';
|
|
6
|
-
import {
|
|
7
|
-
import { getUserLanguage, LoginModal, capitalizeFirstLetter, getAdapterSocialLogins, LOGIN_MODAL_EVENTS, OPENLOGIN_PROVIDERS } from '@web3auth/ui';
|
|
7
|
+
import { getUserLanguage, LoginModal, capitalizeFirstLetter, getAdapterSocialLogins, LOGIN_MODAL_EVENTS, AUTH_PROVIDERS } from '@web3auth/ui';
|
|
8
8
|
import deepmerge from 'deepmerge';
|
|
9
9
|
import { defaultOtherModalConfig, walletRegistryUrl } from './config.js';
|
|
10
10
|
|
|
@@ -57,8 +57,8 @@ class Web3Auth extends Web3AuthNoModal {
|
|
|
57
57
|
if (smsOtpEnabled !== undefined) {
|
|
58
58
|
var _params;
|
|
59
59
|
const adapterConfig = {
|
|
60
|
-
[WALLET_ADAPTERS.
|
|
61
|
-
label: WALLET_ADAPTERS.
|
|
60
|
+
[WALLET_ADAPTERS.AUTH]: {
|
|
61
|
+
label: WALLET_ADAPTERS.AUTH,
|
|
62
62
|
loginMethods: {
|
|
63
63
|
[LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
|
|
64
64
|
name: LOGIN_PROVIDER.SMS_PASSWORDLESS,
|
|
@@ -102,9 +102,9 @@ class Web3Auth extends Web3AuthNoModal {
|
|
|
102
102
|
// and if adapter is not hidden by user
|
|
103
103
|
if (!adapter && (_this$modalConfig$ada3 = this.modalConfig.adapters) !== null && _this$modalConfig$ada3 !== void 0 && _this$modalConfig$ada3[adapterName].showOnModal) {
|
|
104
104
|
// Adapters to be shown on modal should be pre-configured.
|
|
105
|
-
if (adapterName === WALLET_ADAPTERS.
|
|
105
|
+
if (adapterName === WALLET_ADAPTERS.AUTH) {
|
|
106
106
|
var _this$coreOptions$cha;
|
|
107
|
-
const defaultOptions =
|
|
107
|
+
const defaultOptions = getAuthDefaultOptions();
|
|
108
108
|
const {
|
|
109
109
|
clientId,
|
|
110
110
|
useCoreKitKey,
|
|
@@ -117,13 +117,13 @@ class Web3Auth extends Web3AuthNoModal {
|
|
|
117
117
|
if (!privateKeyProvider) {
|
|
118
118
|
throw WalletInitializationError.invalidParams("privateKeyProvider is required");
|
|
119
119
|
}
|
|
120
|
-
const
|
|
120
|
+
const finalAuthAdapterSettings = _objectSpread(_objectSpread({}, defaultOptions.adapterSettings), {}, {
|
|
121
121
|
clientId,
|
|
122
122
|
network: web3AuthNetwork,
|
|
123
123
|
whiteLabel: this.options.uiConfig
|
|
124
124
|
});
|
|
125
125
|
if (smsOtpEnabled !== undefined) {
|
|
126
|
-
|
|
126
|
+
finalAuthAdapterSettings.loginConfig = {
|
|
127
127
|
[LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
|
|
128
128
|
showOnModal: smsOtpEnabled,
|
|
129
129
|
showOnDesktop: smsOtpEnabled,
|
|
@@ -133,21 +133,21 @@ class Web3Auth extends Web3AuthNoModal {
|
|
|
133
133
|
};
|
|
134
134
|
}
|
|
135
135
|
if (whitelist) {
|
|
136
|
-
|
|
136
|
+
finalAuthAdapterSettings.originData = whitelist.signed_urls;
|
|
137
137
|
}
|
|
138
138
|
if (this.options.uiConfig.uxMode) {
|
|
139
|
-
|
|
139
|
+
finalAuthAdapterSettings.uxMode = this.options.uiConfig.uxMode;
|
|
140
140
|
}
|
|
141
|
-
const
|
|
141
|
+
const authAdapter = new AuthAdapter(_objectSpread(_objectSpread({}, defaultOptions), {}, {
|
|
142
142
|
clientId,
|
|
143
143
|
useCoreKitKey,
|
|
144
144
|
chainConfig: _objectSpread({}, finalChainConfig),
|
|
145
|
-
adapterSettings:
|
|
145
|
+
adapterSettings: finalAuthAdapterSettings,
|
|
146
146
|
sessionTime,
|
|
147
147
|
web3AuthNetwork,
|
|
148
148
|
privateKeyProvider
|
|
149
149
|
}));
|
|
150
|
-
this.walletAdapters[adapterName] =
|
|
150
|
+
this.walletAdapters[adapterName] = authAdapter;
|
|
151
151
|
return adapterName;
|
|
152
152
|
}
|
|
153
153
|
throw WalletInitializationError.invalidParams(`Adapter ${adapterName} is not configured`);
|
|
@@ -172,19 +172,19 @@ class Web3Auth extends Web3AuthNoModal {
|
|
|
172
172
|
chainConfig
|
|
173
173
|
});
|
|
174
174
|
}
|
|
175
|
-
if (adapterName === WALLET_ADAPTERS.
|
|
175
|
+
if (adapterName === WALLET_ADAPTERS.AUTH) {
|
|
176
176
|
var _this$options$uiConfi;
|
|
177
|
-
const
|
|
177
|
+
const authAdapter = this.walletAdapters[adapterName];
|
|
178
178
|
if (this.coreOptions.privateKeyProvider) {
|
|
179
|
-
if (
|
|
180
|
-
throw WalletInitializationError.incompatibleChainNameSpace("private key provider is not compatible with provided chainNamespace for
|
|
179
|
+
if (authAdapter.currentChainNamespace !== this.coreOptions.privateKeyProvider.currentChainConfig.chainNamespace) {
|
|
180
|
+
throw WalletInitializationError.incompatibleChainNameSpace("private key provider is not compatible with provided chainNamespace for auth adapter");
|
|
181
181
|
}
|
|
182
|
-
|
|
182
|
+
authAdapter.setAdapterSettings({
|
|
183
183
|
privateKeyProvider: this.coreOptions.privateKeyProvider
|
|
184
184
|
});
|
|
185
185
|
}
|
|
186
186
|
if (smsOtpEnabled !== undefined) {
|
|
187
|
-
|
|
187
|
+
authAdapter.setAdapterSettings({
|
|
188
188
|
loginConfig: {
|
|
189
189
|
[LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
|
|
190
190
|
showOnModal: smsOtpEnabled,
|
|
@@ -196,20 +196,20 @@ class Web3Auth extends Web3AuthNoModal {
|
|
|
196
196
|
});
|
|
197
197
|
}
|
|
198
198
|
if (whitelist) {
|
|
199
|
-
|
|
199
|
+
authAdapter.setAdapterSettings({
|
|
200
200
|
originData: whitelist.signed_urls
|
|
201
201
|
});
|
|
202
202
|
}
|
|
203
203
|
if ((_this$options$uiConfi = this.options.uiConfig) !== null && _this$options$uiConfi !== void 0 && _this$options$uiConfi.uxMode) {
|
|
204
|
-
|
|
204
|
+
authAdapter.setAdapterSettings({
|
|
205
205
|
uxMode: this.options.uiConfig.uxMode
|
|
206
206
|
});
|
|
207
207
|
}
|
|
208
|
-
|
|
208
|
+
authAdapter.setAdapterSettings({
|
|
209
209
|
whiteLabel: this.options.uiConfig
|
|
210
210
|
});
|
|
211
|
-
if (!
|
|
212
|
-
throw WalletInitializationError.invalidParams("privateKeyProvider is required for
|
|
211
|
+
if (!authAdapter.privateKeyProvider) {
|
|
212
|
+
throw WalletInitializationError.invalidParams("privateKeyProvider is required for auth adapter");
|
|
213
213
|
}
|
|
214
214
|
} else if (adapterName === WALLET_ADAPTERS.WALLET_CONNECT_V2) {
|
|
215
215
|
const walletConnectAdapter = this.walletAdapters[adapterName];
|
|
@@ -371,7 +371,7 @@ class Web3Auth extends Web3AuthNoModal {
|
|
|
371
371
|
log.info("adapterInitResults", adapterName);
|
|
372
372
|
if (this.walletAdapters[adapterName].type === ADAPTER_CATEGORY.IN_APP) {
|
|
373
373
|
var _adapterName, _this$options$uiConfi2, _this$options$uiConfi3, _this$options$uiConfi4;
|
|
374
|
-
this.loginModal.addSocialLogins(adapterName, getAdapterSocialLogins(adapterName, (_adapterName = this.modalConfig.adapters[adapterName]) === null || _adapterName === void 0 ? void 0 : _adapterName.loginMethods), ((_this$options$uiConfi2 = this.options.uiConfig) === null || _this$options$uiConfi2 === void 0 ? void 0 : _this$options$uiConfi2.loginMethodsOrder) ||
|
|
374
|
+
this.loginModal.addSocialLogins(adapterName, getAdapterSocialLogins(adapterName, (_adapterName = this.modalConfig.adapters[adapterName]) === null || _adapterName === void 0 ? void 0 : _adapterName.loginMethods), ((_this$options$uiConfi2 = this.options.uiConfig) === null || _this$options$uiConfi2 === void 0 ? void 0 : _this$options$uiConfi2.loginMethodsOrder) || AUTH_PROVIDERS, _objectSpread(_objectSpread({}, this.options.uiConfig), {}, {
|
|
375
375
|
loginGridCol: ((_this$options$uiConfi3 = this.options.uiConfig) === null || _this$options$uiConfi3 === void 0 ? void 0 : _this$options$uiConfi3.loginGridCol) || 3,
|
|
376
376
|
primaryButton: ((_this$options$uiConfi4 = this.options.uiConfig) === null || _this$options$uiConfi4 === void 0 ? void 0 : _this$options$uiConfi4.primaryButton) || "socialLogin"
|
|
377
377
|
}));
|
package/dist/modal.cjs.js
CHANGED
|
@@ -25,14 +25,8 @@ const defaultSolanaDappModalConfig = {
|
|
|
25
25
|
showOnMobile: true,
|
|
26
26
|
showOnDesktop: true
|
|
27
27
|
},
|
|
28
|
-
[_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.SOLANA_ADAPTERS.
|
|
29
|
-
label: "
|
|
30
|
-
showOnModal: true,
|
|
31
|
-
showOnMobile: true,
|
|
32
|
-
showOnDesktop: true
|
|
33
|
-
},
|
|
34
|
-
[_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.SOLANA_ADAPTERS.PHANTOM]: {
|
|
35
|
-
label: "Phantom",
|
|
28
|
+
[_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.SOLANA_ADAPTERS.AUTH]: {
|
|
29
|
+
label: "Auth",
|
|
36
30
|
showOnModal: true,
|
|
37
31
|
showOnMobile: true,
|
|
38
32
|
showOnDesktop: true
|
|
@@ -48,14 +42,8 @@ const defaultEvmDappModalConfig = {
|
|
|
48
42
|
showOnMobile: true,
|
|
49
43
|
showOnDesktop: true
|
|
50
44
|
},
|
|
51
|
-
[_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.
|
|
52
|
-
label: "
|
|
53
|
-
showOnModal: true,
|
|
54
|
-
showOnMobile: true,
|
|
55
|
-
showOnDesktop: true
|
|
56
|
-
},
|
|
57
|
-
[_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.OPENLOGIN]: {
|
|
58
|
-
label: "OpenLogin",
|
|
45
|
+
[_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.AUTH]: {
|
|
46
|
+
label: "Auth",
|
|
59
47
|
showOnModal: true,
|
|
60
48
|
showOnMobile: true,
|
|
61
49
|
showOnDesktop: true
|
|
@@ -71,8 +59,8 @@ const defaultEvmDappModalConfig = {
|
|
|
71
59
|
const defaultSolanaWalletModalConfig = {
|
|
72
60
|
chainNamespace: _web3auth_base__WEBPACK_IMPORTED_MODULE_0__.CHAIN_NAMESPACES.SOLANA,
|
|
73
61
|
adapters: {
|
|
74
|
-
[_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.SOLANA_ADAPTERS.
|
|
75
|
-
label: "
|
|
62
|
+
[_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.SOLANA_ADAPTERS.AUTH]: {
|
|
63
|
+
label: "Auth",
|
|
76
64
|
showOnModal: true,
|
|
77
65
|
showOnMobile: true,
|
|
78
66
|
showOnDesktop: true
|
|
@@ -82,8 +70,8 @@ const defaultSolanaWalletModalConfig = {
|
|
|
82
70
|
const defaultEvmWalletModalConfig = {
|
|
83
71
|
chainNamespace: _web3auth_base__WEBPACK_IMPORTED_MODULE_0__.CHAIN_NAMESPACES.EIP155,
|
|
84
72
|
adapters: {
|
|
85
|
-
[_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.
|
|
86
|
-
label: "
|
|
73
|
+
[_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.AUTH]: {
|
|
74
|
+
label: "Auth",
|
|
87
75
|
showOnModal: true,
|
|
88
76
|
showOnMobile: true,
|
|
89
77
|
showOnDesktop: true
|
|
@@ -93,8 +81,8 @@ const defaultEvmWalletModalConfig = {
|
|
|
93
81
|
const defaultOtherModalConfig = {
|
|
94
82
|
chainNamespace: _web3auth_base__WEBPACK_IMPORTED_MODULE_0__.CHAIN_NAMESPACES.OTHER,
|
|
95
83
|
adapters: {
|
|
96
|
-
[_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.
|
|
97
|
-
label: "
|
|
84
|
+
[_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.AUTH]: {
|
|
85
|
+
label: "Auth",
|
|
98
86
|
showOnModal: true,
|
|
99
87
|
showOnMobile: true,
|
|
100
88
|
showOnDesktop: true
|
|
@@ -112,7 +100,7 @@ const walletRegistryUrl = "https://assets.web3auth.io/v1/wallet-registry.json";
|
|
|
112
100
|
|
|
113
101
|
/***/ }),
|
|
114
102
|
|
|
115
|
-
/***/
|
|
103
|
+
/***/ 430:
|
|
116
104
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
117
105
|
|
|
118
106
|
"use strict";
|
|
@@ -128,14 +116,14 @@ var objectSpread2_default = /*#__PURE__*/__webpack_require__.n(objectSpread2_nam
|
|
|
128
116
|
;// CONCATENATED MODULE: external "@babel/runtime/helpers/defineProperty"
|
|
129
117
|
const defineProperty_namespaceObject = require("@babel/runtime/helpers/defineProperty");
|
|
130
118
|
var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty_namespaceObject);
|
|
119
|
+
;// CONCATENATED MODULE: external "@web3auth/auth-adapter"
|
|
120
|
+
const auth_adapter_namespaceObject = require("@web3auth/auth-adapter");
|
|
131
121
|
// EXTERNAL MODULE: external "@web3auth/base"
|
|
132
122
|
var base_ = __webpack_require__(377);
|
|
133
123
|
;// CONCATENATED MODULE: external "@web3auth/base-provider"
|
|
134
124
|
const base_provider_namespaceObject = require("@web3auth/base-provider");
|
|
135
125
|
;// CONCATENATED MODULE: external "@web3auth/no-modal"
|
|
136
126
|
const no_modal_namespaceObject = require("@web3auth/no-modal");
|
|
137
|
-
;// CONCATENATED MODULE: external "@web3auth/openlogin-adapter"
|
|
138
|
-
const openlogin_adapter_namespaceObject = require("@web3auth/openlogin-adapter");
|
|
139
127
|
;// CONCATENATED MODULE: external "@web3auth/ui"
|
|
140
128
|
const ui_namespaceObject = require("@web3auth/ui");
|
|
141
129
|
;// CONCATENATED MODULE: external "deepmerge"
|
|
@@ -202,11 +190,11 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
|
|
|
202
190
|
if (smsOtpEnabled !== undefined) {
|
|
203
191
|
var _params;
|
|
204
192
|
const adapterConfig = {
|
|
205
|
-
[base_.WALLET_ADAPTERS.
|
|
206
|
-
label: base_.WALLET_ADAPTERS.
|
|
193
|
+
[base_.WALLET_ADAPTERS.AUTH]: {
|
|
194
|
+
label: base_.WALLET_ADAPTERS.AUTH,
|
|
207
195
|
loginMethods: {
|
|
208
|
-
[
|
|
209
|
-
name:
|
|
196
|
+
[auth_adapter_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
|
|
197
|
+
name: auth_adapter_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS,
|
|
210
198
|
showOnModal: smsOtpEnabled,
|
|
211
199
|
showOnDesktop: smsOtpEnabled,
|
|
212
200
|
showOnMobile: smsOtpEnabled
|
|
@@ -247,9 +235,9 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
|
|
|
247
235
|
// and if adapter is not hidden by user
|
|
248
236
|
if (!adapter && (_this$modalConfig$ada3 = this.modalConfig.adapters) !== null && _this$modalConfig$ada3 !== void 0 && _this$modalConfig$ada3[adapterName].showOnModal) {
|
|
249
237
|
// Adapters to be shown on modal should be pre-configured.
|
|
250
|
-
if (adapterName === base_.WALLET_ADAPTERS.
|
|
238
|
+
if (adapterName === base_.WALLET_ADAPTERS.AUTH) {
|
|
251
239
|
var _this$coreOptions$cha;
|
|
252
|
-
const defaultOptions = (0,
|
|
240
|
+
const defaultOptions = (0,auth_adapter_namespaceObject.getAuthDefaultOptions)();
|
|
253
241
|
const {
|
|
254
242
|
clientId,
|
|
255
243
|
useCoreKitKey,
|
|
@@ -262,14 +250,14 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
|
|
|
262
250
|
if (!privateKeyProvider) {
|
|
263
251
|
throw base_.WalletInitializationError.invalidParams("privateKeyProvider is required");
|
|
264
252
|
}
|
|
265
|
-
const
|
|
253
|
+
const finalAuthAdapterSettings = objectSpread2_default()(objectSpread2_default()({}, defaultOptions.adapterSettings), {}, {
|
|
266
254
|
clientId,
|
|
267
255
|
network: web3AuthNetwork,
|
|
268
256
|
whiteLabel: this.options.uiConfig
|
|
269
257
|
});
|
|
270
258
|
if (smsOtpEnabled !== undefined) {
|
|
271
|
-
|
|
272
|
-
[
|
|
259
|
+
finalAuthAdapterSettings.loginConfig = {
|
|
260
|
+
[auth_adapter_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
|
|
273
261
|
showOnModal: smsOtpEnabled,
|
|
274
262
|
showOnDesktop: smsOtpEnabled,
|
|
275
263
|
showOnMobile: smsOtpEnabled,
|
|
@@ -278,21 +266,21 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
|
|
|
278
266
|
};
|
|
279
267
|
}
|
|
280
268
|
if (whitelist) {
|
|
281
|
-
|
|
269
|
+
finalAuthAdapterSettings.originData = whitelist.signed_urls;
|
|
282
270
|
}
|
|
283
271
|
if (this.options.uiConfig.uxMode) {
|
|
284
|
-
|
|
272
|
+
finalAuthAdapterSettings.uxMode = this.options.uiConfig.uxMode;
|
|
285
273
|
}
|
|
286
|
-
const
|
|
274
|
+
const authAdapter = new auth_adapter_namespaceObject.AuthAdapter(objectSpread2_default()(objectSpread2_default()({}, defaultOptions), {}, {
|
|
287
275
|
clientId,
|
|
288
276
|
useCoreKitKey,
|
|
289
277
|
chainConfig: objectSpread2_default()({}, finalChainConfig),
|
|
290
|
-
adapterSettings:
|
|
278
|
+
adapterSettings: finalAuthAdapterSettings,
|
|
291
279
|
sessionTime,
|
|
292
280
|
web3AuthNetwork,
|
|
293
281
|
privateKeyProvider
|
|
294
282
|
}));
|
|
295
|
-
this.walletAdapters[adapterName] =
|
|
283
|
+
this.walletAdapters[adapterName] = authAdapter;
|
|
296
284
|
return adapterName;
|
|
297
285
|
}
|
|
298
286
|
throw base_.WalletInitializationError.invalidParams(`Adapter ${adapterName} is not configured`);
|
|
@@ -317,21 +305,21 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
|
|
|
317
305
|
chainConfig
|
|
318
306
|
});
|
|
319
307
|
}
|
|
320
|
-
if (adapterName === base_.WALLET_ADAPTERS.
|
|
308
|
+
if (adapterName === base_.WALLET_ADAPTERS.AUTH) {
|
|
321
309
|
var _this$options$uiConfi;
|
|
322
|
-
const
|
|
310
|
+
const authAdapter = this.walletAdapters[adapterName];
|
|
323
311
|
if (this.coreOptions.privateKeyProvider) {
|
|
324
|
-
if (
|
|
325
|
-
throw base_.WalletInitializationError.incompatibleChainNameSpace("private key provider is not compatible with provided chainNamespace for
|
|
312
|
+
if (authAdapter.currentChainNamespace !== this.coreOptions.privateKeyProvider.currentChainConfig.chainNamespace) {
|
|
313
|
+
throw base_.WalletInitializationError.incompatibleChainNameSpace("private key provider is not compatible with provided chainNamespace for auth adapter");
|
|
326
314
|
}
|
|
327
|
-
|
|
315
|
+
authAdapter.setAdapterSettings({
|
|
328
316
|
privateKeyProvider: this.coreOptions.privateKeyProvider
|
|
329
317
|
});
|
|
330
318
|
}
|
|
331
319
|
if (smsOtpEnabled !== undefined) {
|
|
332
|
-
|
|
320
|
+
authAdapter.setAdapterSettings({
|
|
333
321
|
loginConfig: {
|
|
334
|
-
[
|
|
322
|
+
[auth_adapter_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
|
|
335
323
|
showOnModal: smsOtpEnabled,
|
|
336
324
|
showOnDesktop: smsOtpEnabled,
|
|
337
325
|
showOnMobile: smsOtpEnabled,
|
|
@@ -341,20 +329,20 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
|
|
|
341
329
|
});
|
|
342
330
|
}
|
|
343
331
|
if (whitelist) {
|
|
344
|
-
|
|
332
|
+
authAdapter.setAdapterSettings({
|
|
345
333
|
originData: whitelist.signed_urls
|
|
346
334
|
});
|
|
347
335
|
}
|
|
348
336
|
if ((_this$options$uiConfi = this.options.uiConfig) !== null && _this$options$uiConfi !== void 0 && _this$options$uiConfi.uxMode) {
|
|
349
|
-
|
|
337
|
+
authAdapter.setAdapterSettings({
|
|
350
338
|
uxMode: this.options.uiConfig.uxMode
|
|
351
339
|
});
|
|
352
340
|
}
|
|
353
|
-
|
|
341
|
+
authAdapter.setAdapterSettings({
|
|
354
342
|
whiteLabel: this.options.uiConfig
|
|
355
343
|
});
|
|
356
|
-
if (!
|
|
357
|
-
throw base_.WalletInitializationError.invalidParams("privateKeyProvider is required for
|
|
344
|
+
if (!authAdapter.privateKeyProvider) {
|
|
345
|
+
throw base_.WalletInitializationError.invalidParams("privateKeyProvider is required for auth adapter");
|
|
358
346
|
}
|
|
359
347
|
} else if (adapterName === base_.WALLET_ADAPTERS.WALLET_CONNECT_V2) {
|
|
360
348
|
const walletConnectAdapter = this.walletAdapters[adapterName];
|
|
@@ -516,7 +504,7 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
|
|
|
516
504
|
base_.log.info("adapterInitResults", adapterName);
|
|
517
505
|
if (this.walletAdapters[adapterName].type === base_.ADAPTER_CATEGORY.IN_APP) {
|
|
518
506
|
var _adapterName, _this$options$uiConfi2, _this$options$uiConfi3, _this$options$uiConfi4;
|
|
519
|
-
this.loginModal.addSocialLogins(adapterName, (0,ui_namespaceObject.getAdapterSocialLogins)(adapterName, (_adapterName = this.modalConfig.adapters[adapterName]) === null || _adapterName === void 0 ? void 0 : _adapterName.loginMethods), ((_this$options$uiConfi2 = this.options.uiConfig) === null || _this$options$uiConfi2 === void 0 ? void 0 : _this$options$uiConfi2.loginMethodsOrder) || ui_namespaceObject.
|
|
507
|
+
this.loginModal.addSocialLogins(adapterName, (0,ui_namespaceObject.getAdapterSocialLogins)(adapterName, (_adapterName = this.modalConfig.adapters[adapterName]) === null || _adapterName === void 0 ? void 0 : _adapterName.loginMethods), ((_this$options$uiConfi2 = this.options.uiConfig) === null || _this$options$uiConfi2 === void 0 ? void 0 : _this$options$uiConfi2.loginMethodsOrder) || ui_namespaceObject.AUTH_PROVIDERS, objectSpread2_default()(objectSpread2_default()({}, this.options.uiConfig), {}, {
|
|
520
508
|
loginGridCol: ((_this$options$uiConfi3 = this.options.uiConfig) === null || _this$options$uiConfi3 === void 0 ? void 0 : _this$options$uiConfi3.loginGridCol) || 3,
|
|
521
509
|
primaryButton: ((_this$options$uiConfi4 = this.options.uiConfig) === null || _this$options$uiConfi4 === void 0 ? void 0 : _this$options$uiConfi4.primaryButton) || "socialLogin"
|
|
522
510
|
}));
|
|
@@ -664,7 +652,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
664
652
|
/* harmony reexport (unknown) */ var __WEBPACK_REEXPORT_OBJECT__ = {};
|
|
665
653
|
/* harmony reexport (unknown) */ for(const __WEBPACK_IMPORT_KEY__ in _interface__WEBPACK_IMPORTED_MODULE_1__) if(["default","defaultEvmDappModalConfig","defaultEvmWalletModalConfig","defaultOtherModalConfig","defaultSolanaDappModalConfig","defaultSolanaWalletModalConfig","walletRegistryUrl"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = () => _interface__WEBPACK_IMPORTED_MODULE_1__[__WEBPACK_IMPORT_KEY__]
|
|
666
654
|
/* harmony reexport (unknown) */ __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
|
|
667
|
-
/* harmony import */ var _modalManager__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(
|
|
655
|
+
/* harmony import */ var _modalManager__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(430);
|
|
668
656
|
|
|
669
657
|
|
|
670
658
|
|