@web3auth/no-modal 10.0.0-beta.1 → 10.0.0-beta.10

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

@@ -2,19 +2,17 @@ import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 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 { BUILD_ENV, UX_MODE, Auth, SDK_MODE, SUPPORTED_KEY_CURVES, randomId, createHandler, PopupHandler, getUserId } from '@web3auth/auth';
 import deepmerge from 'deepmerge';
-import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
+import { parseToken } from '../utils.js';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
 import { BaseConnector } from '../../base/connector/baseConnector.js';
+import { WALLET_CONNECTORS } from '../../base/wallet/index.js';
+import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
 import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
-import 'jwt-decode';
 import { WalletInitializationError, WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
 import { log } from '../../base/loglevel.js';
-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';
 
 class AuthConnector extends BaseConnector {
   constructor(params) {
@@ -32,6 +30,7 @@ class AuthConnector extends BaseConnector {
     _defineProperty(this, "wsSettings", void 0);
     _defineProperty(this, "wsEmbedInstance", null);
     _defineProperty(this, "authConnectionConfig", []);
+    _defineProperty(this, "wsEmbedInstancePromise", null);
     this.authOptions = params.connectorSettings;
     this.loginSettings = params.loginSettings || {
       authConnection: ""
@@ -71,7 +70,7 @@ class AuthConnector extends BaseConnector {
     const isRedirectResult = this.authOptions.uxMode === UX_MODE.REDIRECT;
     this.authOptions = _objectSpread(_objectSpread({}, this.authOptions), {}, {
       replaceUrlOnRedirect: isRedirectResult,
-      useCoreKitKey: this.coreOptions.useCoreKitKey
+      useCoreKitKey: this.coreOptions.useSFAKey
     });
     this.authInstance = new Auth(_objectSpread(_objectSpread({}, this.authOptions), {}, {
       clientId: this.coreOptions.clientId,
@@ -80,7 +79,10 @@ class AuthConnector extends BaseConnector {
       authConnectionConfig: this.authConnectionConfig.filter(x => !x.isDefault)
     }));
     log.debug("initializing auth connector init", this.authOptions);
-    await this.authInstance.init();
+
+    // making it async here to initialize provider.
+    const authInstancePromise = this.authInstance.init();
+
     // Use this for xrpl, mpc cases
     if (this.coreOptions.privateKeyProvider) {
       this.privateKeyProvider = this.coreOptions.privateKeyProvider;
@@ -99,11 +101,14 @@ class AuthConnector extends BaseConnector {
               modalZIndex: this.wsSettings.modalZIndex
             });
             const wsSupportedChains = chains.filter(x => x.chainNamespace === CHAIN_NAMESPACES.EIP155 || x.chainNamespace === CHAIN_NAMESPACES.SOLANA);
-            await this.wsEmbedInstance.init(_objectSpread(_objectSpread({}, this.wsSettings), {}, {
+            this.wsEmbedInstancePromise = this.wsEmbedInstance.init(_objectSpread(_objectSpread({}, this.wsSettings), {}, {
               chains: wsSupportedChains,
               chainId,
               whiteLabel: _objectSpread(_objectSpread({}, this.authOptions.whiteLabel), this.wsSettings.whiteLabel)
-            }));
+            })).then(() => {
+              this.wsEmbedInstancePromise = null;
+              return;
+            });
             break;
           }
         case CHAIN_NAMESPACES.XRPL:
@@ -122,10 +127,13 @@ class AuthConnector extends BaseConnector {
           }
       }
     }
+
+    // wait for auth instance to be ready.
+    log.debug("initializing auth connector");
+    await authInstancePromise;
     this.status = CONNECTOR_STATUS.READY;
     this.emit(CONNECTOR_EVENTS.READY, WALLET_CONNECTORS.AUTH);
     try {
-      log.debug("initializing auth connector");
       const {
         sessionId
       } = this.authInstance || {};
@@ -135,10 +143,14 @@ class AuthConnector extends BaseConnector {
         await this.connect({
           chainId: options.chainId
         });
+      } else if (!sessionId && options.autoConnect) {
+        // if here, this means that the connector is cached but the sessionId is not available.
+        // this can happen if the sessionId has expired.
+        // we are throwing an error to reset the cached state.
+        throw WalletLoginError.connectionError("Failed to rehydrate");
       }
     } catch (error) {
-      log.error("Failed to connect with cached auth provider", error);
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
+      this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     }
   }
   async connect(params) {
@@ -151,12 +163,12 @@ class AuthConnector extends BaseConnector {
       await this.connectWithProvider(params);
       return this.provider;
     } catch (error) {
-      var _error$message;
+      var _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 = error.message) !== null && _error$message !== void 0 && _error$message.includes("user closed popup")) {
+      if (error !== null && error !== void 0 && (_message = error.message) !== null && _message !== void 0 && _message.includes("user closed popup")) {
         throw WalletLoginError.popupClosed();
       } else if (error instanceof Web3AuthError) {
         throw error;
@@ -170,7 +182,9 @@ class AuthConnector extends BaseConnector {
     if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     try {
-      await this.authInstance.enableMFA(params);
+      const result = await this.authInstance.enableMFA(params);
+      // In redirect mode, the result is not available immediately, so we emit the event when the result is available.
+      if (result) this.emit(CONNECTOR_EVENTS.MFA_ENABLED, result);
     } catch (error) {
       log.error("Failed to enable MFA with auth provider", error);
       if (error instanceof Web3AuthError) {
@@ -227,6 +241,7 @@ 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);
@@ -243,6 +258,7 @@ 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) {
@@ -263,19 +279,26 @@ class AuthConnector extends BaseConnector {
       await ((_this$privateKeyProvi = this.privateKeyProvider) === null || _this$privateKeyProvi === void 0 ? void 0 : _this$privateKeyProvi.switchChain(params));
     }
   }
+  async cleanup() {
+    if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
+    await this.authInstance.cleanup();
+    if (this.wsEmbedInstance) {
+      this.wsEmbedInstance.clearInit();
+    }
+  }
   getChain(chainId) {
     return this.coreOptions.chains.find(x => x.chainId === chainId);
   }
   _getFinalPrivKey() {
     if (!this.authInstance) return "";
     let finalPrivKey = this.authInstance.privKey;
-    // coreKitKey is available only for custom verifiers by default
-    if (this.coreOptions.useCoreKitKey) {
+    // coreKitKey is available only for custom connections by default
+    if (this.coreOptions.useSFAKey) {
       // this is to check if the user has already logged in but coreKitKey is not available.
-      // when useCoreKitKey is set to true.
+      // when useSFAKey is set to true.
       // This is to ensure that when there is no user session active, we don't throw an exception.
       if (this.authInstance.privKey && !this.authInstance.coreKitKey) {
-        throw WalletLoginError.coreKitKeyNotFound();
+        throw WalletLoginError.sfaKeyNotFound();
       }
       finalPrivKey = this.authInstance.coreKitKey;
     }
@@ -289,8 +312,12 @@ 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 (params.idToken) params.extraLoginOptions = _objectSpread(_objectSpread({}, params.extraLoginOptions), {}, {
+      id_token: params.idToken
+    });
     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
@@ -302,8 +329,11 @@ class AuthConnector extends BaseConnector {
         await this.connectWithSocialLogin(loginParams);
       }
     }
+
     // setup WS embed if chainNamespace is EIP155 or SOLANA
     if (chainNamespace === CHAIN_NAMESPACES.EIP155 || chainNamespace === CHAIN_NAMESPACES.SOLANA) {
+      // wait for ws embed instance to be ready.
+      if (this.wsEmbedInstancePromise) await this.wsEmbedInstancePromise;
       const {
         sessionId,
         sessionNamespace
@@ -352,19 +382,20 @@ class AuthConnector extends BaseConnector {
     });
     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)
+      login_hint: params.loginHint || ((_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)
+      login_hint: params.loginHint || ((_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,
+      clientId: providerConfig.clientId || jwtParams.client_id,
       groupedAuthConnectionId: providerConfig.groupedAuthConnectionId,
       redirect_uri: `${this.authInstance.baseUrl}/auth`,
       jwtParams,
@@ -393,6 +424,7 @@ class AuthConnector extends BaseConnector {
         this.authInstance.postLoginCancelledMessage(nonce);
         reject(error);
       });
+
       // this is to close the popup when the login is finished.
       const securePubSub = new SecurePubSub({
         sameIpCheck: true
@@ -424,12 +456,13 @@ class AuthConnector extends BaseConnector {
     });
   }
   connectWithJwtLogin(params) {
-    var _params$extraLoginOpt5;
+    var _params$extraLoginOpt5, _params$extraLoginOpt7;
     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.");
@@ -441,8 +474,26 @@ class AuthConnector extends BaseConnector {
       });
     }
     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)
+    const finalExtraLoginOptions = _objectSpread(_objectSpread({}, (loginConfig === null || loginConfig === void 0 ? void 0 : loginConfig.jwtParameters) || {}), params.extraLoginOptions || {});
+    let finalUserId;
+    if (params.loginHint || (_params$extraLoginOpt5 = params.extraLoginOptions) !== null && _params$extraLoginOpt5 !== void 0 && _params$extraLoginOpt5.login_hint) {
+      var _params$extraLoginOpt6;
+      finalUserId = params.loginHint || ((_params$extraLoginOpt6 = params.extraLoginOptions) === null || _params$extraLoginOpt6 === void 0 ? void 0 : _params$extraLoginOpt6.login_hint);
+    } else if ((_params$extraLoginOpt7 = params.extraLoginOptions) !== null && _params$extraLoginOpt7 !== void 0 && _params$extraLoginOpt7.id_token) {
+      if (typeof finalExtraLoginOptions.isUserIdCaseSensitive === "undefined") {
+        throw WalletInitializationError.invalidParams(`isUserIdCaseSensitive is required for this connection: ${finalExtraLoginOptions.authConnection}`);
+      }
+      const {
+        payload
+      } = parseToken(params.extraLoginOptions.id_token);
+      finalUserId = getUserId(payload, loginParams.authConnection, finalExtraLoginOptions.userIdField, finalExtraLoginOptions.isUserIdCaseSensitive);
+    } else {
+      throw WalletLoginError.connectionError("Invalid login hint or id_token");
+    }
+
+    // Adds the login_hint to the extraLoginOptions.
+    loginParams.extraLoginOptions = _objectSpread(_objectSpread({}, finalExtraLoginOptions), {}, {
+      login_hint: finalUserId
     });
     delete loginParams.chainId;
     return this.authInstance.postLoginInitiatedMessage(loginParams);
@@ -491,6 +542,7 @@ const authConnector = params => {
     },
     // default settings
     connectorSettings, (params === null || params === void 0 ? void 0 : params.connectorSettings) || {}]);
+
     // WS settings
     const {
       enableKeyExport,
@@ -533,6 +585,7 @@ const authConnector = params => {
       enableLogging: coreOptions.enableLogging,
       enableKeyExport: enableKeyExport
     });
+
     // Core options
     if (coreOptions.privateKeyProvider) coreOptions.privateKeyProvider.setKeyExportFlag(isKeyExportEnabled);
     return new AuthConnector({
@@ -540,8 +593,8 @@ const authConnector = params => {
       walletServicesSettings: finalWsSettings,
       loginSettings: params === null || params === void 0 ? void 0 : params.loginSettings,
       coreOptions,
-      // TODO: check, test this and may need to send modal config here later on.!!
-      authConnectionConfig: projectConfig.embeddedWalletAuth
+      authConnectionConfig: projectConfig.embeddedWalletAuth,
+      mfaSettings: coreOptions.mfaSettings
     });
   };
 };

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

@@ -1,16 +1,9 @@
 import { signChallenge, verifySignedChallenge } from '@toruslabs/base-controllers';
 import { EVM_METHOD_TYPES } from '@web3auth/ws-embed';
+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 { WalletLoginError, WalletInitializationError } from '../../base/errors/index.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 {
   async init(_) {}

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

@@ -2,15 +2,8 @@ import { signChallenge, verifySignedChallenge } from '@toruslabs/base-controller
 import { SOLANA_METHOD_TYPES } from '@web3auth/ws-embed';
 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 { WalletLoginError, WalletInitializationError } from '../../base/errors/index.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';
+import { getSavedToken, checkIfTokenIsExpired, saveToken, clearToken } from '../../base/connector/utils.js';
 
 class BaseSolanaConnector extends BaseConnector {
   async init(_) {}

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

@@ -1,19 +1,11 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { createCoinbaseWalletSDK } from '@coinbase/wallet-sdk';
+import { BaseEvmConnector } from '../base-evm-connector/baseEvmConnector.js';
 import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
-import '@web3auth/auth';
-import { WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
-import { WALLET_CONNECTORS } from '../../base/wallet/index.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';
+import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import { WALLET_CONNECTORS } from '../../base/wallet/index.js';
+import { WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
 
 class CoinbaseConnector extends BaseEvmConnector {
   constructor(connectorOptions) {
@@ -44,6 +36,9 @@ class CoinbaseConnector extends BaseEvmConnector {
     super.checkInitializationRequirements({
       chainConfig
     });
+    const {
+      createCoinbaseWalletSDK
+    } = await import('@coinbase/wallet-sdk');
     const coinbaseInstance = createCoinbaseWalletSDK(_objectSpread(_objectSpread({}, this.coinbaseOptions), {}, {
       preference: {
         options: this.coinbaseOptions.options || "smartWalletOnly"
@@ -58,12 +53,17 @@ class CoinbaseConnector extends BaseEvmConnector {
     try {
       if (options.autoConnect) {
         this.rehydrated = true;
-        await this.connect({
+        const provider = await this.connect({
           chainId: options.chainId
         });
+        // the connect function could fail silently as well.
+        if (!provider) {
+          this.rehydrated = false;
+          throw WalletLoginError.connectionError("Failed to rehydrate.");
+        }
       }
     } catch (error) {
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
+      this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     }
   }
   async connect({
@@ -102,8 +102,9 @@ class CoinbaseConnector extends BaseEvmConnector {
     } catch (error) {
       // ready again to be connected
       this.status = CONNECTOR_STATUS.READY;
+      // only throw error if the connector is not rehydrated.
+      if (!this.rehydrated) this.emit(CONNECTOR_EVENTS.ERRORED, error);
       this.rehydrated = false;
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
       if (error instanceof Web3AuthError) throw error;
       throw WalletLoginError.connectionError("Failed to login with coinbase wallet", error);
     }

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

@@ -0,0 +1 @@
+export { coinbaseConnector } from './coinbaseConnector.js';

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

@@ -1,16 +1,11 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
-import '@web3auth/auth';
-import { WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
-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_NAMESPACES } from '../../base/chain/IChainInterface.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import { log } from '../../base/loglevel.js';
+import { WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
 
 class InjectedEvmConnector extends BaseEvmConnector {
   constructor(options) {
@@ -47,12 +42,16 @@ class InjectedEvmConnector extends BaseEvmConnector {
       log.debug(`initializing ${this.name} injected connector`);
       if (options.autoConnect) {
         this.rehydrated = true;
-        await this.connect({
+        const provider = await this.connect({
           chainId: options.chainId
         });
+        if (!provider) {
+          this.rehydrated = false;
+          throw WalletLoginError.connectionError("Failed to rehydrate.");
+        }
       }
     } catch (error) {
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
+      this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     }
   }
   async connect({
@@ -97,8 +96,8 @@ class InjectedEvmConnector extends BaseEvmConnector {
     } catch (error) {
       // ready again to be connected
       this.status = CONNECTOR_STATUS.READY;
+      if (!this.rehydrated) this.emit(CONNECTOR_EVENTS.ERRORED, error);
       this.rehydrated = false;
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
       if (error instanceof Web3AuthError) throw error;
       throw WalletLoginError.connectionError(`Failed to login with ${this.name} injected wallet`);
     }

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

@@ -1,21 +1,14 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { StandardConnect, StandardDisconnect } from '@wallet-standard/features';
+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 { normalizeWalletName } from '../../base/utils.js';
 import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
-import '@web3auth/auth';
-import { WalletLoginError } from '../../base/errors/index.js';
-import '../../base/wallet/index.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 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 { getSolanaChainByChainConfig } from '../../providers/solana-provider/providers/injectedProviders/utils.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';
+import { WalletLoginError } from '../../base/errors/index.js';
 
 class WalletStandardConnector extends BaseSolanaConnector {
   constructor(options) {
@@ -63,13 +56,16 @@ class WalletStandardConnector extends BaseSolanaConnector {
       log.debug("initializing solana injected connector");
       if (options.autoConnect) {
         this.rehydrated = true;
-        await this.connect({
+        const provider = await this.connect({
           chainId: options.chainId
         });
+        if (!provider) {
+          this.rehydrated = false;
+          throw WalletLoginError.connectionError("Failed to rehydrate.");
+        }
       }
     } catch (error) {
-      log.error("Failed to connect with cached solana injected provider", error);
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
+      this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     }
   }
   async connect({
@@ -99,8 +95,8 @@ class WalletStandardConnector extends BaseSolanaConnector {
     } catch (error) {
       // ready again to be connected
       this.status = CONNECTOR_STATUS.READY;
+      if (!this.rehydrated) this.emit(CONNECTOR_EVENTS.ERRORED, error);
       this.rehydrated = false;
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
       throw error;
     }
   }