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

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

@@ -8,27 +8,38 @@ var securePubSub = require('@toruslabs/secure-pub-sub');
 var auth = require('@web3auth/auth');
 var wsEmbed = require('@web3auth/ws-embed');
 var deepmerge = require('deepmerge');
-require('@segment/analytics-next');
-var loglevel = require('../../base/loglevel.js');
+var viem = require('viem');
+var analytics = require('../../base/analytics.js');
 var IChainInterface = require('../../base/chain/IChainInterface.js');
 var baseConnector = require('../../base/connector/baseConnector.js');
 var connectorStatus = require('../../base/connector/connectorStatus.js');
 var constants = require('../../base/connector/constants.js');
 require('jwt-decode');
 require('../../base/constants.js');
-var index$1 = require('../../base/errors/index.js');
+var index = require('../../base/errors/index.js');
+var loglevel = require('../../base/loglevel.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
 var utils = require('../../base/utils.js');
-var index = require('../../base/wallet/index.js');
+var index$1 = require('../../base/wallet/index.js');
 var utils$1 = require('../utils.js');
 var authSolanaWallet = require('./authSolanaWallet.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
+// 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);
-    _defineProperty(this, "name", index.WALLET_CONNECTORS.AUTH);
+    _defineProperty(this, "name", index$1.WALLET_CONNECTORS.AUTH);
     _defineProperty(this, "connectorNamespace", IChainInterface.CONNECTOR_NAMESPACES.MULTICHAIN);
     _defineProperty(this, "type", constants.CONNECTOR_CATEGORY.IN_APP);
     _defineProperty(this, "authInstance", null);
@@ -42,7 +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: ""
@@ -51,13 +77,12 @@ class AuthConnector extends baseConnector.BaseConnector {
       loginMode: wsEmbed.WS_EMBED_LOGIN_MODE.PLUGIN
     };
     this.authConnectionConfig = params.authConnectionConfig || [];
+    this.analytics = params.analytics || new analytics.Analytics();
   }
   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;
   }
@@ -81,9 +106,9 @@ class AuthConnector extends baseConnector.BaseConnector {
     super.checkInitializationRequirements({
       chainConfig
     });
-    if (!this.coreOptions.clientId) throw index$1.WalletInitializationError.invalidParams("clientId is required before auth's initialization");
-    if (!this.authOptions) throw index$1.WalletInitializationError.invalidParams("authOptions is required before auth's initialization");
-    if (this.authConnectionConfig.length === 0) throw index$1.WalletInitializationError.invalidParams("authConnectionConfig is required before auth's initialization");
+    if (!this.coreOptions.clientId) throw index.WalletInitializationError.invalidParams("clientId is required before auth's initialization");
+    if (!this.authOptions) throw index.WalletInitializationError.invalidParams("authOptions is required before auth's initialization");
+    if (this.authConnectionConfig.length === 0) throw index.WalletInitializationError.invalidParams("authConnectionConfig is required before auth's initialization");
     const isRedirectResult = this.authOptions.uxMode === auth.UX_MODE.REDIRECT;
     this.authOptions = _objectSpread(_objectSpread({}, this.authOptions), {}, {
       replaceUrlOnRedirect: isRedirectResult,
@@ -124,13 +149,14 @@ 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;
             });
             break;
           }
         case baseControllers.CHAIN_NAMESPACES.XRPL:
