@web3auth/no-modal 11.0.2 → 11.2.0

package/dist/lib.cjs/vue/solana/provider.js

@@ -10,13 +10,12 @@ var baseControllers = require('@toruslabs/base-controllers');
 require('@toruslabs/session-manager');
 require('@web3auth/auth');
 require('../../base/errors/index.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
-require('../../base/constants.js');
+var utils = require('../../base/utils.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
 require('../../base/connector/constants.js');
 require('jwt-decode');
+require('../../base/constants.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
 var useChain = require('../composables/useChain.js');
@@ -24,17 +23,28 @@ var useWeb3Auth = require('../composables/useWeb3Auth.js');
 var constants = require('./constants.js');
 
 const disposeClient = async client => {
-  try {
-    await client.actions.disconnectWallet();
-  } catch (e) {
-    loglevel.log.warn("Solana client disconnect", e);
-  }
   client.destroy();
 };
+const resolveSolanaChain = (web3Auth, connection) => {
+  var _web3Auth$coreOptions2;
+  const currentChain = web3Auth === null || web3Auth === void 0 ? void 0 : web3Auth.currentChain;
+  if ((currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) === baseControllers.CHAIN_NAMESPACES.SOLANA) {
+    return currentChain;
+  }
+  const connectedScope = connection !== null && connection !== void 0 && connection.solanaWallet && "scope" in connection.solanaWallet && typeof connection.solanaWallet.scope === "string" ? connection.solanaWallet.scope : null;
+  if (connectedScope) {
+    var _web3Auth$coreOptions;
+    const connectedChain = web3Auth === null || web3Auth === void 0 || (_web3Auth$coreOptions = web3Auth.coreOptions.chains) === null || _web3Auth$coreOptions === void 0 ? void 0 : _web3Auth$coreOptions.find(chain => {
+      return chain.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA && utils.getCaipChainId(chain) === connectedScope;
+    });
+    if (connectedChain) return connectedChain;
+  }
+  return (web3Auth === null || web3Auth === void 0 || (_web3Auth$coreOptions2 = web3Auth.coreOptions.chains) === null || _web3Auth$coreOptions2 === void 0 ? void 0 : _web3Auth$coreOptions2.find(chain => chain.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA)) || null;
+};
 /**
  * Syncs Web3Auth Solana connection with Framework Kit client.
- * When user is connected via Web3Auth and current chain is Solana, creates a Framework Kit client
- * with Web3Auth as the wallet connector and connects it (same pattern as Wagmi provider).
+ * For multichain wallets, keep the Solana client warm across namespace switches so
+ * switching back to Solana can reuse the existing wallet session.
  */
 const SolanaProvider = vue.defineComponent({
   name: "SolanaProvider",
@@ -50,6 +60,8 @@ const SolanaProvider = vue.defineComponent({
       chainId
     } = useChain.useChain();
     const clientRef = vue.ref(null);
+    let connectedClient = null;
+    // let connectedClientKey: string | null = null;
     // Holds the token for the newest requested sync run. Older async runs compare against it
     // before publishing results so a slower reconnect cannot overwrite a newer chain/account update.
     let activeSyncToken = null;
@@ -64,21 +76,26 @@ const SolanaProvider = vue.defineComponent({
       const newIsConnected = isConnected.value;
       const newConnection = connection.value;
       const currentChain = (_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.currentChain;
-      if (!newIsConnected || !(newConnection !== null && newConnection !== void 0 && newConnection.solanaWallet) || (currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) !== baseControllers.CHAIN_NAMESPACES.SOLANA ||
-      // only reconnect for the primary connector
-      newConnection.connectorName !== ((_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 ? void 0 : _web3Auth$value2.primaryConnectorName)) {
-        const prevClient = clientRef.value;
+      if ((currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) !== baseControllers.CHAIN_NAMESPACES.SOLANA) {
+        // Mirror the React provider behavior: hide the live Solana client from injected
+        // consumers whenever Web3Auth is currently scoped to a non-Solana namespace.
+        clientRef.value = null;
+        return;
+      }
+      const preferredSolanaChain = resolveSolanaChain(web3Auth.value, newConnection);
+      const shouldKeepSolanaClient = newIsConnected && Boolean(newConnection === null || newConnection === void 0 ? void 0 : newConnection.solanaWallet) && Boolean(preferredSolanaChain) &&
+      // only manage the client for the primary connector
+      (newConnection === null || newConnection === void 0 ? void 0 : newConnection.connectorName) === ((_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 ? void 0 : _web3Auth$value2.primaryConnectorName);
+      if (!shouldKeepSolanaClient) {
         clientRef.value = null;
+        const prevClient = connectedClient;
+        connectedClient = null;
+        // connectedClientKey = null;
         if (prevClient) {
           await disposeClient(prevClient);
         }
         return;
       }
-      const prevClient = clientRef.value;
-      clientRef.value = null;
-      if (prevClient) {
-        await disposeClient(prevClient);
-      }
       let client$1 = null;
       try {
         // create a wallet standard connector from connected wallet
@@ -91,7 +108,7 @@ const SolanaProvider = vue.defineComponent({
         const {
           rpcTarget,
           wsTarget
-        } = currentChain;
+        } = preferredSolanaChain;
         client$1 = client.createClient({
           endpoint: rpcTarget,
           websocketEndpoint: wsTarget,
@@ -106,7 +123,13 @@ const SolanaProvider = vue.defineComponent({
           await disposeClient(client$1);
           return;
         }
-        clientRef.value = client$1;
+        const prevClient = connectedClient;
+        connectedClient = client$1;
+        // connectedClientKey = nextClientKey;
+        clientRef.value = (currentChain === null || currentChain === void 0 ? void 0 : currentChain.chainNamespace) === baseControllers.CHAIN_NAMESPACES.SOLANA ? client$1 : null;
+        if (prevClient) {
+          await disposeClient(prevClient);
+        }
       } catch (err) {
         if (client$1) {
           await disposeClient(client$1);
@@ -124,6 +147,17 @@ const SolanaProvider = vue.defineComponent({
     }, {
       immediate: true
     });
+    vue.onBeforeUnmount(() => {
+      const publishedClient = clientRef.value;
+      clientRef.value = null;
+      const prevClient = connectedClient;
+      connectedClient = null;
+      if (prevClient) {
+        void disposeClient(prevClient);
+      } else if (publishedClient) {
+        void disposeClient(publishedClient);
+      }
+    });
     return () => {
       var _slots$default, _slots$default2;
       return vue.h(vue.Fragment, null, (_slots$default = (_slots$default2 = slots.default) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)) !== null && _slots$default !== void 0 ? _slots$default : []);

package/dist/lib.cjs/vue/useWeb3AuthInnerContextValue.js

@@ -161,6 +161,14 @@ function useWeb3AuthInnerContextValue({
       chainId.value = web3Auth.value.currentChainId;
       chainNamespace.value = (_web3Auth$value$curre7 = (_web3Auth$value$curre8 = web3Auth.value.currentChain) === null || _web3Auth$value$curre8 === void 0 ? void 0 : _web3Auth$value$curre8.chainNamespace) !== null && _web3Auth$value$curre7 !== void 0 ? _web3Auth$value$curre7 : null;
     };
+    const connectorDataUpdatedListener = data => {
+      const updatedData = data.data;
+      if (updatedData.chainId && chainId.value !== updatedData.chainId) {
+        var _web3Auth$value$curre9;
+        chainId.value = updatedData.chainId;
+        chainNamespace.value = (_web3Auth$value$curre9 = web3Auth.value.currentChain) === null || _web3Auth$value$curre9 === void 0 ? void 0 : _web3Auth$value$curre9.chainNamespace;
+      }
+    };
     if (prevWeb3Auth && newWeb3Auth !== prevWeb3Auth) {
       prevWeb3Auth.removeListener(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
       prevWeb3Auth.removeListener(constants.CONNECTOR_EVENTS.READY, readyListener);
@@ -172,6 +180,7 @@ function useWeb3AuthInnerContextValue({
       prevWeb3Auth.removeListener(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, errorListener);
       prevWeb3Auth.removeListener(constants.CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
       prevWeb3Auth.removeListener(constants.CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
+      prevWeb3Auth.removeListener(constants.CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, connectorDataUpdatedListener);
       if (prevWeb3Auth.loginMode === constants$1.LOGIN_MODE.MODAL) {
         prevWeb3Auth.removeListener(constants.CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
       }
@@ -188,6 +197,7 @@ function useWeb3AuthInnerContextValue({
       newWeb3Auth.on(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, errorListener);
       newWeb3Auth.on(constants.CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
       newWeb3Auth.on(constants.CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
+      newWeb3Auth.on(constants.CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, connectorDataUpdatedListener);
       if (newWeb3Auth.loginMode === constants$1.LOGIN_MODE.MODAL) {
         newWeb3Auth.on(constants.CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
       }
@@ -198,9 +208,9 @@ function useWeb3AuthInnerContextValue({
   vue.watch(connection, (newConnection, prevConnection) => {
     var _prevConnection$ether, _newConnection$ethere;
     const handleChainChange = newChainId => {
-      var _web3Auth$value$curre9, _web3Auth$value;
+      var _web3Auth$value$curre0, _web3Auth$value;
       chainId.value = newChainId;
-      chainNamespace.value = (_web3Auth$value$curre9 = (_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 || (_web3Auth$value = _web3Auth$value.currentChain) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.chainNamespace) !== null && _web3Auth$value$curre9 !== void 0 ? _web3Auth$value$curre9 : null;
+      chainNamespace.value = (_web3Auth$value$curre0 = (_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 || (_web3Auth$value = _web3Auth$value.currentChain) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.chainNamespace) !== null && _web3Auth$value$curre0 !== void 0 ? _web3Auth$value$curre0 : null;
     };
     const prevProvider = (_prevConnection$ether = prevConnection === null || prevConnection === void 0 ? void 0 : prevConnection.ethereumProvider) !== null && _prevConnection$ether !== void 0 ? _prevConnection$ether : null;
     const newProvider = (_newConnection$ethere = newConnection === null || newConnection === void 0 ? void 0 : newConnection.ethereumProvider) !== null && _newConnection$ethere !== void 0 ? _newConnection$ethere : null;

package/dist/lib.esm/base/connector/baseConnector.js

@@ -130,17 +130,28 @@ class BaseConnector extends SafeEventEmitter {
     return cached;
   }
   async verifyAndAuthorize(params) {
-    const tokens = await verifySignedChallenge({
-      chainNamespace: params.chainNamespace,
-      signedMessage: params.signedMessage,
-      challenge: params.challenge,
-      connector: this.name,
-      authServer: params.authServer,
-      web3AuthClientId: this.coreOptions.clientId,
-      web3AuthNetwork: this.coreOptions.web3AuthNetwork,
-      sessionTimeout: this.coreOptions.sessionTime,
-      deviceInfo: getDeviceInfo()
-    });
+    let tokens;
+    try {
+      tokens = await verifySignedChallenge({
+        chainNamespace: params.chainNamespace,
+        signedMessage: params.signedMessage,
+        challenge: params.challenge,
+        connector: this.name,
+        authServer: params.authServer,
+        web3AuthClientId: this.coreOptions.clientId,
+        web3AuthNetwork: this.coreOptions.web3AuthNetwork,
+        sessionTimeout: this.coreOptions.sessionTime,
+        deviceInfo: getDeviceInfo()
+      });
+    } catch (error) {
+      if (error instanceof Response && error.status === 401) {
+        const body = await error.clone().json().catch(() => ({}));
+        if (body.message === "ACCESS_CONTROL_DENIED") {
+          throw WalletLoginError.userBlocked("User is blocked by the application", error);
+        }
+      }
+      throw error;
+    }
     await this.saveAuthTokenInfo(tokens);
     const tokenInfo = {
       idToken: tokens.idToken,
@@ -154,6 +165,26 @@ class BaseConnector extends SafeEventEmitter {
     });
     return tokenInfo;
   }
+  async authorizeOrDisconnect(getAuthTokenInfo, chainId) {
+    if (!getAuthTokenInfo) return;
+    try {
+      await this.getAuthTokenInfo(chainId);
+    } catch (error) {
+      log.error("Authorization failed after connect; disconnecting wallet to keep state consistent", error);
+      const wasRehydrated = this.rehydrated;
+      try {
+        // getAuthTokenInfo moved status to AUTHORIZING; restore CONNECTED so disconnect requirements pass.
+        if (!this.connected) this.status = CONNECTOR_STATUS.CONNECTED;
+        await this.disconnect();
+      } catch (disconnectError) {
+        log.error("Failed to disconnect wallet after authorization error", disconnectError);
+      } finally {
+        // disconnect() resets rehydrated=false; restore so caller catch emits the right event.
+        this.rehydrated = wasRehydrated;
+      }
+      throw error;
+    }
+  }
   async clearWalletSession() {
     if (!this.authSessionManager) return;
     try {

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

@@ -163,6 +163,9 @@ class WalletLoginError extends Web3AuthError {
   static userNotLoggedIn(extraMessage = "", cause) {
     return WalletLoginError.fromCode(5119, extraMessage, cause);
   }
+  static userBlocked(extraMessage = "", cause) {
+    return WalletLoginError.fromCode(5120, extraMessage, cause);
+  }
 }
 _defineProperty(WalletLoginError, "messages", {
   5000: "Custom",
@@ -174,7 +177,8 @@ _defineProperty(WalletLoginError, "messages", {
   5116: "Chain config has not been added. Please add the chain config before calling switchChain",
   5117: "Unsupported operation",
   5118: "useSFAKey flag is enabled but SFA key is not available",
-  5119: "User not logged in."
+  5119: "User not logged in.",
+  5120: "User is blocked by the application"
 });
 class WalletOperationsError extends Web3AuthError {
   constructor(code, message, cause) {

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

@@ -149,7 +149,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.2";
+const sdkVersion = "11.2.0";
 const getErrorAnalyticsProperties = error => {
   try {
     const code = error instanceof Web3AuthError ? error.code : error === null || error === void 0 ? void 0 : error.code;

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

@@ -206,7 +206,8 @@ class AuthConnector extends BaseConnector {
       return {
         ethereumProvider: this.provider,
         solanaWallet: this._solanaWallet,
-        connectorName: this.name
+        connectorName: this.name,
+        connectorNamespace: this.connectorNamespace
       };
     } catch (error) {
       var _message;
@@ -370,11 +371,9 @@ class AuthConnector extends BaseConnector {
     }
   }
   async cleanup() {
-    if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
-    await this.authInstance.cleanup();
-    if (this.wsEmbedInstance) {
-      this.wsEmbedInstance.clearInit();
-    }
+    var _this$authInstance, _this$wsEmbedInstance2;
+    await ((_this$authInstance = this.authInstance) === null || _this$authInstance === void 0 ? void 0 : _this$authInstance.cleanup());
+    (_this$wsEmbedInstance2 = this.wsEmbedInstance) === null || _this$wsEmbedInstance2 === void 0 || _this$wsEmbedInstance2.clearInit();
     this._solanaWallet = null;
     this.unbindWsEmbedProviderEvents();
   }
@@ -740,8 +739,8 @@ 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;
+    var _ref, _this$wsEmbedInstance3;
+    return (_ref = (_this$wsEmbedInstance3 = this.wsEmbedInstance) === null || _this$wsEmbedInstance3 === void 0 ? void 0 : _this$wsEmbedInstance3.provider) !== null && _ref !== void 0 ? _ref : null;
   }
   bindWsEmbedProviderEvents() {
     const rawProvider = this.getWsEmbedProvider();
@@ -786,7 +785,7 @@ class AuthConnector extends BaseConnector {
     return finalPrivKey;
   }
   async connectWithProvider(params) {
-    var _this$authInstance, _params$extraLoginOpt, _this$authInstance2, _this$authInstance3;
+    var _this$authInstance2, _params$extraLoginOpt, _this$authInstance3, _this$authInstance4;
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     const chainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId);
     if (!chainConfig) throw WalletLoginError.connectionError("Chain config is not available");
@@ -795,7 +794,7 @@ class AuthConnector extends BaseConnector {
     } = chainConfig;
 
     // if not logged in then login
-    const keyAvailable = chainNamespace === CHAIN_NAMESPACES.EIP155 || chainNamespace === CHAIN_NAMESPACES.SOLANA ? (_this$authInstance = this.authInstance) === null || _this$authInstance === void 0 ? void 0 : _this$authInstance.sessionId : this._getFinalPrivKey();
+    const keyAvailable = chainNamespace === CHAIN_NAMESPACES.EIP155 || chainNamespace === CHAIN_NAMESPACES.SOLANA ? (_this$authInstance2 = this.authInstance) === null || _this$authInstance2 === void 0 ? void 0 : _this$authInstance2.sessionId : this._getFinalPrivKey();
     if (params.idToken) params.extraLoginOptions = _objectSpread(_objectSpread({}, params.extraLoginOptions), {}, {
       id_token: params.idToken
     });
@@ -812,14 +811,14 @@ class AuthConnector extends BaseConnector {
     }
 
     // if useSFAKey is true and privKey is available but coreKitKey is not available, throw an error
-    if (this.coreOptions.useSFAKey && (_this$authInstance2 = this.authInstance) !== null && _this$authInstance2 !== void 0 && _this$authInstance2.privKey && !((_this$authInstance3 = this.authInstance) !== null && _this$authInstance3 !== void 0 && _this$authInstance3.coreKitKey)) {
+    if (this.coreOptions.useSFAKey && (_this$authInstance3 = this.authInstance) !== null && _this$authInstance3 !== void 0 && _this$authInstance3.privKey && !((_this$authInstance4 = this.authInstance) !== null && _this$authInstance4 !== void 0 && _this$authInstance4.coreKitKey)) {
       // If the user is already logged in, logout and throw an error
       if (this.authInstance.sessionId) {
         await this.authInstance.logout();
       }
       throw WalletLoginError.sfaKeyNotFound("This typically occurs when the authentication method used does not provide SFA keys (e.g., default auth connection).");
     }
-
+    const connectorNamespace = this.connectorNamespace;
     // setup WS embed if chainNamespace is EIP155 or SOLANA
     if (chainNamespace === CHAIN_NAMESPACES.EIP155 || chainNamespace === CHAIN_NAMESPACES.SOLANA) {
       // wait for ws embed instance to be ready.
@@ -845,7 +844,8 @@ class AuthConnector extends BaseConnector {
             connectorName: WALLET_CONNECTORS.AUTH,
             reconnected: this.rehydrated,
             ethereumProvider: this.provider,
-            solanaWallet: this._solanaWallet
+            solanaWallet: this._solanaWallet,
+            connectorNamespace
           });
           if (params.getAuthTokenInfo) {
             await this.getAuthTokenInfo();
@@ -862,7 +862,8 @@ class AuthConnector extends BaseConnector {
           connectorName: WALLET_CONNECTORS.AUTH,
           ethereumProvider: this.provider,
           solanaWallet: this._solanaWallet,
-          reconnected: this.rehydrated
+          reconnected: this.rehydrated,
+          connectorNamespace
         });
       }
     }
@@ -965,7 +966,12 @@ class AuthConnector extends BaseConnector {
         if (error instanceof Web3AuthError) {
           throw error;
         }
-        reject(WalletLoginError.connectionError(error instanceof Error ? error.message : error || "Failed to login with social"));
+        const errorMessage = error instanceof Error ? error.message : error;
+        if (errorMessage === "Access control denied") {
+          reject(WalletLoginError.userBlocked(errorMessage, error));
+          return;
+        }
+        reject(WalletLoginError.connectionError(errorMessage || "Failed to login with social"));
       });
     });
   }

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

@@ -99,15 +99,15 @@ class CoinbaseConnector extends BaseEvmConnector {
         connectorName: WALLET_CONNECTORS.COINBASE,
         reconnected: this.rehydrated,
         ethereumProvider: this.provider,
-        solanaWallet: null
+        solanaWallet: null,
+        connectorNamespace: this.connectorNamespace
       });
-      if (getAuthTokenInfo) {
-        await this.getAuthTokenInfo();
-      }
+      await this.authorizeOrDisconnect(getAuthTokenInfo);
       return {
         ethereumProvider: this.provider,
         solanaWallet: null,
-        connectorName: this.name
+        connectorName: this.name,
+        connectorNamespace: this.connectorNamespace
       };
     } catch (error) {
       // ready again to be connected

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

@@ -89,19 +89,20 @@ class InjectedEvmConnector extends BaseEvmConnector {
         }
       };
       this.injectedProvider.on("accountsChanged", accountDisconnectHandler);
+      const connectorNamespace = this.connectorNamespace;
       this.emit(CONNECTOR_EVENTS.CONNECTED, {
         connectorName: this.name,
         reconnected: this.rehydrated,
         ethereumProvider: this.injectedProvider,
-        solanaWallet: null
+        solanaWallet: null,
+        connectorNamespace
       });
-      if (getAuthTokenInfo) {
-        await this.getAuthTokenInfo();
-      }
+      await this.authorizeOrDisconnect(getAuthTokenInfo);
       return {
         ethereumProvider: this.injectedProvider,
         solanaWallet: null,
-        connectorName: this.name
+        connectorName: this.name,
+        connectorNamespace
       };
     } catch (error) {
       // ready again to be connected

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

@@ -76,19 +76,20 @@ class WalletStandardConnector extends BaseSolanaConnector {
       }
       if (this.wallet.accounts.length === 0) throw WalletLoginError.connectionError();
       this.status = CONNECTOR_STATUS.CONNECTED;
+      const connectorNamespace = this.connectorNamespace;
       this.emit(CONNECTOR_EVENTS.CONNECTED, {
         connectorName: this.name,
         reconnected: this.rehydrated,
         ethereumProvider: null,
-        solanaWallet: this.solanaWallet
+        solanaWallet: this.solanaWallet,
+        connectorNamespace
       });
-      if (getAuthTokenInfo) {
-        await this.getAuthTokenInfo();
-      }
+      await this.authorizeOrDisconnect(getAuthTokenInfo);
       return {
         ethereumProvider: null,
         solanaWallet: this.solanaWallet,
-        connectorName: this.name
+        connectorName: this.name,
+        connectorNamespace
       };
     } catch (error) {
       // ready again to be connected