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

package/dist/lib.cjs/account-linking/errors.js

@@ -0,0 +1,111 @@
+'use strict';
+
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+require('@babel/runtime/helpers/objectSpread2');
+require('@segment/analytics-next');
+require('../base/loglevel.js');
+require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
+require('@web3auth/auth');
+var index = require('../base/errors/index.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+require('../base/constants.js');
+require('../base/wallet/index.js');
+require('../base/connector/connectorStatus.js');
+require('../base/connector/constants.js');
+require('jwt-decode');
+require('../base/plugin/errors.js');
+require('../base/plugin/IPlugin.js');
+
+class AccountLinkingError extends index.Web3AuthError {
+  constructor(code, message, cause) {
+    super(code, message, cause);
+    Object.defineProperty(this, "name", {
+      value: "AccountLinkingError",
+      configurable: true
+    });
+  }
+  static fromCode(code, extraMessage = "", cause) {
+    return new AccountLinkingError(code, `${AccountLinkingError.messages[code]}. ${extraMessage}`, cause);
+  }
+  static requestFailed(extraMessage = "", cause) {
+    return AccountLinkingError.fromCode(5401, extraMessage, cause);
+  }
+  static serverNotConfigured(extraMessage = "", cause) {
+    return AccountLinkingError.fromCode(5402, extraMessage, cause);
+  }
+  static primaryTokenNotAvailable(extraMessage = "", cause) {
+    return AccountLinkingError.fromCode(5403, extraMessage, cause);
+  }
+  static walletProofFailed(extraMessage = "", cause) {
+    return AccountLinkingError.fromCode(5404, extraMessage, cause);
+  }
+  static unsupportedConnector(extraMessage = "", cause) {
+    return AccountLinkingError.fromCode(5405, extraMessage, cause);
+  }
+  static cannotUnlinkActiveAccount() {
+    return AccountLinkingError.fromCode(5406);
+  }
+  static accountNotLinked(message = "", cause) {
+    return AccountLinkingError.fromCode(5407, message, cause);
+  }
+  static cannotUnlinkPrimaryAccount() {
+    return AccountLinkingError.fromCode(5408);
+  }
+  toString() {
+    return `[${this.code}] ${this.message}`;
+  }
+}
+_defineProperty(AccountLinkingError, "messages", {
+  5000: "Custom",
+  5401: "Account linking request failed",
+  5402: "Citadel server URL is not configured",
+  5403: "Primary identity token is not available",
+  5404: "Failed to obtain wallet proof token",
+  5405: "Connector is not supported for wallet linking",
+  5406: "Cannot unlink active account",
+  5407: "Account not linked",
+  5408: "Cannot unlink primary account"
+});
+async function getAccountLinkingRequestError(error) {
+  if (error instanceof AccountLinkingError) {
+    return error;
+  }
+  if (error instanceof Response) {
+    if (error.status === 409) {
+      return AccountLinkingError.requestFailed("This wallet address is already registered on this dApp");
+    }
+    if (error.json && typeof error.json === "function") {
+      try {
+        var _json$message;
+        const json = await error.json();
+        return AccountLinkingError.requestFailed((_json$message = json.message) !== null && _json$message !== void 0 ? _json$message : "Failed to link account");
+      } catch {
+        // continue
+      }
+    }
+  }
+  return AccountLinkingError.requestFailed(error instanceof Error ? error.message : JSON.stringify(error), error);
+}
+function formatAccountLinkingErrorMessage(error, fallbackMessage = "Unknown error during the operation.") {
+  if (error instanceof AccountLinkingError) {
+    return error.toString();
+  }
+  if (error instanceof index.Web3AuthError) {
+    return `[${error.code}] Account linking error: ${error.message || fallbackMessage}`;
+  }
+  if (error instanceof Error) {
+    return `Account linking error: ${error.message || fallbackMessage}`;
+  }
+  try {
+    const stringifiedError = JSON.stringify(error);
+    return stringifiedError;
+  } catch {
+    return fallbackMessage;
+  }
+}
+
+exports.AccountLinkingError = AccountLinkingError;
+exports.formatAccountLinkingErrorMessage = formatAccountLinkingErrorMessage;
+exports.getAccountLinkingRequestError = getAccountLinkingRequestError;

package/dist/lib.cjs/account-linking/index.js

@@ -1,8 +1,12 @@
 'use strict';
 
+var errors = require('./errors.js');
 var rest = require('./rest.js');
 
 
 
+exports.AccountLinkingError = errors.AccountLinkingError;
+exports.formatAccountLinkingErrorMessage = errors.formatAccountLinkingErrorMessage;
+exports.getAccountLinkingRequestError = errors.getAccountLinkingRequestError;
 exports.makeAccountLinkingRequest = rest.makeAccountLinkingRequest;
 exports.makeAccountUnlinkingRequest = rest.makeAccountUnlinkingRequest;

package/dist/lib.cjs/account-linking/rest.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var httpHelpers = require('@toruslabs/http-helpers');
-var index = require('../base/errors/index.js');
+var errors = require('./errors.js');
 
 /**
  * Send both identity proofs to the Citadel account-linking endpoint and
@@ -19,13 +19,13 @@ async function makeAccountLinkingRequest(authServerUrl, accessToken, payload) {
       }
     });
   } catch (cause) {
-    const message = cause instanceof Error ? cause.message : String(cause);
-    throw index.AccountLinkingError.requestFailed(message, cause);
+    const accountLinkingError = await errors.getAccountLinkingRequestError(cause);
+    throw accountLinkingError;
   }
   if (!result.success) {
     var _result$message;
     const errMessage = (_result$message = result.message) !== null && _result$message !== void 0 ? _result$message : "Failed to link account";
-    throw index.AccountLinkingError.requestFailed(errMessage);
+    throw errors.AccountLinkingError.requestFailed(errMessage);
   }
   return result;
 }
@@ -40,12 +40,12 @@ async function makeAccountUnlinkingRequest(authServerUrl, accessToken, payload)
     });
   } catch (cause) {
     const message = cause instanceof Error ? cause.message : String(cause);
-    throw index.AccountLinkingError.requestFailed(message, cause);
+    throw errors.AccountLinkingError.requestFailed(message, cause);
   }
   if (!result.success) {
     var _result$message2;
     const errMessage = (_result$message2 = result.message) !== null && _result$message2 !== void 0 ? _result$message2 : "Failed to unlink account";
-    throw index.AccountLinkingError.requestFailed(errMessage);
+    throw errors.AccountLinkingError.requestFailed(errMessage);
   }
   return result;
 }

package/dist/lib.cjs/account-linking/vue.js

@@ -37,7 +37,6 @@ const useLinkAccount = () => {
       linkedAccounts.value = result.linkedAccounts;
       return result;
     } catch (err) {
-      loglevel.log.error("Error linking account", err);
       error.value = err;
     } finally {
       loading.value = false;

package/dist/lib.cjs/base/connector/constants.js

@@ -2,6 +2,7 @@
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 
+const WEB3AUTH_CONNECTOR_ID = "web3auth";
 const CONNECTOR_STATUS = {
   NOT_READY: "not_ready",
   READY: "ready",
@@ -37,3 +38,4 @@ exports.CONNECTOR_CATEGORY = CONNECTOR_CATEGORY;
 exports.CONNECTOR_EVENTS = CONNECTOR_EVENTS;
 exports.CONNECTOR_INITIAL_AUTHENTICATION_MODE = CONNECTOR_INITIAL_AUTHENTICATION_MODE;
 exports.CONNECTOR_STATUS = CONNECTOR_STATUS;
+exports.WEB3AUTH_CONNECTOR_ID = WEB3AUTH_CONNECTOR_ID;

package/dist/lib.cjs/base/errors/index.js

@@ -183,7 +183,11 @@ class WalletOperationsError extends Web3AuthError {
     });
   }
   static fromCode(code, extraMessage = "", cause) {
-    return new WalletOperationsError(code, `${WalletOperationsError.messages[code]}, ${extraMessage}`, cause);
+    let message = WalletOperationsError.messages[code];
+    if (extraMessage) {
+      message = `${message}, ${extraMessage}`;
+    }
+    return new WalletOperationsError(code, message, cause);
   }
   // Custom methods
   static chainIDNotAllowed(extraMessage = "", cause) {
@@ -195,58 +199,16 @@ class WalletOperationsError extends Web3AuthError {
   static chainNamespaceNotAllowed(extraMessage = "", cause) {
     return WalletOperationsError.fromCode(5203, extraMessage, cause);
   }
+  static userRejected(extraMessage = "", cause) {
+    return WalletOperationsError.fromCode(5204, extraMessage, cause);
+  }
 }
 _defineProperty(WalletOperationsError, "messages", {
   5000: "Custom",
   5201: "Provided chainId is not allowed",
-  5202: "This operation is not allowed"
-});
-class AccountLinkingError extends Web3AuthError {
-  constructor(code, message, cause) {
-    super(code, message, cause);
-    Object.defineProperty(this, "name", {
-      value: "AccountLinkingError",
-      configurable: true
-    });
-  }
-  static fromCode(code, extraMessage = "", cause) {
-    return new AccountLinkingError(code, `${AccountLinkingError.messages[code]}. ${extraMessage}`, cause);
-  }
-  static requestFailed(extraMessage = "", cause) {
-    return AccountLinkingError.fromCode(5401, extraMessage, cause);
-  }
-  static serverNotConfigured(extraMessage = "", cause) {
-    return AccountLinkingError.fromCode(5402, extraMessage, cause);
-  }
-  static primaryTokenNotAvailable(extraMessage = "", cause) {
-    return AccountLinkingError.fromCode(5403, extraMessage, cause);
-  }
-  static walletProofFailed(extraMessage = "", cause) {
-    return AccountLinkingError.fromCode(5404, extraMessage, cause);
-  }
-  static unsupportedConnector(extraMessage = "", cause) {
-    return AccountLinkingError.fromCode(5405, extraMessage, cause);
-  }
-  static cannotUnlinkActiveAccount() {
-    return AccountLinkingError.fromCode(5406);
-  }
-  static accountNotLinked(message = "", cause) {
-    return AccountLinkingError.fromCode(5407, message, cause);
-  }
-  static cannotUnlinkPrimaryAccount() {
-    return AccountLinkingError.fromCode(5408);
-  }
-}
-_defineProperty(AccountLinkingError, "messages", {
-  5000: "Custom",
-  5401: "Account linking request failed",
-  5402: "Citadel server URL is not configured",
-  5403: "Primary identity token is not available",
-  5404: "Failed to obtain wallet proof token",
-  5405: "Connector is not supported for wallet linking",
-  5406: "Cannot unlink active account",
-  5407: "Account not linked",
-  5408: "Cannot unlink primary account"
+  5202: "This operation is not allowed",
+  5203: "Chain namespace is not allowed",
+  5204: "User rejected the request"
 });
 class WalletProviderError extends Web3AuthError {
   constructor(code, message, cause) {
@@ -278,10 +240,19 @@ _defineProperty(WalletProviderError, "messages", {
   5302: "'args.method' must be a non-empty string.",
   5303: "'args.params' must be an object or array if provided."
 });
+function isUserRejectedError(error) {
+  if (error instanceof Web3AuthError && error.code === 5203) return true;
+  if (error instanceof Error) {
+    var _error$message;
+    const normalizedMessage = ((_error$message = error.message) === null || _error$message === void 0 ? void 0 : _error$message.toLowerCase()) || "";
+    return normalizedMessage.includes("user rejected the request");
+  }
+  return false;
+}
 
-exports.AccountLinkingError = AccountLinkingError;
 exports.WalletInitializationError = WalletInitializationError;
 exports.WalletLoginError = WalletLoginError;
 exports.WalletOperationsError = WalletOperationsError;
 exports.WalletProviderError = WalletProviderError;
 exports.Web3AuthError = Web3AuthError;
+exports.isUserRejectedError = isUserRejectedError;

package/dist/lib.cjs/base/utils.js

@@ -145,7 +145,7 @@ const getWalletServicesAnalyticsProperties = walletServicesConfig => {
     ws_default_portfolio: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig10 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig10 === void 0 ? void 0 : _walletServicesConfig10.defaultPortfolio
   };
 };
-const sdkVersion = "11.0.0-beta.2";
+const sdkVersion = "11.0.0";
 const getErrorAnalyticsProperties = error => {
   try {
     const code = error instanceof index.Web3AuthError ? error.code : error === null || error === void 0 ? void 0 : error.code;

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 viem = require('viem');
 var analytics = require('../../base/analytics.js');
 var IChainInterface = require('../../base/chain/IChainInterface.js');
 var baseConnector = require('../../base/connector/baseConnector.js');
@@ -24,8 +24,8 @@ 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 errors = require('../../account-linking/errors.js');
 var rest = require('../../account-linking/rest.js');
-var baseControllers = require('@toruslabs/base-controllers');
 
 // 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
@@ -315,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`, {
@@ -322,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);
@@ -342,13 +359,11 @@ class AuthConnector extends baseConnector.BaseConnector {
     if (newChainConfig.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA || newChainConfig.chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155) {
       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 chainIdNum = parseInt(newChainConfig.chainId, 16);
-      // WsEmbed expects the chainId in hex format
-      const chainIdHex = viem.numberToHex(chainIdNum);
+      const caipChainId = baseControllers.getCaipChainId(newChainConfig);
       await this.wsEmbedInstance.provider.request({
         method: "wallet_switchChain",
         params: {
-          chainId: chainIdHex
+          chainId: caipChainId
         }
       });
     } else {
@@ -397,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;
@@ -411,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",
@@ -459,14 +474,12 @@ class AuthConnector extends baseConnector.BaseConnector {
           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,
@@ -565,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;
@@ -579,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;
@@ -639,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,
@@ -657,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) {
@@ -669,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
@@ -703,25 +716,25 @@ 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];
   }

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);
     }