@web3auth/no-modal 11.0.0-beta.1 → 11.0.0

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

@@ -2,13 +2,13 @@
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var baseControllers = require('@toruslabs/base-controllers');
 var constants$1 = require('@toruslabs/constants');
 var httpHelpers = require('@toruslabs/http-helpers');
 var securePubSub = require('@toruslabs/secure-pub-sub');
 var auth = require('@web3auth/auth');
 var wsEmbed = require('@web3auth/ws-embed');
 var deepmerge = require('deepmerge');
-var rest = require('../../account-linking/rest.js');
 var analytics = require('../../base/analytics.js');
 var IChainInterface = require('../../base/chain/IChainInterface.js');
 var baseConnector = require('../../base/connector/baseConnector.js');
@@ -24,8 +24,18 @@ var utils = require('../../base/utils.js');
 var index$1 = require('../../base/wallet/index.js');
 var utils$1 = require('../utils.js');
 var authSolanaWallet = require('./authSolanaWallet.js');
-var baseControllers = require('@toruslabs/base-controllers');
+var errors = require('../../account-linking/errors.js');
+var rest = require('../../account-linking/rest.js');
 
+// Auth connections that have been deprecated and are no longer supported by the SDK.
+// Passing any of these as `authConnection` results in a hard error so consumers
+// migrate off the removed providers instead of silently continuing.
+const DEPRECATED_AUTH_CONNECTIONS = new Set(["farcaster"]);
+function assertAuthConnectionSupported(authConnection) {
+  if (DEPRECATED_AUTH_CONNECTIONS.has(authConnection)) {
+    throw index.WalletInitializationError.invalidParams(`Auth connection "${authConnection}" has been deprecated and is no longer supported by the Web3Auth SDKs. ` + `Please use a different authConnection value.`);
+  }
+}
 class AuthConnector extends baseConnector.BaseConnector {
   constructor(params) {
     super(params);
@@ -43,8 +53,22 @@ class AuthConnector extends baseConnector.BaseConnector {
     _defineProperty(this, "wsEmbedInstance", null);
     _defineProperty(this, "authConnectionConfig", []);
     _defineProperty(this, "wsEmbedInstancePromise", null);
+    _defineProperty(this, "wsEmbedProviderListenerTarget", null);
     _defineProperty(this, "_solanaWallet", null);
     _defineProperty(this, "analytics", void 0);
+    _defineProperty(this, "handleWsEmbedAccountsChanged", accounts => {
+      if (accounts.length === 0) {
+        if (!connectorStatus.CONNECTED_STATUSES.includes(this.status)) {
+          return;
+        }
+        loglevel.log.info("No accounts found in the wallet, disconnecting");
+        void this.disconnect({
+          cleanup: true
+        }).catch(error => {
+          loglevel.log.error("Failed to disconnect auth connector after wallet accounts changed", error);
+        });
+      }
+    });
     this.authOptions = params.connectorSettings;
     this.loginSettings = params.loginSettings || {
       authConnection: ""
@@ -57,10 +81,8 @@ class AuthConnector extends baseConnector.BaseConnector {
   }
   get provider() {
     if (this.status !== constants.CONNECTOR_STATUS.NOT_READY) {
-      var _this$wsEmbedInstance;
-      if ((_this$wsEmbedInstance = this.wsEmbedInstance) !== null && _this$wsEmbedInstance !== void 0 && _this$wsEmbedInstance.provider) {
-        return this.wsEmbedInstance.provider;
-      } else if (this.privateKeyProvider) return this.privateKeyProvider;
+      const wsEmbedProvider = this.getWsEmbedProvider();
+      return wsEmbedProvider || this.privateKeyProvider;
     }
     return null;
   }
@@ -127,6 +149,7 @@ class AuthConnector extends baseConnector.BaseConnector {
               buildEnv: this.authOptions.buildEnv,
               whiteLabel: _objectSpread(_objectSpread({}, this.authOptions.whiteLabel), this.wsSettings.whiteLabel)
             })).then(() => {
+              this.bindWsEmbedProviderEvents();
               this.wsEmbedInstancePromise = null;
               return;
             });
@@ -175,6 +198,7 @@ class AuthConnector extends baseConnector.BaseConnector {
     }
   }
   async connect(params) {
+    assertAuthConnectionSupported(params === null || params === void 0 ? void 0 : params.authConnection);
     super.checkConnectionRequirements();
     this.status = constants.CONNECTOR_STATUS.CONNECTING;
     this.emit(constants.CONNECTOR_EVENTS.CONNECTING, _objectSpread(_objectSpread({}, params), {}, {
@@ -204,6 +228,7 @@ class AuthConnector extends baseConnector.BaseConnector {
   async enableMFA(params = {
     authConnection: ""
   }) {
+    assertAuthConnectionSupported(params === null || params === void 0 ? void 0 : params.authConnection);
     if (!this.connected) throw index.WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw index.WalletInitializationError.notReady("authInstance is not ready");
     try {
@@ -221,6 +246,7 @@ class AuthConnector extends baseConnector.BaseConnector {
   async manageMFA(params = {
     authConnection: ""
   }) {
+    assertAuthConnectionSupported(params === null || params === void 0 ? void 0 : params.authConnection);
     if (!this.connected) throw index.WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw index.WalletInitializationError.notReady("authInstance is not ready");
     try {
@@ -252,6 +278,7 @@ class AuthConnector extends baseConnector.BaseConnector {
     }
     this.rehydrated = false;
     this._solanaWallet = null;
+    this.unbindWsEmbedProviderEvents();
     this.emit(constants.CONNECTOR_EVENTS.DISCONNECTED, {
       connector: index$1.WALLET_CONNECTORS.AUTH
     });
@@ -288,6 +315,7 @@ class AuthConnector extends baseConnector.BaseConnector {
     });
   }
   async getLinkedAccounts() {
+    var _citadelUserInfo$acco, _this$solanaWallet;
     const accessToken = await this.authInstance.authSessionManager.getAccessToken();
     if (!accessToken) throw index.WalletLoginError.connectionError("Could not obtain an access token from the current AUTH session.");
     const citadelUserInfo = await httpHelpers.get(`${utils.citadelServerUrl(this.coreOptions.authBuildEnv)}/v1/user`, {
@@ -295,11 +323,27 @@ class AuthConnector extends baseConnector.BaseConnector {
         Authorization: `Bearer ${accessToken}`
       }
     });
-    const linkedAccounts = (citadelUserInfo === null || citadelUserInfo === void 0 ? void 0 : citadelUserInfo.accounts) || [];
-    return linkedAccounts.map(account => _objectSpread(_objectSpread({}, account), {}, {
-      // by default, the primary account is the active account
-      active: account.isPrimary
-    }));
+    if (!(citadelUserInfo !== null && citadelUserInfo !== void 0 && (_citadelUserInfo$acco = citadelUserInfo.accounts) !== null && _citadelUserInfo$acco !== void 0 && _citadelUserInfo$acco.length)) return [];
+    const currentChainNamespace = ((_this$solanaWallet = this.solanaWallet) === null || _this$solanaWallet === void 0 ? void 0 : _this$solanaWallet.accounts.length) > 0 ? baseControllers.CHAIN_NAMESPACES.SOLANA : "evm"; // Note: citadel chain namespace is "evm" for EVM chains
+    const filteredLinkedAccounts = [];
+    for (const account of citadelUserInfo.accounts) {
+      const {
+        chainNamespace,
+        isPrimary,
+        accountType
+      } = account;
+      // for now, we will take all primary accounts as a **SINGLE** linked account
+      // we don't wanna populate the multiple primary accounts as different linked accounts
+      // so, we hide the primary accounts for other chain namespaces
+      // also, linked `account_abstraction` accounts are derived from the primary account, so we don't need to show them separately
+      // TODO: revisit this logic once we have a concrete plan for handling multiple primary accounts
+      if (isPrimary && chainNamespace && chainNamespace !== currentChainNamespace || accountType === "account_abstraction") continue;
+      filteredLinkedAccounts.push(_objectSpread(_objectSpread({}, account), {}, {
+        // by default, the primary account is the active account
+        active: isPrimary
+      }));
+    }
+    return filteredLinkedAccounts;
   }
   async switchChain(params, init = false) {
     super.checkSwitchChainRequirements(params, init);
@@ -313,13 +357,13 @@ class AuthConnector extends baseConnector.BaseConnector {
     const newChainConfig = this.coreOptions.chains.find(c => c.chainId === newChainId);
     if (!newChainConfig) throw index.WalletInitializationError.invalidParams("Chain config is not available");
     if (newChainConfig.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA || newChainConfig.chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155) {
-      var _this$wsEmbedInstance2;
-      if (!((_this$wsEmbedInstance2 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance2 !== void 0 && _this$wsEmbedInstance2.provider)) throw index.WalletInitializationError.notReady("Wallet embed is not ready");
-      const fullChainId = utils.getCaipChainId(newChainConfig);
+      var _this$wsEmbedInstance;
+      if (!((_this$wsEmbedInstance = this.wsEmbedInstance) !== null && _this$wsEmbedInstance !== void 0 && _this$wsEmbedInstance.provider)) throw index.WalletInitializationError.notReady("Wallet embed is not ready");
+      const caipChainId = baseControllers.getCaipChainId(newChainConfig);
       await this.wsEmbedInstance.provider.request({
         method: "wallet_switchChain",
         params: {
-          chainId: fullChainId
+          chainId: caipChainId
         }
       });
     } else {
@@ -333,6 +377,8 @@ class AuthConnector extends baseConnector.BaseConnector {
     if (this.wsEmbedInstance) {
       this.wsEmbedInstance.clearInit();
     }
+    this._solanaWallet = null;
+    this.unbindWsEmbedProviderEvents();
   }
   getOAuthProviderConfig(params) {
     const {
@@ -366,7 +412,7 @@ class AuthConnector extends baseConnector.BaseConnector {
       const linkedAccounts = (_userInfo$linkedAccou = userInfo.linkedAccounts) !== null && _userInfo$linkedAccou !== void 0 ? _userInfo$linkedAccou : [];
       const targetAccount = linkedAccounts.find(candidate => candidate.id === account.id);
       if (!targetAccount) {
-        throw index.AccountLinkingError.requestFailed(`No connected wallet matches account id "${account.id}". Refresh user info and try again.`);
+        throw errors.AccountLinkingError.requestFailed(`No connected wallet matches account id "${account.id}". Refresh user info and try again.`);
       }
       const currentActiveAccount = context.activeAccount;
       const isTargetAlreadyActive = currentActiveAccount ? currentActiveAccount.id === targetAccount.id : targetAccount.isPrimary;
@@ -380,7 +426,7 @@ class AuthConnector extends baseConnector.BaseConnector {
         const ethereumProvider = this.provider;
         const solanaWallet = this.solanaWallet;
         if (!ethereumProvider && !solanaWallet) {
-          throw index.AccountLinkingError.requestFailed("Failed to restore the primary AUTH session for account switch.");
+          throw errors.AccountLinkingError.requestFailed("Failed to restore the primary AUTH session for account switch.");
         }
         return {
           kind: "primary",
@@ -419,23 +465,21 @@ class AuthConnector extends baseConnector.BaseConnector {
     const {
       connectorName,
       chainId,
-      walletConnector
+      connectorToLink
     } = params;
     try {
-      if (!walletConnector.connected) {
-        const connection = await walletConnector.connect({
+      if (!connectorToLink.connected) {
+        const connection = await connectorToLink.connect({
           chainId,
           isAccountLinking: true
         });
         if (!connection) {
-          throw index.AccountLinkingError.walletProofFailed(`Failed to connect to "${params.connectorName}" for account linking.`);
+          throw errors.AccountLinkingError.walletProofFailed(`Failed to connect to "${params.connectorName}" for account linking.`);
         }
       }
     } catch (error) {
-      if (error instanceof index.AccountLinkingError) {
-        throw error;
-      }
-      throw index.AccountLinkingError.walletProofFailed(error instanceof Error ? error.message : String(error), error);
+      if (error instanceof index.Web3AuthError) throw error;
+      throw errors.AccountLinkingError.walletProofFailed(error instanceof Error ? error.message : String(error), error);
     }
     const trackData = {
       connector: this.name,
@@ -448,7 +492,7 @@ class AuthConnector extends baseConnector.BaseConnector {
         accessToken,
         idToken
       } = await this.getPrimaryAuthSession(params.authSessionTokens);
-      const walletProof = await this.createWalletLinkingProof(params.walletConnector);
+      const walletProof = await this.createWalletLinkingProof(params.connectorToLink);
       const authServerUrl = utils.citadelServerUrl(this.coreOptions.authBuildEnv);
       const result = await rest.makeAccountLinkingRequest(authServerUrl, accessToken, {
         idToken,
@@ -468,9 +512,11 @@ class AuthConnector extends baseConnector.BaseConnector {
       this.analytics.track(analytics.ANALYTICS_EVENTS.ACCOUNT_LINKING_FAILED, _objectSpread(_objectSpread({}, trackData), utils.getErrorAnalyticsProperties(error)));
       // disconnect the wallet connector to avoid any leftover state
       try {
-        await walletConnector.disconnect({
-          cleanup: true
-        });
+        if (connectorToLink.connected) {
+          await connectorToLink.disconnect({
+            cleanup: true
+          });
+        }
       } catch (disconnectError) {
         loglevel.log.debug("Failed to disconnect wallet connector after linking failure", disconnectError);
       }
@@ -532,7 +578,7 @@ class AuthConnector extends baseConnector.BaseConnector {
   }
   async assertSwitchAccountConnectorMatchesTarget(connector, account) {
     if (!account.chainNamespace) {
-      throw index.AccountLinkingError.requestFailed(`Could not determine the chain namespace for linked account "${account.eoaAddress}".`);
+      throw errors.AccountLinkingError.requestFailed(`Could not determine the chain namespace for linked account "${account.eoaAddress}".`);
     }
     const chainNamespace = utils.parseChainNamespaceFromCitadelResponse(account.chainNamespace);
     let connectedAddress = null;
@@ -546,26 +592,26 @@ class AuthConnector extends baseConnector.BaseConnector {
       var _connector$solanaWall, _connector$solanaWall2;
       connectedAddress = (_connector$solanaWall = (_connector$solanaWall2 = connector.solanaWallet) === null || _connector$solanaWall2 === void 0 || (_connector$solanaWall2 = _connector$solanaWall2.accounts) === null || _connector$solanaWall2 === void 0 || (_connector$solanaWall2 = _connector$solanaWall2[0]) === null || _connector$solanaWall2 === void 0 ? void 0 : _connector$solanaWall2.address) !== null && _connector$solanaWall !== void 0 ? _connector$solanaWall : null;
     } else {
-      throw index.AccountLinkingError.requestFailed(`Unsupported chain namespace "${account.chainNamespace}" for linked account "${account.eoaAddress}".`);
+      throw errors.AccountLinkingError.requestFailed(`Unsupported chain namespace "${account.chainNamespace}" for linked account "${account.eoaAddress}".`);
     }
     if (!connectedAddress) {
-      throw index.AccountLinkingError.requestFailed(`Connector "${account.connector}" is not connected to linked account "${account.eoaAddress}". Connect the intended wallet account and try again.`);
+      throw errors.AccountLinkingError.requestFailed(`Connector "${account.connector}" is not connected to linked account "${account.eoaAddress}". Connect the intended wallet account and try again.`);
     }
     const isExpectedAddress = chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 ? connectedAddress.toLowerCase() === account.eoaAddress.toLowerCase() : connectedAddress === account.eoaAddress;
     if (!isExpectedAddress) {
-      throw index.AccountLinkingError.requestFailed(`Connector "${account.connector}" is connected to "${connectedAddress}" instead of linked account "${account.eoaAddress}". Connect the intended wallet account and try again.`);
+      throw errors.AccountLinkingError.requestFailed(`Connector "${account.connector}" is connected to "${connectedAddress}" instead of linked account "${account.eoaAddress}". Connect the intended wallet account and try again.`);
     }
   }
   toSwitchAccountConnectorError(account, error) {
-    if (error instanceof index.AccountLinkingError && error.code === 5401) {
+    if (error instanceof errors.AccountLinkingError && error.code === 5401) {
       return error;
     }
     const message = error instanceof Error ? error.message : String(error);
-    const isUnavailableConnectorError = error instanceof index.AccountLinkingError && error.code === 5405 || /not available|not initialized|not ready/i.test(message);
+    const isUnavailableConnectorError = error instanceof errors.AccountLinkingError && error.code === 5405 || /not available|not initialized|not ready/i.test(message);
     if (isUnavailableConnectorError) {
-      return index.AccountLinkingError.requestFailed(`Connector "${account.connector}" is not available for linked account "${account.eoaAddress}". Make sure the wallet is installed, unlocked, and accessible, then try again.`, error);
+      return errors.AccountLinkingError.requestFailed(`Connector "${account.connector}" is not available for linked account "${account.eoaAddress}". Make sure the wallet is installed, unlocked, and accessible, then try again.`, error);
     }
-    return index.AccountLinkingError.requestFailed(`Failed to connect connector "${account.connector}" for linked account "${account.eoaAddress}". ${message}`, error);
+    return errors.AccountLinkingError.requestFailed(`Failed to connect connector "${account.connector}" for linked account "${account.eoaAddress}". ${message}`, error);
   }
   getSwitchAccountTrackData(account) {
     var _account$eoaAddress;
@@ -606,7 +652,7 @@ class AuthConnector extends baseConnector.BaseConnector {
       idToken = tokenInfo.idToken;
     }
     if (!accessToken || !idToken) {
-      throw index.AccountLinkingError.primaryTokenNotAvailable("Could not obtain an identity token from the current AUTH session.");
+      throw errors.AccountLinkingError.primaryTokenNotAvailable("Could not obtain an identity token from the current AUTH session.");
     }
     return {
       accessToken,
@@ -624,10 +670,10 @@ class AuthConnector extends baseConnector.BaseConnector {
       return ((_account$address = account.address) === null || _account$address === void 0 ? void 0 : _account$address.toLowerCase()) === normalizedAddress || ((_account$eoaAddress2 = account.eoaAddress) === null || _account$eoaAddress2 === void 0 ? void 0 : _account$eoaAddress2.toLowerCase()) === normalizedAddress;
     });
     if (!matchedAccount) {
-      throw index.AccountLinkingError.requestFailed(`No connected wallet matches address "${address}".`);
+      throw errors.AccountLinkingError.requestFailed(`No connected wallet matches address "${address}".`);
     }
     if (!matchedAccount.chainNamespace) {
-      throw index.AccountLinkingError.requestFailed(`Could not determine the chain namespace for address "${address}".`);
+      throw errors.AccountLinkingError.requestFailed(`Could not determine the chain namespace for address "${address}".`);
     }
     const chainNamespace = utils.parseChainNamespaceFromCitadelResponse(matchedAccount.chainNamespace);
     if (chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155) {
@@ -636,7 +682,7 @@ class AuthConnector extends baseConnector.BaseConnector {
     if (chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) {
       return "solana";
     }
-    throw index.AccountLinkingError.requestFailed(`Unsupported chain namespace "${matchedAccount.chainNamespace}" for address "${address}".`);
+    throw errors.AccountLinkingError.requestFailed(`Unsupported chain namespace "${matchedAccount.chainNamespace}" for address "${address}".`);
   }
   async createWalletLinkingProof(connector) {
     // Notify listeners that the linking wallet is about to be asked for a signature so the UI
@@ -670,31 +716,57 @@ class AuthConnector extends baseConnector.BaseConnector {
         network: "solana"
       };
     }
-    throw index.AccountLinkingError.unsupportedConnector(`Connector "${connector.name}" returned unsupported chain namespace "${chainNamespace}".`);
+    throw errors.AccountLinkingError.unsupportedConnector(`Connector "${connector.name}" returned unsupported chain namespace "${chainNamespace}".`);
   }
   async getLinkingWalletAddress(connector, chainNamespace) {
     if (chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) {
       var _connector$solanaWall3;
       const address = (_connector$solanaWall3 = connector.solanaWallet) === null || _connector$solanaWall3 === void 0 || (_connector$solanaWall3 = _connector$solanaWall3.accounts) === null || _connector$solanaWall3 === void 0 || (_connector$solanaWall3 = _connector$solanaWall3[0]) === null || _connector$solanaWall3 === void 0 ? void 0 : _connector$solanaWall3.address;
       if (!address) {
-        throw index.AccountLinkingError.walletProofFailed("No connected Solana account found for account linking.");
+        throw errors.AccountLinkingError.walletProofFailed("No connected Solana account found for account linking.");
       }
       return address;
     }
     if (!connector.provider) {
-      throw index.AccountLinkingError.walletProofFailed("No connected EVM account found for account linking.");
+      throw errors.AccountLinkingError.walletProofFailed("No connected EVM account found for account linking.");
     }
     const accounts = await connector.provider.request({
       method: "eth_accounts"
     });
     if (!(accounts !== null && accounts !== void 0 && accounts.length)) {
-      throw index.AccountLinkingError.walletProofFailed("No connected EVM account found for account linking.");
+      throw errors.AccountLinkingError.walletProofFailed("No connected EVM account found for account linking.");
     }
     return accounts[0];
   }
+  getWsEmbedProvider() {
+    var _this$wsEmbedInstance2, _this$wsEmbedInstance3;
+    return (_this$wsEmbedInstance2 = (_this$wsEmbedInstance3 = this.wsEmbedInstance) === null || _this$wsEmbedInstance3 === void 0 ? void 0 : _this$wsEmbedInstance3.provider) !== null && _this$wsEmbedInstance2 !== void 0 ? _this$wsEmbedInstance2 : null;
+  }
+  bindWsEmbedProviderEvents() {
+    const rawProvider = this.getWsEmbedProvider();
+    if (this.wsEmbedProviderListenerTarget === rawProvider) {
+      return;
+    }
+    this.unbindWsEmbedProviderEvents();
+    if (!rawProvider) {
+      return;
+    }
+    rawProvider.on("accountsChanged", this.handleWsEmbedAccountsChanged);
+    this.wsEmbedProviderListenerTarget = rawProvider;
+  }
+  unbindWsEmbedProviderEvents() {
+    if (!this.wsEmbedProviderListenerTarget) {
+      return;
+    }
+    this.wsEmbedProviderListenerTarget.removeListener("accountsChanged", this.handleWsEmbedAccountsChanged);
+    this.wsEmbedProviderListenerTarget = null;
+  }
   setupSolanaWallet() {
     const solanaChains = this.coreOptions.chains.filter(c => c.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA);
     if (solanaChains.length === 0 || !this.provider) return;
+    if (this._solanaWallet instanceof authSolanaWallet.AuthSolanaWallet) {
+      return;
+    }
     this._solanaWallet = new authSolanaWallet.AuthSolanaWallet(this.provider, solanaChains);
   }
   _getFinalPrivKey() {
@@ -754,13 +826,13 @@ class AuthConnector extends baseConnector.BaseConnector {
       } = this.authInstance || {};
       if (sessionId) {
         this.wsEmbedInstance.setAccessTokenProvider(this.accessTokenProvider.bind(this));
+        this.bindWsEmbedProviderEvents();
         const isLoggedIn = await this.wsEmbedInstance.connectWithSession({
           sessionId,
           sessionNamespace,
           idToken: await this.getIdToken()
         });
         if (isLoggedIn) {
-          var _this$wsEmbedInstance3;
           this.setupSolanaWallet();
           // if getAuthTokenInfo is true, then get auth token info
           // No need to get auth token info for auth connector as it is already handled
@@ -774,12 +846,6 @@ class AuthConnector extends baseConnector.BaseConnector {
           if (params.getAuthTokenInfo) {
             await this.getAuthTokenInfo();
           }
-          // handle disconnect from ws embed
-          (_this$wsEmbedInstance3 = this.wsEmbedInstance) === null || _this$wsEmbedInstance3 === void 0 || _this$wsEmbedInstance3.provider.on("accountsChanged", (accounts = []) => {
-            if (accounts.length === 0 && connectorStatus.CONNECTED_STATUSES.includes(this.status)) this.disconnect({
-              cleanup: false
-            });
-          });
         }
       }
     } else {
@@ -879,9 +945,7 @@ class AuthConnector extends baseConnector.BaseConnector {
       }).catch(error => {
         // swallow the error, dont need to throw.
         loglevel.log.error("Error during login with social", error);
-        this.auditOAuditProgress(loginParams, "failed").catch(error => {
-          loglevel.log.error("Error reporting `oauthFailed` audit progress", error);
-        });
+        this.reportFailedOauthAudit(loginParams);
       });
       verifierWindow.once("close", () => {
         if (!isClosedWindow) {
@@ -891,9 +955,7 @@ class AuthConnector extends baseConnector.BaseConnector {
         }
       });
       this.authInstance.postLoginInitiatedMessage(loginParams, nonce).then(resolve).catch(error => {
-        this.auditOAuditProgress(loginParams, "failed").catch(error => {
-          loglevel.log.error("Error reporting `oauthFailed` audit progress", error);
-        });
+        this.reportFailedOauthAudit(loginParams);
         if (error instanceof index.Web3AuthError) {
           throw error;
         }
@@ -1007,6 +1069,11 @@ class AuthConnector extends baseConnector.BaseConnector {
     }
     await httpHelpers.put(auditServerUrl, auditPayload);
   }
+  reportFailedOauthAudit(loginParams) {
+    void this.auditOAuditProgress(loginParams, "failed").catch(error => {
+      loglevel.log.error("Error reporting `oauthFailed` audit progress", error);
+    });
+  }
 }
 const authConnector = params => {
   return ({

package/dist/lib.cjs/connectors/metamask-connector/metamaskConnector.js

@@ -114,7 +114,11 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
           supportedNetworks: caipSupportedNetworks
         },
         ui,
-        debug: (_this$connectorSettin0 = this.connectorSettings) === null || _this$connectorSettin0 === void 0 ? void 0 : _this$connectorSettin0.debug
+        debug: (_this$connectorSettin0 = this.connectorSettings) === null || _this$connectorSettin0 === void 0 ? void 0 : _this$connectorSettin0.debug,
+        analytics: {
+          integrationType: "web3auth",
+          enabled: !this.coreOptions.disableAnalytics
+        }
       });
       // Listen for QR code URI from the multichain client (for mobile wallet connection)
       this.multichainClient.on("display_uri", uri => {
@@ -132,19 +136,27 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
           dapp,
           eventHandlers: {
             accountsChanged: _accounts => {
-              if (_accounts.length === 0) {
+              if (_accounts.length === 0 && this.connected) {
                 this.disconnect();
               }
             },
             chainChanged: _chainId => {},
             connect: _result => {},
-            disconnect: () => this.disconnect()
+            disconnect: () => {
+              if (this.connected) {
+                this.disconnect();
+              }
+            }
           },
           api: {
             supportedNetworks: hexSupportedNetworks
           },
           ui,
-          debug: (_this$connectorSettin1 = this.connectorSettings) === null || _this$connectorSettin1 === void 0 ? void 0 : _this$connectorSettin1.debug
+          debug: (_this$connectorSettin1 = this.connectorSettings) === null || _this$connectorSettin1 === void 0 ? void 0 : _this$connectorSettin1.debug,
+          analytics: {
+            integrationType: "web3auth",
+            enabled: !this.coreOptions.disableAnalytics
+          }
         });
         this.evmProvider = this.evmClient.getProvider();
       }
@@ -155,7 +167,11 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
           api: {
             supportedNetworks: solanaSupportedNetworks
           },
-          skipAutoRegister: true
+          skipAutoRegister: true,
+          analytics: {
+            integrationType: "web3auth",
+            enabled: !this.coreOptions.disableAnalytics
+          }
         });
         this.solanaProvider = this.solanaClient.getWallet();
       }
@@ -170,32 +186,20 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
       return;
     }
     const coreStatus = this.multichainClient.status;
-    if (coreStatus === "connected") {
+    // only connect if the multichain client is connected and autoConnect is true (i.e during the rehydration)
+    if (coreStatus === "connected" && options.autoConnect) {
       this.status = constants.CONNECTOR_STATUS.CONNECTED;
       this.rehydrated = true;
-      if (options.autoConnect) {
-        this.emit(constants.CONNECTOR_EVENTS.CONNECTED, {
-          connectorName: index.WALLET_CONNECTORS.METAMASK,
-          reconnected: this.rehydrated,
-          ethereumProvider: this.evmProvider,
-          solanaWallet: this.solanaProvider
-        });
-        if (options.getAuthTokenInfo) {
-          await this.getAuthTokenInfo();
-        }
-      }
-    } else if (coreStatus === "loaded" || coreStatus === "disconnected") {
-      this.status = constants.CONNECTOR_STATUS.READY;
-      this.emit(constants.CONNECTOR_EVENTS.READY, index.WALLET_CONNECTORS.METAMASK);
-    } else if (coreStatus === "pending") {
-      // 'pending' implies that a transport failed to resume the connection
-      // if (options.autoConnect) {
-      //   this.rehydrated = false;
-      //   this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, new Error("Failed to resume existing MetaMask Connect session.") as Web3AuthError);
-      // } else {
+      this.emit(constants.CONNECTOR_EVENTS.CONNECTED, {
+        connectorName: index.WALLET_CONNECTORS.METAMASK,
+        reconnected: true,
+        ethereumProvider: this.evmProvider,
+        solanaWallet: this.solanaProvider
+      });
+      if (options.getAuthTokenInfo) await this.getAuthTokenInfo();
+    } else if (coreStatus === "connected" || coreStatus === "loaded" || coreStatus === "disconnected" || coreStatus === "pending") {
       this.status = constants.CONNECTOR_STATUS.READY;
       this.emit(constants.CONNECTOR_EVENTS.READY, index.WALLET_CONNECTORS.METAMASK);
-      // }
     } else {
       // Something unexpected happened
       this.status = constants.CONNECTOR_STATUS.ERRORED;
@@ -231,11 +235,15 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
           connector: index.WALLET_CONNECTORS.METAMASK
         });
         const evmConnectedPromise = new Promise(resolve => {
-          var _this$evmProvider;
-          // Wait for EVM provider to be ready
-          (_this$evmProvider = this.evmProvider) === null || _this$evmProvider === void 0 || _this$evmProvider.once("connect", () => {
+          if (this.evmClient.status === "connected") {
             resolve();
-          });
+          } else {
+            var _this$evmProvider;
+            // Wait for EVM provider to be ready
+            (_this$evmProvider = this.evmProvider) === null || _this$evmProvider === void 0 || _this$evmProvider.once("connect", () => {
+              resolve();
+            });
+          }
         });
         // Connect using the multichain client
         await this.multichainClient.connect(scopes, caipAccountIds, {
@@ -298,6 +306,7 @@ class MetaMaskConnector extends baseConnector.BaseConnector {
           duration: Date.now() - startTime
         }));
       }
+      if (index$1.isUserRejectedError(error)) throw index$1.WalletOperationsError.userRejected();
       if (error instanceof index$1.Web3AuthError) throw error;
       throw index$1.WalletLoginError.connectionError("Failed to login with MetaMask wallet", error);
     }