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

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

@@ -1,5 +1,6 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import { CHAIN_NAMESPACES, getCaipChainId, cloneDeep } from '@toruslabs/base-controllers';
 import { CITADEL_SERVER_MAP } from '@toruslabs/constants';
 import { get, put } from '@toruslabs/http-helpers';
 import { SecurePubSub } from '@toruslabs/secure-pub-sub';
@@ -8,18 +9,27 @@ import { WS_EMBED_LOGIN_MODE } from '@web3auth/ws-embed';
 import deepmerge from 'deepmerge';
 import { generateNonce, parseToken } from '../utils.js';
 import { AuthSolanaWallet } from './authSolanaWallet.js';
-import { WalletLoginError, WalletInitializationError, Web3AuthError, AccountLinkingError } from '../../base/errors/index.js';
+import { WalletLoginError, WalletInitializationError, Web3AuthError } from '../../base/errors/index.js';
 import { WALLET_CONNECTORS } from '../../base/wallet/index.js';
 import { BaseConnector } from '../../base/connector/baseConnector.js';
 import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
 import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
-import { Analytics, ANALYTICS_EVENTS } from '../../base/analytics.js';
-import { log } from '../../base/loglevel.js';
-import { citadelServerUrl, getCaipChainId, getErrorAnalyticsProperties, parseChainNamespaceFromCitadelResponse } from '../../base/utils.js';
 import { CONNECTED_STATUSES } from '../../base/connector/connectorStatus.js';
+import { log } from '../../base/loglevel.js';
+import { Analytics, ANALYTICS_EVENTS } from '../../base/analytics.js';
+import { citadelServerUrl, getErrorAnalyticsProperties, parseChainNamespaceFromCitadelResponse } from '../../base/utils.js';
+import { AccountLinkingError } from '../../account-linking/errors.js';
 import { makeAccountLinkingRequest, makeAccountUnlinkingRequest } from '../../account-linking/rest.js';
-import { CHAIN_NAMESPACES, cloneDeep } from '@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
+// 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 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 {
   constructor(params) {
     super(params);
@@ -37,8 +47,22 @@ class AuthConnector extends 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 (!CONNECTED_STATUSES.includes(this.status)) {
+          return;
+        }
+        log.info("No accounts found in the wallet, disconnecting");
+        void this.disconnect({
+          cleanup: true
+        }).catch(error => {
+          log.error("Failed to disconnect auth connector after wallet accounts changed", error);
+        });
+      }
+    });
     this.authOptions = params.connectorSettings;
     this.loginSettings = params.loginSettings || {
       authConnection: ""
@@ -51,10 +75,8 @@ class AuthConnector extends BaseConnector {
   }
   get provider() {
     if (this.status !== 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;
   }
@@ -123,6 +145,7 @@ class AuthConnector extends BaseConnector {
               buildEnv: this.authOptions.buildEnv,
               whiteLabel: _objectSpread(_objectSpread({}, this.authOptions.whiteLabel), this.wsSettings.whiteLabel)
             })).then(() => {
+              this.bindWsEmbedProviderEvents();
               this.wsEmbedInstancePromise = null;
               return;
             });
