@web3auth/no-modal 10.0.0-alpha.1 → 10.0.0-beta.0

package/dist/lib.esm/connectors/auth-connector/authConnector.js

@@ -1,16 +1,20 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { LOGIN_PROVIDER, UX_MODE, WEB3AUTH_NETWORK, Auth, SUPPORTED_KEY_CURVES } from '@web3auth/auth';
+import { cloneDeep, BUTTON_POSITION, CONFIRMATION_STRATEGY, CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import { SecurePubSub } from '@toruslabs/secure-pub-sub';
+import { BUILD_ENV, UX_MODE, Auth, SDK_MODE, SUPPORTED_KEY_CURVES, randomId, createHandler, PopupHandler } from '@web3auth/auth';
 import deepmerge from 'deepmerge';
-import { CONNECTOR_NAMESPACES, CHAIN_NAMESPACES } from '../../base/chain/IChainInterface.js';
 import { WalletInitializationError, WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
+import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
+import { BaseConnector } from '../../base/connector/baseConnector.js';
+import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import 'jwt-decode';
 import { log } from '../../base/loglevel.js';
-import { cloneDeep } from '@toruslabs/base-controllers';
+import '../../base/plugin/errors.js';
+import '../../base/plugin/IPlugin.js';
 import '@toruslabs/constants';
 import '@toruslabs/http-helpers';
 import { WALLET_CONNECTORS } from '../../base/wallet/index.js';
-import { BaseConnector } from '../../base/connector/baseConnector.js';
-import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
 
 class AuthConnector extends BaseConnector {
   constructor(params) {
@@ -23,15 +27,17 @@ class AuthConnector extends BaseConnector {
     _defineProperty(this, "privateKeyProvider", null);
     _defineProperty(this, "authOptions", void 0);
     _defineProperty(this, "loginSettings", {
-      loginProvider: ""
+      authConnection: ""
     });
-    _defineProperty(this, "wsSettings", {});
+    _defineProperty(this, "wsSettings", void 0);
     _defineProperty(this, "wsEmbedInstance", null);
+    _defineProperty(this, "authConnectionConfig", []);
     this.authOptions = params.connectorSettings;
     this.loginSettings = params.loginSettings || {
-      loginProvider: ""
+      authConnection: ""
     };
     this.wsSettings = params.walletServicesSettings || {};
+    this.authConnectionConfig = params.authConnectionConfig || [];
   }
   get provider() {
     if (this.status !== CONNECTOR_STATUS.NOT_READY) {
@@ -49,25 +55,32 @@ class AuthConnector extends BaseConnector {
     throw new Error("Not implemented");
   }
   async init(options) {
-    const chainConfig = this.coreOptions.chains.find(x => x.chainId === options.chainId);
+    const {
+      chains
+    } = this.coreOptions;
+    const {
+      chainId
+    } = options;
+    const chainConfig = chains.find(x => x.chainId === chainId);
     super.checkInitializationRequirements({
       chainConfig
     });
     if (!this.coreOptions.clientId) throw WalletInitializationError.invalidParams("clientId is required before auth's initialization");
     if (!this.authOptions) throw WalletInitializationError.invalidParams("authOptions is required before auth's initialization");
+    if (this.authConnectionConfig.length === 0) throw WalletInitializationError.invalidParams("authConnectionConfig is required before auth's initialization");
     const isRedirectResult = this.authOptions.uxMode === UX_MODE.REDIRECT;
     this.authOptions = _objectSpread(_objectSpread({}, this.authOptions), {}, {
       replaceUrlOnRedirect: isRedirectResult,
       useCoreKitKey: this.coreOptions.useCoreKitKey
     });
-    const web3AuthNetwork = this.coreOptions.web3AuthNetwork || WEB3AUTH_NETWORK.SAPPHIRE_MAINNET;
     this.authInstance = new Auth(_objectSpread(_objectSpread({}, this.authOptions), {}, {
       clientId: this.coreOptions.clientId,
-      network: web3AuthNetwork
+      network: this.coreOptions.web3AuthNetwork,
+      sdkMode: SDK_MODE.IFRAME,
+      authConnectionConfig: this.authConnectionConfig.filter(x => !x.isDefault)
     }));
-    log.debug("initializing auth connector init");
+    log.debug("initializing auth connector init", this.authOptions);
     await this.authInstance.init();
-
     // Use this for xrpl, mpc cases
     if (this.coreOptions.privateKeyProvider) {
       this.privateKeyProvider = this.coreOptions.privateKeyProvider;
@@ -82,13 +95,13 @@ class AuthConnector extends BaseConnector {
             } = await import('@web3auth/ws-embed');
             this.wsEmbedInstance = new WsEmbed({
               web3AuthClientId: this.coreOptions.clientId,
-              web3AuthNetwork,
+              web3AuthNetwork: this.coreOptions.web3AuthNetwork,
               modalZIndex: this.wsSettings.modalZIndex
             });
-            // TODO: once support multiple chains, only pass chains of solana and EVM
+            const wsSupportedChains = chains.filter(x => x.chainNamespace === CHAIN_NAMESPACES.EIP155 || x.chainNamespace === CHAIN_NAMESPACES.SOLANA);
             await this.wsEmbedInstance.init(_objectSpread(_objectSpread({}, this.wsSettings), {}, {
-              chainConfig: chainConfig,
-              // TODO: upgrade ws-embed to support custom chain config
+              chains: wsSupportedChains,
+              chainId,
               whiteLabel: _objectSpread(_objectSpread({}, this.authOptions.whiteLabel), this.wsSettings.whiteLabel)
             }));
             break;
@@ -138,11 +151,12 @@ class AuthConnector extends BaseConnector {
       await this.connectWithProvider(params);
       return this.provider;
     } catch (error) {
+      var _error$message;
       log.error("Failed to connect with auth provider", error);
       // ready again to be connected
       this.status = CONNECTOR_STATUS.READY;
       this.emit(CONNECTOR_EVENTS.ERRORED, error);
-      if (error !== null && error !== void 0 && error.message.includes("user closed popup")) {
+      if (error !== null && error !== void 0 && (_error$message = error.message) !== null && _error$message !== void 0 && _error$message.includes("user closed popup")) {
         throw WalletLoginError.popupClosed();
       } else if (error instanceof Web3AuthError) {
         throw error;
@@ -151,7 +165,7 @@ class AuthConnector extends BaseConnector {
     }
   }
   async enableMFA(params = {
-    loginProvider: ""
+    authConnection: ""
   }) {
     if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
@@ -166,7 +180,7 @@ class AuthConnector extends BaseConnector {
     }
   }
   async manageMFA(params = {
-    loginProvider: ""
+    authConnection: ""
   }) {
     if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
@@ -213,7 +227,6 @@ class AuthConnector extends BaseConnector {
     const userInfo = this.authInstance.getUserInfo();
     return userInfo;
   }
-
   // we don't support switching between different namespaces, except for solana and evm
   async switchChain(params, init = false) {
     super.checkSwitchChainRequirements(params, init);
@@ -230,7 +243,6 @@ class AuthConnector extends BaseConnector {
     const {
       chainNamespace: newNamespace
     } = this.getChain(newChainId);
-
     // skip if chainId is the same
     if (currentChainId === newChainId) return;
     if (currentNamespace === CHAIN_NAMESPACES.SOLANA || currentNamespace === CHAIN_NAMESPACES.EIP155) {
@@ -277,21 +289,19 @@ class AuthConnector extends BaseConnector {
     const {
       chainNamespace
     } = chainConfig;
-
     // if not logged in then login
     const keyAvailable = chainNamespace === CHAIN_NAMESPACES.EIP155 || chainNamespace === CHAIN_NAMESPACES.SOLANA ? (_this$authInstance = this.authInstance) === null || _this$authInstance === void 0 ? void 0 : _this$authInstance.sessionId : this._getFinalPrivKey();
     if (!keyAvailable || (_params$extraLoginOpt = params.extraLoginOptions) !== null && _params$extraLoginOpt !== void 0 && _params$extraLoginOpt.id_token) {
       var _params$extraLoginOpt2;
       // always use "other" curve to return token with all keys encoded so wallet service can switch between evm and solana namespace
       this.loginSettings.curve = SUPPORTED_KEY_CURVES.OTHER;
-      if (!params.loginProvider && !this.loginSettings.loginProvider) throw WalletInitializationError.invalidParams("loginProvider is required for login");
-      await this.authInstance.login(deepmerge.all([this.loginSettings, params, {
-        extraLoginOptions: _objectSpread(_objectSpread({}, params.extraLoginOptions || {}), {}, {
-          login_hint: params.login_hint || ((_params$extraLoginOpt2 = params.extraLoginOptions) === null || _params$extraLoginOpt2 === void 0 ? void 0 : _params$extraLoginOpt2.login_hint)
-        })
-      }]));
+      const loginParams = deepmerge(this.loginSettings, params);
+      if ((_params$extraLoginOpt2 = params.extraLoginOptions) !== null && _params$extraLoginOpt2 !== void 0 && _params$extraLoginOpt2.id_token) {
+        await this.connectWithJwtLogin(loginParams);
+      } else {
+        await this.connectWithSocialLogin(loginParams);
+      }
     }
-
     // setup WS embed if chainNamespace is EIP155 or SOLANA
     if (chainNamespace === CHAIN_NAMESPACES.EIP155 || chainNamespace === CHAIN_NAMESPACES.SOLANA) {
       const {
@@ -333,56 +343,205 @@ class AuthConnector extends BaseConnector {
       }
     }
   }
+  async connectWithSocialLogin(params) {
+    var _params$extraLoginOpt3, _params$extraLoginOpt4;
+    const providerConfig = this.getOAuthProviderConfig({
+      authConnection: params.authConnection,
+      authConnectionId: params.authConnectionId,
+      groupedAuthConnectionId: params.groupedAuthConnectionId
+    });
+    if (!(providerConfig !== null && providerConfig !== void 0 && providerConfig.authConnection)) throw WalletLoginError.connectionError("Invalid auth connection.");
+    const jwtParams = _objectSpread(_objectSpread(_objectSpread({}, providerConfig.jwtParameters || {}), params.extraLoginOptions || {}), {}, {
+      login_hint: params.login_hint || ((_params$extraLoginOpt3 = params.extraLoginOptions) === null || _params$extraLoginOpt3 === void 0 ? void 0 : _params$extraLoginOpt3.login_hint)
+    });
+    const nonce = randomId();
+    // post a message to the auth provider to indicate that login has been initiated.
+    const loginParams = cloneDeep(params);
+    loginParams.extraLoginOptions = _objectSpread(_objectSpread({}, loginParams.extraLoginOptions || {}), {}, {
+      login_hint: params.login_hint || ((_params$extraLoginOpt4 = params.extraLoginOptions) === null || _params$extraLoginOpt4 === void 0 ? void 0 : _params$extraLoginOpt4.login_hint)
+    });
+    delete loginParams.chainId;
+    const popupParams = {
+      authConnection: params.authConnection,
+      authConnectionId: providerConfig.authConnectionId,
+      clientId: providerConfig.clientId,
+      groupedAuthConnectionId: providerConfig.groupedAuthConnectionId,
+      redirect_uri: `${this.authInstance.baseUrl}/auth`,
+      jwtParams,
+      customState: {
+        nonce,
+        appState: params.appState,
+        // use the default settings from the auth instance.
+        dapp_redirect_url: this.authInstance.options.redirectUrl,
+        uxMode: this.authInstance.options.uxMode,
+        whiteLabel: JSON.stringify(this.authInstance.options.whiteLabel),
+        loginParams: JSON.stringify(loginParams)
+      },
+      web3AuthClientId: this.coreOptions.clientId,
+      web3AuthNetwork: this.coreOptions.web3AuthNetwork
+    };
+    const loginHandler = createHandler(popupParams);
+    const verifierWindow = new PopupHandler({
+      url: loginHandler.finalURL,
+      timeout: 0
+    });
+    if (this.authOptions.uxMode === UX_MODE.REDIRECT) return verifierWindow.redirect(this.authOptions.replaceUrlOnRedirect);
+    let isClosedWindow = false;
+    return new Promise((resolve, reject) => {
+      verifierWindow.open().catch(error => {
+        log.error("Error during login with social", error);
+        this.authInstance.postLoginCancelledMessage(nonce);
+        reject(error);
+      });
+      // this is to close the popup when the login is finished.
+      const securePubSub = new SecurePubSub({
+        sameIpCheck: true
+      });
+      securePubSub.subscribe(`web3auth-login-${nonce}`).then(data => {
+        const parsedData = JSON.parse(data || "{}");
+        if ((parsedData === null || parsedData === void 0 ? void 0 : parsedData.message) === "login_finished") {
+          if (parsedData !== null && parsedData !== void 0 && parsedData.error) {
+            this.authInstance.postLoginCancelledMessage(nonce);
+            reject(parsedData.error);
+          }
+          isClosedWindow = true;
+          securePubSub.cleanup();
+          verifierWindow.close();
+        }
+        return true;
+      }).catch(error => {
+        // swallow the error, dont need to throw.
+        log.error("Error during login with social", error);
+      });
+      verifierWindow.once("close", () => {
+        if (!isClosedWindow) {
+          securePubSub.cleanup();
+          this.authInstance.postLoginCancelledMessage(nonce);
+          reject(WalletLoginError.popupClosed());
+        }
+      });
+      this.authInstance.postLoginInitiatedMessage(loginParams, nonce).then(resolve).catch(reject);
+    });
+  }
+  connectWithJwtLogin(params) {
+    var _params$extraLoginOpt5;
+    const loginConfig = this.getOAuthProviderConfig({
+      authConnection: params.authConnection,
+      authConnectionId: params.authConnectionId,
+      groupedAuthConnectionId: params.groupedAuthConnectionId
+    });
+    // throw error only when we cannot find the login config and authConnectionId is not provided in the params.
+    // otherwise, we will use the params to create a new auth connection config in the auth instance.
+    if (!(loginConfig !== null && loginConfig !== void 0 && loginConfig.authConnection) && !params.authConnectionId) throw WalletLoginError.connectionError("Invalid auth connection.");
+    if (!(loginConfig !== null && loginConfig !== void 0 && loginConfig.authConnection)) {
+      this.authInstance.options.authConnectionConfig.push({
+        authConnection: params.authConnection,
+        authConnectionId: params.authConnectionId,
+        groupedAuthConnectionId: params.groupedAuthConnectionId
+      });
+    }
+    const loginParams = cloneDeep(params);
+    loginParams.extraLoginOptions = _objectSpread(_objectSpread({}, loginParams.extraLoginOptions || {}), {}, {
+      login_hint: params.login_hint || ((_params$extraLoginOpt5 = params.extraLoginOptions) === null || _params$extraLoginOpt5 === void 0 ? void 0 : _params$extraLoginOpt5.login_hint)
+    });
+    delete loginParams.chainId;
+    return this.authInstance.postLoginInitiatedMessage(loginParams);
+  }
+  getOAuthProviderConfig(params) {
+    const {
+      authConnection,
+      authConnectionId,
+      groupedAuthConnectionId
+    } = params;
+    const providerConfig = this.authConnectionConfig.find(x => {
+      if (groupedAuthConnectionId) {
+        return x.authConnection === authConnection && x.groupedAuthConnectionId === groupedAuthConnectionId;
+      }
+      if (authConnectionId) {
+        return x.authConnection === authConnection && x.authConnectionId === authConnectionId;
+      }
+      // return the default auth connection, if not found, return undefined
+      return x.authConnection === authConnection && x.isDefault;
+    });
+    return providerConfig;
+  }
 }
 const authConnector = params => {
   return ({
     projectConfig,
     coreOptions
   }) => {
-    var _coreOptions$uiConfig, _coreOptions$walletSe;
+    var _coreOptions$uiConfig, _coreOptions$walletSe, _coreOptions$walletSe2, _coreOptions$walletSe3;
     // Connector settings
     const connectorSettings = {};
     const {
-      sms_otp_enabled: smsOtpEnabled,
-      whitelist
+      whitelist,
+      whitelabel,
+      sessionTime
     } = projectConfig;
-    if (smsOtpEnabled !== undefined) {
-      connectorSettings.loginConfig = {
-        [LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
-          showOnModal: smsOtpEnabled,
-          showOnDesktop: smsOtpEnabled,
-          showOnMobile: smsOtpEnabled,
-          showOnSocialBackupFactor: smsOtpEnabled
-        }
-      };
-    }
     if (whitelist) connectorSettings.originData = whitelist.signed_urls;
+    if (sessionTime) connectorSettings.sessionTime = sessionTime;
     if ((_coreOptions$uiConfig = coreOptions.uiConfig) !== null && _coreOptions$uiConfig !== void 0 && _coreOptions$uiConfig.uxMode) connectorSettings.uxMode = coreOptions.uiConfig.uxMode;
-    const uiConfig = deepmerge(cloneDeep((projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.whitelabel) || {}), coreOptions.uiConfig || {});
+    const uiConfig = deepmerge(cloneDeep(whitelabel || {}), coreOptions.uiConfig || {});
     if (!uiConfig.mode) uiConfig.mode = "light";
     connectorSettings.whiteLabel = uiConfig;
     const finalConnectorSettings = deepmerge.all([{
-      uxMode: UX_MODE.POPUP
+      uxMode: UX_MODE.POPUP,
+      buildEnv: coreOptions.authBuildEnv || BUILD_ENV.PRODUCTION
     },
     // default settings
-    (params === null || params === void 0 ? void 0 : params.connectorSettings) || {}, connectorSettings]);
-
+    connectorSettings, (params === null || params === void 0 ? void 0 : params.connectorSettings) || {}]);
     // WS settings
-    const isKeyExportEnabled = typeof projectConfig.key_export_enabled === "boolean" ? projectConfig.key_export_enabled : true;
+    const {
+      enableKeyExport,
+      walletUi
+    } = projectConfig;
+    const isKeyExportEnabled = typeof enableKeyExport === "boolean" ? enableKeyExport : true;
+    const {
+      enablePortfolioWidget = false,
+      enableTokenDisplay = true,
+      enableNftDisplay = true,
+      enableWalletConnect = true,
+      enableBuyButton = true,
+      enableSendButton = true,
+      enableSwapButton = true,
+      enableReceiveButton = true,
+      enableShowAllTokensButton = true,
+      enableConfirmationModal = false,
+      portfolioWidgetPosition = BUTTON_POSITION.BOTTOM_LEFT,
+      defaultPortfolio = "token"
+    } = walletUi || {};
+    const projectConfigWhiteLabel = {
+      showWidgetButton: enablePortfolioWidget,
+      hideNftDisplay: !enableNftDisplay,
+      hideTokenDisplay: !enableTokenDisplay,
+      hideTransfers: !enableSendButton,
+      hideTopup: !enableBuyButton,
+      hideReceive: !enableReceiveButton,
+      hideSwap: !enableSwapButton,
+      hideShowAllTokens: !enableShowAllTokensButton,
+      hideWalletConnect: !enableWalletConnect,
+      buttonPosition: portfolioWidgetPosition,
+      defaultPortfolio
+    };
+    const whiteLabel = deepmerge.all([projectConfigWhiteLabel, uiConfig, ((_coreOptions$walletSe = coreOptions.walletServicesConfig) === null || _coreOptions$walletSe === void 0 ? void 0 : _coreOptions$walletSe.whiteLabel) || {}]);
+    const confirmationStrategy = (_coreOptions$walletSe2 = (_coreOptions$walletSe3 = coreOptions.walletServicesConfig) === null || _coreOptions$walletSe3 === void 0 ? void 0 : _coreOptions$walletSe3.confirmationStrategy) !== null && _coreOptions$walletSe2 !== void 0 ? _coreOptions$walletSe2 : enableConfirmationModal ? CONFIRMATION_STRATEGY.MODAL : CONFIRMATION_STRATEGY.AUTO_APPROVE;
     const finalWsSettings = _objectSpread(_objectSpread({}, coreOptions.walletServicesConfig), {}, {
-      whiteLabel: _objectSpread(_objectSpread({}, uiConfig), (_coreOptions$walletSe = coreOptions.walletServicesConfig) === null || _coreOptions$walletSe === void 0 ? void 0 : _coreOptions$walletSe.whiteLabel),
+      confirmationStrategy,
+      whiteLabel,
       accountAbstractionConfig: coreOptions.accountAbstractionConfig,
-      enableLogging: coreOptions.enableLogging
-      // enableKeyExport: keyExportEnabled, TODO: add this to ws embed and implement in WS
+      enableLogging: coreOptions.enableLogging,
+      enableKeyExport: enableKeyExport
     });
-
     // Core options
     if (coreOptions.privateKeyProvider) coreOptions.privateKeyProvider.setKeyExportFlag(isKeyExportEnabled);
     return new AuthConnector({
       connectorSettings: finalConnectorSettings,
       walletServicesSettings: finalWsSettings,
       loginSettings: params === null || params === void 0 ? void 0 : params.loginSettings,
-      coreOptions
+      coreOptions,
+      // TODO: check, test this and may need to send modal config here later on.!!
+      authConnectionConfig: projectConfig.embeddedWalletAuth
     });
   };
 };

package/dist/lib.esm/connectors/base-evm-connector/baseEvmConnector.js

@@ -1,12 +1,18 @@
 import { signChallenge, verifySignedChallenge } from '@toruslabs/base-controllers';
 import { EVM_METHOD_TYPES } from '@web3auth/ws-embed';
 import { WalletLoginError, WalletInitializationError } from '../../base/errors/index.js';
-import { getSavedToken, checkIfTokenIsExpired, saveToken, clearToken } from '../../base/connector/utils.js';
 import { BaseConnector } from '../../base/connector/baseConnector.js';
 import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import '@web3auth/auth';
+import { getSavedToken, checkIfTokenIsExpired, saveToken, clearToken } from '../../base/connector/utils.js';
+import '../../base/loglevel.js';
+import '../../base/plugin/errors.js';
+import '../../base/plugin/IPlugin.js';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
+import '../../base/wallet/index.js';
 
 class BaseEvmConnector extends BaseConnector {
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
   async init(_) {}
   async authenticateUser() {
     if (!this.provider || this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError();

package/dist/lib.esm/connectors/base-solana-connector/baseSolanaConnector.js

@@ -3,10 +3,16 @@ import { SOLANA_METHOD_TYPES } from '@web3auth/ws-embed';
 import { WalletLoginError, WalletInitializationError } from '../../base/errors/index.js';
 import { BaseConnector } from '../../base/connector/baseConnector.js';
 import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import '@web3auth/auth';
 import { getSavedToken, checkIfTokenIsExpired, saveToken, clearToken } from '../../base/connector/utils.js';
+import '../../base/loglevel.js';
+import '../../base/plugin/errors.js';
+import '../../base/plugin/IPlugin.js';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
+import '../../base/wallet/index.js';
 
 class BaseSolanaConnector extends BaseConnector {
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
   async init(_) {}
   async authenticateUser() {
     if (!this.provider || this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError();

package/dist/lib.esm/connectors/coinbase-connector/coinbaseConnector.js

@@ -1,11 +1,19 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { createCoinbaseWalletSDK } from '@coinbase/wallet-sdk';
-import { CONNECTOR_NAMESPACES, CHAIN_NAMESPACES } from '../../base/chain/IChainInterface.js';
 import { WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
+import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
+import '@web3auth/auth';
 import { WALLET_CONNECTORS } from '../../base/wallet/index.js';
-import { BaseEvmConnector } from '../base-evm-connector/baseEvmConnector.js';
 import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import 'jwt-decode';
+import '../../base/loglevel.js';
+import '../../base/plugin/errors.js';
+import '../../base/plugin/IPlugin.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
+import { BaseEvmConnector } from '../base-evm-connector/baseEvmConnector.js';
 
 class CoinbaseConnector extends BaseEvmConnector {
   constructor(connectorOptions) {

package/dist/lib.esm/connectors/injected-evm-connector/injectedEvmConnector.js

@@ -1,10 +1,16 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { CONNECTOR_NAMESPACES, CHAIN_NAMESPACES } from '../../base/chain/IChainInterface.js';
 import { WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
+import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
+import '@web3auth/auth';
+import '../../base/wallet/index.js';
+import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import 'jwt-decode';
 import { log } from '../../base/loglevel.js';
+import '../../base/plugin/errors.js';
+import '../../base/plugin/IPlugin.js';
 import { normalizeWalletName } from '../../base/utils.js';
 import { BaseEvmConnector } from '../base-evm-connector/baseEvmConnector.js';
-import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 
 class InjectedEvmConnector extends BaseEvmConnector {
   constructor(options) {
@@ -67,7 +73,7 @@ class InjectedEvmConnector extends BaseEvmConnector {
       if (this.injectedProvider.chainId !== chainConfig.chainId) {
         try {
           await this.switchChain(chainConfig, true);
-        } catch (error) {
+        } catch {
           await this.addChain(chainConfig, true);
           await this.switchChain(chainConfig, true);
         }
@@ -109,7 +115,9 @@ class InjectedEvmConnector extends BaseEvmConnector {
           eth_accounts: {}
         }]
       });
-    } catch (error) {}
+    } catch {
+      // ignore error
+    }
     if (options.cleanup) {
       this.status = CONNECTOR_STATUS.NOT_READY;
       this.injectedProvider = null;

package/dist/lib.esm/connectors/injected-solana-connector/walletStandardConnector.js

@@ -1,13 +1,21 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { StandardConnect, StandardDisconnect } from '@wallet-standard/features';
-import { CONNECTOR_NAMESPACES, CHAIN_NAMESPACES } from '../../base/chain/IChainInterface.js';
 import { WalletLoginError } from '../../base/errors/index.js';
+import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
+import '@web3auth/auth';
+import '../../base/wallet/index.js';
+import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import 'jwt-decode';
 import { log } from '../../base/loglevel.js';
+import '../../base/plugin/errors.js';
+import '../../base/plugin/IPlugin.js';
 import { normalizeWalletName } from '../../base/utils.js';
-import { BaseSolanaConnector } from '../base-solana-connector/baseSolanaConnector.js';
-import { WalletStandardProvider } from '../../providers/solana-provider/providers/injectedProviders/walletStandardProvider.js';
 import { getSolanaChainByChainConfig } from '../../providers/solana-provider/providers/injectedProviders/utils.js';
-import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import { WalletStandardProvider } from '../../providers/solana-provider/providers/injectedProviders/walletStandardProvider.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import '@web3auth/ws-embed';
+import '@solana/web3.js';
+import { BaseSolanaConnector } from '../base-solana-connector/baseSolanaConnector.js';
 
 class WalletStandardConnector extends BaseSolanaConnector {
   constructor(options) {