-          throw index$1.WalletLoginError.connectionError("Private key provider is required for XRPL");
+          throw index.WalletLoginError.connectionError("Private key provider is required for XRPL");
         default:
           {
             const {
@@ -149,7 +175,7 @@ class AuthConnector extends baseConnector.BaseConnector {
     loglevel.log.debug("initializing auth connector");
     await authInstancePromise;
     this.status = constants.CONNECTOR_STATUS.READY;
-    this.emit(constants.CONNECTOR_EVENTS.READY, index.WALLET_CONNECTORS.AUTH);
+    this.emit(constants.CONNECTOR_EVENTS.READY, index$1.WALLET_CONNECTORS.AUTH);
     try {
       const {
         sessionId
@@ -165,17 +191,18 @@ class AuthConnector extends baseConnector.BaseConnector {
         // if here, this means that the connector is cached but the sessionId is not available.
         // this can happen if the sessionId has expired.
         // we are throwing an error to reset the cached state.
-        throw index$1.WalletLoginError.connectionError("Failed to rehydrate");
+        throw index.WalletLoginError.connectionError("Failed to rehydrate");
       }
     } catch (error) {
       this.emit(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     }
   }
   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), {}, {
-      connector: index.WALLET_CONNECTORS.AUTH
+      connector: index$1.WALLET_CONNECTORS.AUTH
     }));
     try {
       await this.connectWithProvider(params);
@@ -191,50 +218,52 @@ class AuthConnector extends baseConnector.BaseConnector {
       this.status = constants.CONNECTOR_STATUS.READY;
       this.emit(constants.CONNECTOR_EVENTS.ERRORED, error);
       if (error !== null && error !== void 0 && (_error$message = error.message) !== null && _error$message !== void 0 && _error$message.includes("user closed popup")) {
-        throw index$1.WalletLoginError.popupClosed();
-      } else if (error instanceof index$1.Web3AuthError) {
+        throw index.WalletLoginError.popupClosed();
+      } else if (error instanceof index.Web3AuthError) {
         throw error;
       }
-      throw index$1.WalletLoginError.connectionError("Failed to login with auth", error);
+      throw index.WalletLoginError.connectionError("Failed to login with auth", error);
     }
   }
   async enableMFA(params = {
     authConnection: ""
   }) {
-    if (!this.connected) throw index$1.WalletLoginError.notConnectedError("Not connected with wallet");
-    if (!this.authInstance) throw index$1.WalletInitializationError.notReady("authInstance is not ready");
+    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 {
       const result = await this.authInstance.enableMFA(params);
       // In redirect mode, the result is not available immediately, so we emit the event when the result is available.
       if (result) this.emit(constants.CONNECTOR_EVENTS.MFA_ENABLED, result);
     } catch (error) {
       loglevel.log.error("Failed to enable MFA with auth provider", error);
-      if (error instanceof index$1.Web3AuthError) {
+      if (error instanceof index.Web3AuthError) {
         throw error;
       }
-      throw index$1.WalletLoginError.connectionError("Failed to enable MFA with auth", error);
+      throw index.WalletLoginError.connectionError("Failed to enable MFA with auth", error);
     }
   }
   async manageMFA(params = {
     authConnection: ""
   }) {
-    if (!this.connected) throw index$1.WalletLoginError.notConnectedError("Not connected with wallet");
-    if (!this.authInstance) throw index$1.WalletInitializationError.notReady("authInstance is not ready");
+    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 {
       await this.authInstance.manageMFA(params);
     } catch (error) {
       loglevel.log.error("Failed to manage MFA with auth provider", error);
-      if (error instanceof index$1.Web3AuthError) {
+      if (error instanceof index.Web3AuthError) {
         throw error;
       }
-      throw index$1.WalletLoginError.connectionError("Failed to manage MFA with auth", error);
+      throw index.WalletLoginError.connectionError("Failed to manage MFA with auth", error);
     }
   }
   async disconnect(options = {
     cleanup: false
   }) {
-    if (!this.connected) throw index$1.WalletLoginError.notConnectedError("Not connected with wallet");
-    if (!this.authInstance) throw index$1.WalletInitializationError.notReady("authInstance is not ready");
+    if (!this.connected) throw index.WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.authInstance) throw index.WalletInitializationError.notReady("authInstance is not ready");
     this.status = constants.CONNECTOR_STATUS.DISCONNECTING;
     await this.authInstance.logout();
     if (this.wsEmbedInstance) await this.wsEmbedInstance.logout();
@@ -249,19 +278,22 @@ class AuthConnector extends baseConnector.BaseConnector {
     }
     this.rehydrated = false;
     this._solanaWallet = null;
-    this.emit(constants.CONNECTOR_EVENTS.DISCONNECTED);
+    this.unbindWsEmbedProviderEvents();
+    this.emit(constants.CONNECTOR_EVENTS.DISCONNECTED, {
+      connector: index$1.WALLET_CONNECTORS.AUTH
+    });
   }
   async getAuthTokenInfo() {
-    if (!this.canAuthorize) throw index$1.WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw index.WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     this.status = constants.CONNECTOR_STATUS.AUTHORIZING;
     this.emit(constants.CONNECTOR_EVENTS.AUTHORIZING, {
-      connector: index.WALLET_CONNECTORS.AUTH
+      connector: index$1.WALLET_CONNECTORS.AUTH
     });
     const userInfo = await this.getUserInfo();
     this.status = constants.CONNECTOR_STATUS.AUTHORIZED;
     const [accessToken, refreshToken] = await Promise.all([this.authInstance.authSessionManager.getAccessToken(), this.authInstance.authSessionManager.getRefreshToken()]);
     this.emit(constants.CONNECTOR_EVENTS.AUTHORIZED, {
-      connector: index.WALLET_CONNECTORS.AUTH,
+      connector: index$1.WALLET_CONNECTORS.AUTH,
       authTokenInfo: {
         idToken: userInfo.idToken,
         accessToken,
@@ -275,10 +307,26 @@ class AuthConnector extends baseConnector.BaseConnector {
     };
   }
   async getUserInfo() {
-    if (!this.canAuthorize) throw index$1.WalletLoginError.notConnectedError("Not connected with wallet");
-    if (!this.authInstance) throw index$1.WalletInitializationError.notReady("authInstance is not ready");
-    const userInfo = this.authInstance.getUserInfo();
-    return userInfo;
+    if (!this.canAuthorize) throw index.WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.authInstance) throw index.WalletInitializationError.notReady("authInstance is not ready");
+    const [userInfo, linkedAccounts] = await Promise.all([this.authInstance.getUserInfo(), this.getLinkedAccounts()]);
+    return _objectSpread(_objectSpread({}, userInfo), {}, {
+      linkedAccounts
+    });
+  }
+  async getLinkedAccounts() {
+    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`, {
+      headers: {
+        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
+    }));
   }
   async switchChain(params, init = false) {
     super.checkSwitchChainRequirements(params, init);
@@ -290,15 +338,17 @@ class AuthConnector extends baseConnector.BaseConnector {
     } = this.provider;
     if (currentChainId === newChainId) return;
     const newChainConfig = this.coreOptions.chains.find(c => c.chainId === newChainId);
-    if (!newChainConfig) throw index$1.WalletInitializationError.invalidParams("Chain config is not available");
+    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$1.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 chainIdNum = parseInt(newChainConfig.chainId, 16);
+      // WsEmbed expects the chainId in hex format
+      const chainIdHex = viem.numberToHex(chainIdNum);
       await this.wsEmbedInstance.provider.request({
         method: "wallet_switchChain",
         params: {
-          chainId: fullChainId
+          chainId: chainIdHex
         }
       });
     } else {
@@ -307,11 +357,13 @@ class AuthConnector extends baseConnector.BaseConnector {
     }
   }
   async cleanup() {
-    if (!this.authInstance) throw index$1.WalletInitializationError.notReady("authInstance is not ready");
+    if (!this.authInstance) throw index.WalletInitializationError.notReady("authInstance is not ready");
     await this.authInstance.cleanup();
     if (this.wsEmbedInstance) {
       this.wsEmbedInstance.clearInit();
     }
+    this._solanaWallet = null;
+    this.unbindWsEmbedProviderEvents();
   }
   getOAuthProviderConfig(params) {
     const {
@@ -331,9 +383,377 @@ class AuthConnector extends baseConnector.BaseConnector {
     });
     return providerConfig;
   }
+  async generateChallengeAndSign() {
+    // we do not support this for auth connector, as of now. since auth login returns a valid idToken
+    throw new Error("Not implemented");
+  }
+  async switchAccount(account, context) {
+    if (!connectorStatus.CONNECTED_STATUSES.includes(this.status)) {
+      throw index.WalletLoginError.notConnectedError("No wallet is connected. Connect with AUTH before switching accounts.");
+    }
+    try {
+      var _userInfo$linkedAccou;
+      const userInfo = await this.getUserInfo();
+      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.`);
+      }
+      const currentActiveAccount = context.activeAccount;
+      const isTargetAlreadyActive = currentActiveAccount ? currentActiveAccount.id === targetAccount.id : targetAccount.isPrimary;
+      if (isTargetAlreadyActive) {
+        return;
+      }
+      this.analytics.track(analytics.ANALYTICS_EVENTS.ACCOUNT_SWITCH_STARTED, this.getSwitchAccountTrackData(targetAccount));
+      if (targetAccount.connector === index$1.WALLET_CONNECTORS.AUTH && targetAccount.isPrimary) {
+        var _this$provider$chainI, _this$provider;
+        const activeChainId = this.getChainIdForLinkedAccount(targetAccount, (_this$provider$chainI = (_this$provider = this.provider) === null || _this$provider === void 0 ? void 0 : _this$provider.chainId) !== null && _this$provider$chainI !== void 0 ? _this$provider$chainI : context.currentChainId);
+        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.");
+        }
+        return {
+          kind: "primary",
+          targetAccount,
+          activeAccount: null,
+          activeChainId,
+          connectorName: this.name,
+          connectorNamespace: this.connectorNamespace,
+          ethereumProvider,
+          solanaWallet
+        };
+      }
+      return {
+        kind: "external",
+        targetAccount,
+        activeAccount: targetAccount,
+        activeChainId: this.getChainIdForLinkedAccount(targetAccount, context.currentChainId)
+      };
+    } catch (error) {
+      await this.trackSwitchAccountFailed(account, error);
+      throw error;
+    }
+  }
+  async trackSwitchAccountCompleted(account) {
+    await this.analytics.track(analytics.ANALYTICS_EVENTS.ACCOUNT_SWITCH_COMPLETED, _objectSpread(_objectSpread({}, this.getSwitchAccountTrackData(account)), {}, {
+      connector: account.connector
+    }));
+  }
+  async trackSwitchAccountFailed(account, error) {
+    await this.analytics.track(analytics.ANALYTICS_EVENTS.ACCOUNT_SWITCH_FAILED, _objectSpread(_objectSpread({}, this.getSwitchAccountTrackData(account)), utils.getErrorAnalyticsProperties(error)));
+  }
+  async linkAccount(params) {
+    if (!connectorStatus.CONNECTED_STATUSES.includes(this.status)) {
+      throw index.WalletLoginError.notConnectedError("No wallet is connected. Connect with AUTH before linking an account.");
+    }
+    const {
+      connectorName,
+      chainId,
+      connectorToLink
+    } = params;
+    try {
+      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.`);
+        }
+      }
+    } catch (error) {
+      if (error instanceof index.AccountLinkingError) {
+        throw error;
+      }
+      throw index.AccountLinkingError.walletProofFailed(error instanceof Error ? error.message : String(error), error);
+    }
+    const trackData = {
+      connector: this.name,
+      linking_connector: connectorName,
+      chain_id: params.chainId
+    };
+    try {
+      await this.analytics.track(analytics.ANALYTICS_EVENTS.ACCOUNT_LINKING_STARTED, trackData);
+      const {
+        accessToken,
+        idToken
+      } = await this.getPrimaryAuthSession(params.authSessionTokens);
+      const walletProof = await this.createWalletLinkingProof(params.connectorToLink);
+      const authServerUrl = utils.citadelServerUrl(this.coreOptions.authBuildEnv);
+      const result = await rest.makeAccountLinkingRequest(authServerUrl, accessToken, {
+        idToken,
+        network: walletProof.network,
+        connector: params.connectorName,
+        message: walletProof.challenge,
+        signature: {
+          s: walletProof.signature,
+          t: walletProof.signatureType
+        }
+      });
+      this.analytics.track(analytics.ANALYTICS_EVENTS.ACCOUNT_LINKING_COMPLETED, _objectSpread(_objectSpread({}, trackData), {}, {
+        linked_address: walletProof.address
+      }));
+      return result;
+    } catch (error) {
+      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 {
+        if (connectorToLink.connected) {
+          await connectorToLink.disconnect({
+            cleanup: true
+          });
+        }
+      } catch (disconnectError) {
+        loglevel.log.debug("Failed to disconnect wallet connector after linking failure", disconnectError);
+      }
+      throw error;
+    }
+  }
+  async unlinkAccount(params) {
+    if (!connectorStatus.CONNECTED_STATUSES.includes(this.status)) {
+      throw index.WalletLoginError.notConnectedError("No wallet is connected. Connect with AUTH before unlinking an account.");
+    }
+    const {
+      address,
+      authSessionTokens
+    } = params;
+    const trackData = {
+      connector: this.name,
+      address
+    };
+    await this.analytics.track(analytics.ANALYTICS_EVENTS.ACCOUNT_UNLINKING_STARTED, trackData);
+    try {
+      const {
+        accessToken,
+        idToken,
+        linkedAccounts
+      } = await this.getPrimaryAuthSession(authSessionTokens, {
+        includeLinkedAccounts: true
+      });
+      const network = this.getNetworkForUnlinkAddress(linkedAccounts, address);
+      const authServerUrl = utils.citadelServerUrl(this.coreOptions.authBuildEnv);
+      const result = await rest.makeAccountUnlinkingRequest(authServerUrl, accessToken, {
+        idToken,
+        address,
+        network
+      });
+      await this.analytics.track(analytics.ANALYTICS_EVENTS.ACCOUNT_UNLINKING_COMPLETED, _objectSpread(_objectSpread({}, trackData), {}, {
+        linked_address: address
+      }));
+      return result;
+    } catch (error) {
+      await this.analytics.track(analytics.ANALYTICS_EVENTS.ACCOUNT_UNLINKING_FAILED, _objectSpread(_objectSpread({}, trackData), utils.getErrorAnalyticsProperties(error)));
+      throw error;
+    }
+  }
+  getChainIdForLinkedAccount(account, preferredChainId) {
+    const accountChainNamespace = account.chainNamespace ? utils.parseChainNamespaceFromCitadelResponse(account.chainNamespace) : null;
+    if (preferredChainId) {
+      const preferredChain = this.coreOptions.chains.find(chain => chain.chainId === preferredChainId);
+      if (preferredChain && (!accountChainNamespace || preferredChain.chainNamespace === accountChainNamespace)) {
+        return preferredChainId;
+      }
+    }
+    if (accountChainNamespace) {
+      const namespaceChain = this.coreOptions.chains.find(chain => chain.chainNamespace === accountChainNamespace);
+      if (namespaceChain) {
+        return namespaceChain.chainId;
+      }
+    }
+    throw index.WalletInitializationError.invalidParams(`No compatible chainId found for connector "${account.connector}".`);
+  }
+  async assertSwitchAccountConnectorMatchesTarget(connector, account) {
+    if (!account.chainNamespace) {
+      throw index.AccountLinkingError.requestFailed(`Could not determine the chain namespace for linked account "${account.eoaAddress}".`);
+    }
+    const chainNamespace = utils.parseChainNamespaceFromCitadelResponse(account.chainNamespace);
+    let connectedAddress = null;
+    if (chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155) {
+      var _accounts$;
+      const accounts = connector.provider ? await connector.provider.request({
+        method: "eth_accounts"
+      }) : [];
+      connectedAddress = (_accounts$ = accounts === null || accounts === void 0 ? void 0 : accounts[0]) !== null && _accounts$ !== void 0 ? _accounts$ : null;
+    } else if (chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) {
+      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}".`);
+    }
+    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.`);
+    }
+    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.`);
+    }
+  }
+  toSwitchAccountConnectorError(account, error) {
+    if (error instanceof index.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);
+    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 index.AccountLinkingError.requestFailed(`Failed to connect connector "${account.connector}" for linked account "${account.eoaAddress}". ${message}`, error);
+  }
+  getSwitchAccountTrackData(account) {
+    var _account$eoaAddress;
+    return {
+      connector: this.name,
+      account_id: account.id,
+      account_type: account.accountType,
+      switched_to_address: (_account$eoaAddress = account.eoaAddress) !== null && _account$eoaAddress !== void 0 ? _account$eoaAddress : null
+    };
+  }
+  async getPrimaryAuthSession(authSessionTokens, options = {}) {
+    const {
+      accessToken: cachedAccessToken,
+      idToken: cachedIdToken
+    } = authSessionTokens;
+    const {
+      includeLinkedAccounts = false
+    } = options;
+    let accessToken = cachedAccessToken;
+    let idToken = cachedIdToken;
+    let linkedAccounts = [];
+    if (includeLinkedAccounts) {
+      const userInfoPromise = this.getUserInfo();
+      if (!accessToken || !idToken) {
+        var _userInfo$linkedAccou2;
+        const [tokenInfo, userInfo] = await Promise.all([this.getAuthTokenInfo(), userInfoPromise]);
+        accessToken = tokenInfo.accessToken;
+        idToken = tokenInfo.idToken;
+        linkedAccounts = (_userInfo$linkedAccou2 = userInfo.linkedAccounts) !== null && _userInfo$linkedAccou2 !== void 0 ? _userInfo$linkedAccou2 : [];
+      } else {
+        var _userInfo$linkedAccou3;
+        const userInfo = await userInfoPromise;
+        linkedAccounts = (_userInfo$linkedAccou3 = userInfo.linkedAccounts) !== null && _userInfo$linkedAccou3 !== void 0 ? _userInfo$linkedAccou3 : [];
+      }
+    } else if (!accessToken || !idToken) {
+      const tokenInfo = await this.getAuthTokenInfo();
+      accessToken = tokenInfo.accessToken;
+      idToken = tokenInfo.idToken;
+    }
+    if (!accessToken || !idToken) {
+      throw index.AccountLinkingError.primaryTokenNotAvailable("Could not obtain an identity token from the current AUTH session.");
+    }
+    return {
+      accessToken,
+      idToken,
+      linkedAccounts
+    };
+  }
+  getNetworkForUnlinkAddress(accounts, address) {
+    const matchedAccount = accounts.find(account => {
+      var _account$address, _account$eoaAddress2;
+      if (!account.chainNamespace || utils.parseChainNamespaceFromCitadelResponse(account.chainNamespace) !== baseControllers.CHAIN_NAMESPACES.EIP155) {
+        return false;
+      }
+      const normalizedAddress = address.toLowerCase();
+      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}".`);
+    }
+    if (!matchedAccount.chainNamespace) {
+      throw index.AccountLinkingError.requestFailed(`Could not determine the chain namespace for address "${address}".`);
+    }
+    const chainNamespace = utils.parseChainNamespaceFromCitadelResponse(matchedAccount.chainNamespace);
+    if (chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155) {
+      return "ethereum";
+    }
+    if (chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) {
+      return "solana";
+    }
+    throw index.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
+    // (e.g. modal) can switch from a "connecting" loader to an "authorizing" prompt while the
+    // user reviews the signature request inside their wallet. Emitted on the isolated wallet
+    // connector (not the auth connector) so it doesn't mutate the global SDK status.
+    connector.emit(constants.CONNECTOR_EVENTS.AUTHORIZING, {
+      connector: connector.name
+    });
+    const {
+      challenge,
+      signature,
+      chainNamespace
+    } = await connector.generateChallengeAndSign();
+    const address = await this.getLinkingWalletAddress(connector, chainNamespace);
+    if (chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155) {
+      return {
+        address,
+        challenge,
+        signature,
+        signatureType: "eip191",
+        network: "ethereum"
+      };
+    }
+    if (chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) {
+      return {
+        address,
+        challenge,
+        signature,
+        signatureType: "sip99",
+        network: "solana"
+      };
+    }
+    throw index.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.");
+      }
+      return address;
+    }
+    if (!connector.provider) {
+      throw index.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.");
+    }
+    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() {
@@ -345,7 +765,7 @@ class AuthConnector extends baseConnector.BaseConnector {
       // when useSFAKey is set to true.
       // This is to ensure that when there is no user session active, we don't throw an exception.
       if (this.authInstance.privKey && !this.authInstance.coreKitKey) {
-        throw index$1.WalletLoginError.sfaKeyNotFound();
+        throw index.WalletLoginError.sfaKeyNotFound();
       }
       finalPrivKey = this.authInstance.coreKitKey;
     }
@@ -353,9 +773,9 @@ class AuthConnector extends baseConnector.BaseConnector {
   }
   async connectWithProvider(params) {
     var _this$authInstance, _params$extraLoginOpt, _this$authInstance2, _this$authInstance3;
-    if (!this.authInstance) throw index$1.WalletInitializationError.notReady("authInstance is not ready");
+    if (!this.authInstance) throw index.WalletInitializationError.notReady("authInstance is not ready");
     const chainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId);
-    if (!chainConfig) throw index$1.WalletLoginError.connectionError("Chain config is not available");
+    if (!chainConfig) throw index.WalletLoginError.connectionError("Chain config is not available");
     const {
       chainNamespace
     } = chainConfig;
@@ -381,7 +801,7 @@ class AuthConnector extends baseConnector.BaseConnector {
       if (this.authInstance.sessionId) {
         await this.authInstance.logout();
       }
-      throw index$1.WalletLoginError.sfaKeyNotFound("This typically occurs when the authentication method used does not provide SFA keys (e.g., default auth connection).");
+      throw index.WalletLoginError.sfaKeyNotFound("This typically occurs when the authentication method used does not provide SFA keys (e.g., default auth connection).");
     }
     // setup WS embed if chainNamespace is EIP155 or SOLANA
     if (chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 || chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) {
@@ -393,19 +813,19 @@ 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
           this.status = constants.CONNECTOR_STATUS.CONNECTED;
           this.emit(constants.CONNECTOR_EVENTS.CONNECTED, {
-            connectorName: index.WALLET_CONNECTORS.AUTH,
+            connectorName: index$1.WALLET_CONNECTORS.AUTH,
             reconnected: this.rehydrated,
             ethereumProvider: this.provider,
             solanaWallet: this._solanaWallet
@@ -413,12 +833,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 {
@@ -428,7 +842,7 @@ class AuthConnector extends baseConnector.BaseConnector {
         await this.privateKeyProvider.setupProvider(finalPrivKey, params.chainId);
         this.status = constants.CONNECTOR_STATUS.CONNECTED;
         this.emit(constants.CONNECTOR_EVENTS.CONNECTED, {
-          connectorName: index.WALLET_CONNECTORS.AUTH,
+          connectorName: index$1.WALLET_CONNECTORS.AUTH,
           ethereumProvider: this.provider,
           solanaWallet: this._solanaWallet,
           reconnected: this.rehydrated
@@ -443,7 +857,7 @@ class AuthConnector extends baseConnector.BaseConnector {
       authConnectionId: params.authConnectionId,
       groupedAuthConnectionId: params.groupedAuthConnectionId
     });
-    if (!(providerConfig !== null && providerConfig !== void 0 && providerConfig.authConnection)) throw index$1.WalletLoginError.connectionError("Invalid auth connection.");
+    if (!(providerConfig !== null && providerConfig !== void 0 && providerConfig.authConnection)) throw index.WalletLoginError.connectionError("Invalid auth connection.");
     const jwtParams = _objectSpread(_objectSpread(_objectSpread({}, providerConfig.jwtParameters || {}), params.extraLoginOptions || {}), {}, {
       login_hint: params.loginHint || ((_params$extraLoginOpt3 = params.extraLoginOptions) === null || _params$extraLoginOpt3 === void 0 ? void 0 : _params$extraLoginOpt3.login_hint)
     });
@@ -518,25 +932,21 @@ 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) {
           securePubSub$1.cleanup();
           this.authInstance.postLoginCancelledMessage(nonce);
-          reject(index$1.WalletLoginError.popupClosed());
+          reject(index.WalletLoginError.popupClosed());
         }
       });
       this.authInstance.postLoginInitiatedMessage(loginParams, nonce).then(resolve).catch(error => {
-        this.auditOAuditProgress(loginParams, "failed").catch(error => {
-          loglevel.log.error("Error reporting `oauthFailed` audit progress", error);
-        });
-        if (error instanceof index$1.Web3AuthError) {
+        this.reportFailedOauthAudit(loginParams);
+        if (error instanceof index.Web3AuthError) {
           throw error;
         }
-        reject(index$1.WalletLoginError.connectionError(error instanceof Error ? error.message : error || "Failed to login with social"));
+        reject(index.WalletLoginError.connectionError(error instanceof Error ? error.message : error || "Failed to login with social"));
       });
     });
   }
@@ -549,7 +959,7 @@ class AuthConnector extends baseConnector.BaseConnector {
     return this.authInstance.getAccessToken();
   }
   async getIdToken() {
-    if (!this.authInstance) throw index$1.WalletInitializationError.notReady("authInstance is not ready");
+    if (!this.authInstance) throw index.WalletInitializationError.notReady("authInstance is not ready");
     return this.authInstance.authSessionManager.getIdToken();
   }
   getOriginData() {
@@ -582,7 +992,7 @@ class AuthConnector extends baseConnector.BaseConnector {
     });
     // throw error only when we cannot find the login config and authConnectionId is not provided in the params.
     // otherwise, we will use the params to create a new auth connection config in the auth instance.
-    if (!(loginConfig !== null && loginConfig !== void 0 && loginConfig.authConnection) && !params.authConnectionId) throw index$1.WalletLoginError.connectionError("Invalid auth connection.");
+    if (!(loginConfig !== null && loginConfig !== void 0 && loginConfig.authConnection) && !params.authConnectionId) throw index.WalletLoginError.connectionError("Invalid auth connection.");
     if (!(loginConfig !== null && loginConfig !== void 0 && loginConfig.authConnection)) {
       this.authInstance.options.authConnectionConfig.push({
         authConnection: params.authConnection,
@@ -602,7 +1012,7 @@ class AuthConnector extends baseConnector.BaseConnector {
       } = utils$1.parseToken(params.extraLoginOptions.id_token);
       finalUserId = auth.getUserId(payload, loginParams.authConnection, finalExtraLoginOptions.userIdField, finalExtraLoginOptions.isUserIdCaseSensitive);
     } else {
-      throw index$1.WalletLoginError.connectionError("Invalid login hint or id_token");
+      throw index.WalletLoginError.connectionError("Invalid login hint or id_token");
     }
     // Adds the login_hint to the extraLoginOptions.
     loginParams.extraLoginOptions = _objectSpread(_objectSpread({}, finalExtraLoginOptions), {}, {
@@ -646,11 +1056,17 @@ 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 ({
     projectConfig,
-    coreOptions
+    coreOptions,
+    analytics
   }) => {
     var _coreOptions$uiConfig, _coreOptions$walletSe, _coreOptions$walletSe2, _coreOptions$walletSe3;
     // Connector settings
@@ -692,9 +1108,24 @@ const authConnector = params => {
         mfaLevel: coreOptions.mfaLevel
       }),
       coreOptions,
+      analytics,
       authConnectionConfig: projectConfig.embeddedWalletAuth
     });
   };
 };
+function isAuthConnector(connector) {
+  if (!connector || connector.name !== index$1.WALLET_CONNECTORS.AUTH) {
+    return false;
+  }
+  const maybeAuthConnector = connector;
+  return typeof maybeAuthConnector.switchAccount === "function" && typeof maybeAuthConnector.linkAccount === "function" && typeof maybeAuthConnector.unlinkAccount === "function";
+}
+function assertAuthConnector(connector, errorMessage = "Account linking is only supported when connected with the AUTH connector.") {
+  if (!isAuthConnector(connector)) {
+    throw index.WalletLoginError.unsupportedOperation(errorMessage);
+  }
+}
 
+exports.assertAuthConnector = assertAuthConnector;
 exports.authConnector = authConnector;
+exports.isAuthConnector = isAuthConnector;