@@ -172,6 +195,7 @@ class AuthConnector extends BaseConnector {
     }
   }
   async connect(params) {
+    assertAuthConnectionSupported(params === null || params === void 0 ? void 0 : params.authConnection);
     super.checkConnectionRequirements();
     this.status = CONNECTOR_STATUS.CONNECTING;
     this.emit(CONNECTOR_EVENTS.CONNECTING, _objectSpread(_objectSpread({}, params), {}, {
@@ -201,6 +225,7 @@ class AuthConnector extends BaseConnector {
   async enableMFA(params = {
     authConnection: ""
   }) {
+    assertAuthConnectionSupported(params === null || params === void 0 ? void 0 : params.authConnection);
     if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     try {
@@ -218,6 +243,7 @@ class AuthConnector extends BaseConnector {
   async manageMFA(params = {
     authConnection: ""
   }) {
+    assertAuthConnectionSupported(params === null || params === void 0 ? void 0 : params.authConnection);
     if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     try {
@@ -249,6 +275,7 @@ class AuthConnector extends BaseConnector {
     }
     this.rehydrated = false;
     this._solanaWallet = null;
+    this.unbindWsEmbedProviderEvents();
     this.emit(CONNECTOR_EVENTS.DISCONNECTED, {
       connector: WALLET_CONNECTORS.AUTH
     });
@@ -285,6 +312,7 @@ class AuthConnector extends BaseConnector {
     });
   }
   async getLinkedAccounts() {
+    var _citadelUserInfo$acco, _this$solanaWallet;
     const accessToken = await this.authInstance.authSessionManager.getAccessToken();
     if (!accessToken) throw WalletLoginError.connectionError("Could not obtain an access token from the current AUTH session.");
     const citadelUserInfo = await get(`${citadelServerUrl(this.coreOptions.authBuildEnv)}/v1/user`, {
@@ -292,11 +320,28 @@ class AuthConnector extends 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 ? 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);
@@ -310,13 +355,13 @@ class AuthConnector extends BaseConnector {
     const newChainConfig = this.coreOptions.chains.find(c => c.chainId === newChainId);
     if (!newChainConfig) throw WalletInitializationError.invalidParams("Chain config is not available");
     if (newChainConfig.chainNamespace === CHAIN_NAMESPACES.SOLANA || newChainConfig.chainNamespace === CHAIN_NAMESPACES.EIP155) {
-      var _this$wsEmbedInstance2;
-      if (!((_this$wsEmbedInstance2 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance2 !== void 0 && _this$wsEmbedInstance2.provider)) throw WalletInitializationError.notReady("Wallet embed is not ready");
-      const fullChainId = getCaipChainId(newChainConfig);
+      var _this$wsEmbedInstance;
+      if (!((_this$wsEmbedInstance = this.wsEmbedInstance) !== null && _this$wsEmbedInstance !== void 0 && _this$wsEmbedInstance.provider)) throw WalletInitializationError.notReady("Wallet embed is not ready");
+      const caipChainId = getCaipChainId(newChainConfig);
       await this.wsEmbedInstance.provider.request({
         method: "wallet_switchChain",
         params: {
-          chainId: fullChainId
+          chainId: caipChainId
         }
       });
     } else {
@@ -330,6 +375,8 @@ class AuthConnector extends BaseConnector {
     if (this.wsEmbedInstance) {
       this.wsEmbedInstance.clearInit();
     }
+    this._solanaWallet = null;
+    this.unbindWsEmbedProviderEvents();
   }
   getOAuthProviderConfig(params) {
     const {
@@ -416,11 +463,11 @@ class AuthConnector extends 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
         });
@@ -429,9 +476,7 @@ class AuthConnector extends BaseConnector {
         }
       }
     } catch (error) {
-      if (error instanceof AccountLinkingError) {
-        throw error;
-      }
+      if (error instanceof Web3AuthError) throw error;
       throw AccountLinkingError.walletProofFailed(error instanceof Error ? error.message : String(error), error);
     }
     const trackData = {
@@ -445,7 +490,7 @@ class AuthConnector extends BaseConnector {
         accessToken,
         idToken
       } = await this.getPrimaryAuthSession(params.authSessionTokens);
-      const walletProof = await this.createWalletLinkingProof(params.walletConnector);
+      const walletProof = await this.createWalletLinkingProof(params.connectorToLink);
       const authServerUrl = citadelServerUrl(this.coreOptions.authBuildEnv);
       const result = await makeAccountLinkingRequest(authServerUrl, accessToken, {
         idToken,
@@ -466,9 +511,11 @@ class AuthConnector extends BaseConnector {
 
       // 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) {
         log.debug("Failed to disconnect wallet connector after linking failure", disconnectError);
       }
@@ -690,9 +737,35 @@ class AuthConnector extends BaseConnector {
     }
     return accounts[0];
   }
+  getWsEmbedProvider() {
+    var _ref, _this$wsEmbedInstance2;
+    return (_ref = (_this$wsEmbedInstance2 = this.wsEmbedInstance) === null || _this$wsEmbedInstance2 === void 0 ? void 0 : _this$wsEmbedInstance2.provider) !== null && _ref !== void 0 ? _ref : 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 === CHAIN_NAMESPACES.SOLANA);
     if (solanaChains.length === 0 || !this.provider) return;
+    if (this._solanaWallet instanceof AuthSolanaWallet) {
+      return;
+    }
     this._solanaWallet = new AuthSolanaWallet(this.provider, solanaChains);
   }
   _getFinalPrivKey() {
@@ -755,13 +828,13 @@ class AuthConnector extends 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
@@ -775,12 +848,6 @@ class AuthConnector extends 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 && CONNECTED_STATUSES.includes(this.status)) this.disconnect({
-              cleanup: false
-            });
-          });
         }
       }
     } else {
@@ -882,9 +949,7 @@ class AuthConnector extends BaseConnector {
       }).catch(error => {
         // swallow the error, dont need to throw.
         log.error("Error during login with social", error);
-        this.auditOAuditProgress(loginParams, "failed").catch(error => {
-          log.error("Error reporting `oauthFailed` audit progress", error);
-        });
+        this.reportFailedOauthAudit(loginParams);
       });
       verifierWindow.once("close", () => {
         if (!isClosedWindow) {
@@ -894,9 +959,7 @@ class AuthConnector extends BaseConnector {
         }
       });
       this.authInstance.postLoginInitiatedMessage(loginParams, nonce).then(resolve).catch(error => {
-        this.auditOAuditProgress(loginParams, "failed").catch(error => {
-          log.error("Error reporting `oauthFailed` audit progress", error);
-        });
+        this.reportFailedOauthAudit(loginParams);
         if (error instanceof Web3AuthError) {
           throw error;
         }
@@ -1012,6 +1075,11 @@ class AuthConnector extends BaseConnector {
     }
     await put(auditServerUrl, auditPayload);
   }
+  reportFailedOauthAudit(loginParams) {
+    void this.auditOAuditProgress(loginParams, "failed").catch(error => {
+      log.error("Error reporting `oauthFailed` audit progress", error);
+    });
+  }
 }
 const authConnector = params => {
   return ({

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

@@ -2,9 +2,9 @@ import { CHAIN_NAMESPACES, signChallenge } from '@toruslabs/base-controllers';
 import { generateSiweNonce } from 'viem/siwe';
 import { WalletLoginError, WalletInitializationError } from '../../base/errors/index.js';
 import { citadelServerUrl } from '../../base/utils.js';
-import { getSolanaChainByChainConfig, walletSignMessage } from '../../base/wallet/solana.js';
 import { BaseConnector } from '../../base/connector/baseConnector.js';
 import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import { getSolanaChainByChainConfig, walletSignMessage } from '../../base/wallet/solana.js';
 
 class BaseSolanaConnector extends BaseConnector {
   async init(_) {}

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

@@ -12,11 +12,11 @@ import { getSiteName } from '../utils.js';
 import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
 import { WALLET_CONNECTORS } from '../../base/wallet/index.js';
 import { getCaipChainId, citadelServerUrl } from '../../base/utils.js';
-import { WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
+import { WalletLoginError, isUserRejectedError, WalletOperationsError, Web3AuthError } from '../../base/errors/index.js';
 import { ANALYTICS_EVENTS } from '../../base/analytics.js';
+import { getSolanaChainByChainConfig, walletSignMessage } from '../../base/wallet/solana.js';
 import { BaseConnector } from '../../base/connector/baseConnector.js';
 import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
-import { getSolanaChainByChainConfig, walletSignMessage } from '../../base/wallet/solana.js';
 
 /**
  * Configuration options for the MetaMask connector using \@metamask/connect-evm
@@ -113,7 +113,11 @@ class MetaMaskConnector extends 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)
@@ -133,19 +137,27 @@ class MetaMaskConnector extends 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();
       }
@@ -157,7 +169,11 @@ class MetaMaskConnector extends BaseConnector {
           api: {
             supportedNetworks: solanaSupportedNetworks
           },
-          skipAutoRegister: true
+          skipAutoRegister: true,
+          analytics: {
+            integrationType: "web3auth",
+            enabled: !this.coreOptions.disableAnalytics
+          }
         });
         this.solanaProvider = this.solanaClient.getWallet();
       }
@@ -172,32 +188,20 @@ class MetaMaskConnector extends 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 = CONNECTOR_STATUS.CONNECTED;
       this.rehydrated = true;
-      if (options.autoConnect) {
-        this.emit(CONNECTOR_EVENTS.CONNECTED, {
-          connectorName: 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 = CONNECTOR_STATUS.READY;
-      this.emit(CONNECTOR_EVENTS.READY, 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(CONNECTOR_EVENTS.CONNECTED, {
+        connectorName: 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 = CONNECTOR_STATUS.READY;
       this.emit(CONNECTOR_EVENTS.READY, WALLET_CONNECTORS.METAMASK);
-      // }
     } else {
       // Something unexpected happened
       this.status = CONNECTOR_STATUS.ERRORED;
@@ -234,11 +238,15 @@ class MetaMaskConnector extends BaseConnector {
           connector: 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
@@ -308,6 +316,7 @@ class MetaMaskConnector extends BaseConnector {
           duration: Date.now() - startTime
         }));
       }
+      if (isUserRejectedError(error)) throw WalletOperationsError.userRejected();
       if (error instanceof Web3AuthError) throw error;
       throw WalletLoginError.connectionError("Failed to login with MetaMask wallet", error);
     }

package/dist/lib.esm/index.js

@@ -1,7 +1,7 @@
 export { Web3AuthNoModal } from './noModal.js';
 export { ANALYTICS_EVENTS, ANALYTICS_INTEGRATION_TYPE, ANALYTICS_SDK_TYPE, Analytics } from './base/analytics.js';
 export { AUTH_CONNECTION, MFA_FACTOR, MFA_LEVELS, UX_MODE, WEB3AUTH_NETWORK, getED25519Key } from '@web3auth/auth';
-export { AccountLinkingError, WalletInitializationError, WalletLoginError, WalletOperationsError, WalletProviderError, Web3AuthError } from './base/errors/index.js';
+export { AccountLinkingError, formatAccountLinkingErrorMessage, getAccountLinkingRequestError } from './account-linking/errors.js';
 export { BUTTON_POSITION, CONFIRMATION_STRATEGY } from '@web3auth/ws-embed';
 export { BaseConnector } from './base/connector/baseConnector.js';
 export { BaseEvmConnector } from './connectors/base-evm-connector/baseEvmConnector.js';
@@ -10,7 +10,7 @@ export { BaseSolanaConnector } from './connectors/base-solana-connector/baseSola
 export { BiconomySmartAccount, KernelSmartAccount, MetamaskSmartAccount, NexusSmartAccount, SMART_ACCOUNT, SafeSmartAccount, TrustSmartAccount } from '@toruslabs/ethereum-controllers';
 export { CAN_AUTHORIZE_STATUSES, CAN_LOGOUT_STATUSES, CONNECTED_STATUSES } from './base/connector/connectorStatus.js';
 export { CHAIN_NAMESPACES, cloneDeep } from '@toruslabs/base-controllers';
-export { CONNECTOR_CATEGORY, CONNECTOR_EVENTS, CONNECTOR_INITIAL_AUTHENTICATION_MODE, CONNECTOR_STATUS } from './base/connector/constants.js';
+export { CONNECTOR_CATEGORY, CONNECTOR_EVENTS, CONNECTOR_INITIAL_AUTHENTICATION_MODE, CONNECTOR_STATUS, WEB3AUTH_CONNECTOR_ID } from './base/connector/constants.js';
 export { CONNECTOR_NAMES, EVM_CONNECTORS, MULTI_CHAIN_CONNECTORS, SOLANA_CONNECTORS, WALLET_CONNECTORS, WEB3AUTH_ICON } from './base/wallet/index.js';
 export { CONNECTOR_NAMESPACES } from './base/chain/IChainInterface.js';
 export { CommonJRPCProvider } from './providers/base-provider/CommonJRPCProvider.js';
@@ -21,6 +21,7 @@ export { EIP_7702_SUPPORTED_SMART_ACCOUNTS, LOGIN_MODE, MODAL_SIGN_IN_METHODS, S
 export { EVM_PLUGINS, PLUGIN_EVENTS, PLUGIN_NAMESPACES, PLUGIN_STATUS, SOLANA_PLUGINS, WALLET_PLUGINS } from './base/plugin/IPlugin.js';
 export { PROVIDER_EVENTS } from './base/provider/IProvider.js';
 export { WalletConnectV2Provider } from './connectors/wallet-connect-v2-connector/WalletConnectV2Provider.js';
+export { WalletInitializationError, WalletLoginError, WalletOperationsError, WalletProviderError, Web3AuthError, isUserRejectedError } from './base/errors/index.js';
 export { WalletServicesPluginError } from './base/plugin/errors.js';
 export { Web3AuthContextKey } from './base/composables/index.js';
 export { accountAbstractionProvider, toEoaProvider } from './providers/account-abstraction-provider/providers/AccountAbstractionProvider.js';