@web3auth/no-modal 10.9.0 → 10.10.0

package/dist/lib.cjs/vue/solana/composables/useSignTransaction.js

@@ -1,7 +1,21 @@
 'use strict';
 
 var vue = require('vue');
+require('@babel/runtime/helpers/objectSpread2');
+require('@babel/runtime/helpers/defineProperty');
+require('@segment/analytics-next');
+var loglevel = require('../../../base/loglevel.js');
+require('@toruslabs/base-controllers');
+require('@web3auth/auth');
 var index = require('../../../base/errors/index.js');
+require('../../../base/wallet/index.js');
+require('../../../base/connector/connectorStatus.js');
+require('../../../base/connector/constants.js');
+require('jwt-decode');
+require('../../../base/plugin/errors.js');
+require('../../../base/plugin/IPlugin.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
 var useSolanaWallet = require('./useSolanaWallet.js');
 
 const useSignTransaction = () => {
@@ -20,6 +34,7 @@ const useSignTransaction = () => {
       data.value = signedTransaction;
       return signedTransaction;
     } catch (err) {
+      loglevel.log.error("Error signing transaction", err);
       error.value = err;
     } finally {
       loading.value = false;

package/dist/lib.cjs/vue/solana/composables/useSolanaWallet.js

@@ -12,6 +12,7 @@ require('../../../base/loglevel.js');
 require('@web3auth/auth');
 require('../../../base/errors/index.js');
 require('../../../base/wallet/index.js');
+require('../../../base/connector/connectorStatus.js');
 require('../../../base/connector/constants.js');
 require('jwt-decode');
 require('../../../base/plugin/errors.js');

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

@@ -13,6 +13,7 @@ var loglevel = require('../../base/loglevel.js');
 var baseControllers = require('@toruslabs/base-controllers');
 var index = require('../../base/errors/index.js');
 require('../../base/wallet/index.js');
+require('../../base/connector/connectorStatus.js');
 require('../../base/connector/constants.js');
 require('jwt-decode');
 require('../../base/plugin/errors.js');

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

@@ -3,6 +3,7 @@ import { SafeEventEmitter } from '@web3auth/auth';
 import { CONNECTOR_NAMESPACES } from '../chain/IChainInterface.js';
 import { WalletInitializationError, WalletLoginError } from '../errors/index.js';
 import { WALLET_CONNECTORS } from '../wallet/index.js';
+import { CONNECTED_STATUSES, CAN_AUTHORIZE_STATUSES } from './connectorStatus.js';
 import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from './constants.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 
@@ -20,15 +21,18 @@ class BaseConnector extends SafeEventEmitter {
     _defineProperty(this, "status", void 0);
     this.coreOptions = options.coreOptions;
   }
-  get connnected() {
-    return this.status === CONNECTOR_STATUS.CONNECTED;
+  get connected() {
+    return CONNECTED_STATUSES.includes(this.status);
+  }
+  get canAuthorize() {
+    return CAN_AUTHORIZE_STATUSES.includes(this.status);
   }
   checkConnectionRequirements() {
     // we reconnect without killing existing Wallet Connect or Metamask Connect session on calling connect again.
     if (this.name === WALLET_CONNECTORS.WALLET_CONNECT_V2 && this.status === CONNECTOR_STATUS.CONNECTING) return;
     if (this.name === WALLET_CONNECTORS.METAMASK && !this.isInjected && this.status === CONNECTOR_STATUS.CONNECTING) return;
     if (this.status === CONNECTOR_STATUS.CONNECTING) throw WalletInitializationError.notReady("Already connecting");
-    if (this.status === CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.connectionError("Already connected");
+    if (this.connected) throw WalletLoginError.connectionError("Already connected");
     if (this.status !== CONNECTOR_STATUS.READY) throw WalletLoginError.connectionError("Wallet connector is not ready yet, Please wait for init function to resolve before calling connect/connectTo function");
   }
   checkInitializationRequirements({
@@ -44,11 +48,11 @@ class BaseConnector extends SafeEventEmitter {
     }
     if (this.connectorNamespace !== CONNECTOR_NAMESPACES.MULTICHAIN && this.connectorNamespace !== chainConfig.chainNamespace) throw WalletInitializationError.invalidParams("Connector doesn't support this chain namespace");
     if (this.status === CONNECTOR_STATUS.NOT_READY) return;
-    if (this.status === CONNECTOR_STATUS.CONNECTED) throw WalletInitializationError.notReady("Already connected");
+    if (this.connected) throw WalletInitializationError.notReady("Already connected");
     if (this.status === CONNECTOR_STATUS.READY) throw WalletInitializationError.notReady("Connector is already initialized");
   }
   checkDisconnectionRequirements() {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.disconnectionError("Not connected with wallet");
+    if (!this.connected) throw WalletLoginError.disconnectionError("Not connected with wallet");
   }
   checkSwitchChainRequirements(params, init = false) {
     if (!init && !this.provider) throw WalletLoginError.notConnectedError("Not connected with wallet.");

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

@@ -0,0 +1,6 @@
+import { CONNECTOR_STATUS } from './constants.js';
+
+const CONNECTED_STATUSES = [CONNECTOR_STATUS.CONNECTED, CONNECTOR_STATUS.AUTHORIZED];
+const CAN_AUTHORIZE_STATUSES = [CONNECTOR_STATUS.AUTHORIZING, CONNECTOR_STATUS.AUTHORIZED, CONNECTOR_STATUS.CONNECTED];
+
+export { CAN_AUTHORIZE_STATUSES, CONNECTED_STATUSES };

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

@@ -7,7 +7,9 @@ const CONNECTOR_STATUS = {
   CONNECTED: "connected",
   DISCONNECTING: "disconnecting",
   DISCONNECTED: "disconnected",
-  ERRORED: "errored"
+  ERRORED: "errored",
+  AUTHORIZED: "authorized",
+  AUTHORIZING: "authorizing"
 };
 const CONNECTOR_EVENTS = _objectSpread(_objectSpread({}, CONNECTOR_STATUS), {}, {
   CONNECTOR_DATA_UPDATED: "connector_data_updated",
@@ -20,5 +22,9 @@ const CONNECTOR_CATEGORY = {
   EXTERNAL: "external",
   IN_APP: "in_app"
 };
+const CONNECTOR_INITIAL_AUTHENTICATION_MODE = {
+  CONNECT_ONLY: "connect-only",
+  CONNECT_AND_SIGN: "connect-and-sign"
+};
 
-export { CONNECTOR_CATEGORY, CONNECTOR_EVENTS, CONNECTOR_STATUS };
+export { CONNECTOR_CATEGORY, CONNECTOR_EVENTS, CONNECTOR_INITIAL_AUTHENTICATION_MODE, CONNECTOR_STATUS };

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

@@ -146,7 +146,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 = "10.9.0";
+const sdkVersion = "10.10.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

@@ -10,6 +10,7 @@ import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
 import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
 import { WalletInitializationError, WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
 import { log } from '../../base/loglevel.js';
+import { CONNECTED_STATUSES } from '../../base/connector/connectorStatus.js';
 import { CHAIN_NAMESPACES, cloneDeep } from '@toruslabs/base-controllers';
 import '@toruslabs/constants';
 import '@toruslabs/http-helpers';
@@ -143,7 +144,7 @@ class AuthConnector extends BaseConnector {
         this.rehydrated = true;
         await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
       } else if (!sessionId && options.autoConnect) {
         // if here, this means that the connector is cached but the sessionId is not available.
@@ -181,7 +182,7 @@ class AuthConnector extends BaseConnector {
   async enableMFA(params = {
     authConnection: ""
   }) {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     try {
       const result = await this.authInstance.enableMFA(params);
@@ -198,7 +199,7 @@ class AuthConnector extends BaseConnector {
   async manageMFA(params = {
     authConnection: ""
   }) {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     try {
       await this.authInstance.manageMFA(params);
@@ -213,7 +214,7 @@ class AuthConnector extends BaseConnector {
   async disconnect(options = {
     cleanup: false
   }) {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     this.status = CONNECTOR_STATUS.DISCONNECTING;
     await this.authInstance.logout();
@@ -231,14 +232,25 @@ class AuthConnector extends BaseConnector {
     this.emit(CONNECTOR_EVENTS.DISCONNECTED);
   }
   async getIdentityToken() {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    this.status = CONNECTOR_STATUS.AUTHORIZING;
+    this.emit(CONNECTOR_EVENTS.AUTHORIZING, {
+      connector: WALLET_CONNECTORS.AUTH
+    });
     const userInfo = await this.getUserInfo();
+    this.status = CONNECTOR_STATUS.AUTHORIZED;
+    this.emit(CONNECTOR_EVENTS.AUTHORIZED, {
+      connector: WALLET_CONNECTORS.AUTH,
+      identityTokenInfo: {
+        idToken: userInfo.idToken
+      }
+    });
     return {
       idToken: userInfo.idToken
     };
   }
   async getUserInfo() {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     const userInfo = this.authInstance.getUserInfo();
     return userInfo;
@@ -368,9 +380,6 @@ class AuthConnector extends BaseConnector {
           // if getIdentityToken is true, then get the identity token
           // No need to get the identity token for auth connector as it is already handled
           let identityTokenInfo;
-          if (params.getIdentityToken) {
-            identityTokenInfo = await this.getIdentityToken();
-          }
           this.status = CONNECTOR_STATUS.CONNECTED;
           this.emit(CONNECTOR_EVENTS.CONNECTED, {
             connector: WALLET_CONNECTORS.AUTH,
@@ -378,9 +387,12 @@ class AuthConnector extends BaseConnector {
             provider: this.provider,
             identityTokenInfo
           });
+          if (params.getIdentityToken) {
+            identityTokenInfo = await this.getIdentityToken();
+          }
           // handle disconnect from ws embed
           (_this$wsEmbedInstance3 = this.wsEmbedInstance) === null || _this$wsEmbedInstance3 === void 0 || _this$wsEmbedInstance3.provider.on("accountsChanged", (accounts = []) => {
-            if (accounts.length === 0 && this.status === CONNECTOR_STATUS.CONNECTED) this.disconnect({
+            if (accounts.length === 0 && CONNECTED_STATUSES.includes(this.status)) this.disconnect({
               cleanup: false
             });
           });

package/dist/lib.esm/connectors/base-evm-connector/baseEvmConnector.js

@@ -2,14 +2,18 @@ import { signChallenge, verifySignedChallenge } from '@toruslabs/base-controller
 import { EVM_METHOD_TYPES } from '@web3auth/ws-embed';
 import { getSavedToken, checkIfTokenIsExpired, saveToken, clearToken } from '../../base/connector/utils.js';
 import { BaseConnector } from '../../base/connector/baseConnector.js';
-import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
 import { WalletLoginError, WalletInitializationError } from '../../base/errors/index.js';
+import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
 
 class BaseEvmConnector extends BaseConnector {
   async init(_) {}
   async getIdentityToken() {
-    if (!this.provider || this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError();
+    if (!this.provider || !this.canAuthorize) throw WalletLoginError.notConnectedError();
     if (!this.coreOptions) throw WalletInitializationError.invalidParams("Please initialize Web3Auth with valid options");
+    this.status = CONNECTOR_STATUS.AUTHORIZING;
+    this.emit(CONNECTOR_EVENTS.AUTHORIZING, {
+      connector: this.name
+    });
     const accounts = await this.provider.request({
       method: EVM_METHOD_TYPES.GET_ACCOUNTS
     });
@@ -18,6 +22,13 @@ class BaseEvmConnector extends BaseConnector {
       if (existingToken) {
         const isExpired = checkIfTokenIsExpired(existingToken);
         if (!isExpired) {
+          this.status = CONNECTOR_STATUS.AUTHORIZED;
+          this.emit(CONNECTOR_EVENTS.AUTHORIZED, {
+            connector: this.name,
+            identityTokenInfo: {
+              idToken: existingToken
+            }
+          });
           return {
             idToken: existingToken
           };
@@ -48,6 +59,13 @@ class BaseEvmConnector extends BaseConnector {
       });
       const idToken = await verifySignedChallenge(chainNamespace, signedMessage, challenge, this.name, this.coreOptions.sessionTime, this.coreOptions.clientId, this.coreOptions.web3AuthNetwork);
       saveToken(accounts[0], this.name, idToken);
+      this.status = CONNECTOR_STATUS.AUTHORIZED;
+      this.emit(CONNECTOR_EVENTS.AUTHORIZED, {
+        connector: this.name,
+        identityTokenInfo: {
+          idToken
+        }
+      });
       return {
         idToken
       };

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

@@ -1,15 +1,19 @@
 import { signChallenge, verifySignedChallenge } from '@toruslabs/base-controllers';
 import { SOLANA_METHOD_TYPES } from '@web3auth/ws-embed';
 import { BaseConnector } from '../../base/connector/baseConnector.js';
-import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
 import { WalletLoginError, WalletInitializationError } from '../../base/errors/index.js';
+import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
 import { getSavedToken, checkIfTokenIsExpired, saveToken, clearToken } from '../../base/connector/utils.js';
 
 class BaseSolanaConnector extends BaseConnector {
   async init(_) {}
   async getIdentityToken() {
-    if (!this.provider || this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError();
+    if (!this.provider || !this.canAuthorize) throw WalletLoginError.notConnectedError();
     if (!this.coreOptions) throw WalletInitializationError.invalidParams("Please initialize Web3Auth with a valid options");
+    this.status = CONNECTOR_STATUS.AUTHORIZING;
+    this.emit(CONNECTOR_EVENTS.AUTHORIZING, {
+      connector: this.name
+    });
     const accounts = await this.provider.request({
       method: SOLANA_METHOD_TYPES.GET_ACCOUNTS
     });
@@ -18,6 +22,13 @@ class BaseSolanaConnector extends BaseConnector {
       if (existingToken) {
         const isExpired = checkIfTokenIsExpired(existingToken);
         if (!isExpired) {
+          this.status = CONNECTOR_STATUS.AUTHORIZED;
+          this.emit(CONNECTOR_EVENTS.AUTHORIZED, {
+            connector: this.name,
+            identityTokenInfo: {
+              idToken: existingToken
+            }
+          });
           return {
             idToken: existingToken
           };
@@ -50,6 +61,13 @@ class BaseSolanaConnector extends BaseConnector {
       });
       const idToken = await verifySignedChallenge(chainNamespace, signedMessage, challenge, this.name, this.coreOptions.sessionTime, this.coreOptions.clientId, this.coreOptions.web3AuthNetwork);
       saveToken(accounts[0], this.name, idToken);
+      this.status = CONNECTOR_STATUS.AUTHORIZED;
+      this.emit(CONNECTOR_EVENTS.AUTHORIZED, {
+        connector: this.name,
+        identityTokenInfo: {
+          idToken
+        }
+      });
       return {
         idToken
       };

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

@@ -55,7 +55,7 @@ class CoinbaseConnector extends BaseEvmConnector {
         this.rehydrated = true;
         const provider = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
         // the connect function could fail silently as well.
         if (!provider) {
@@ -96,15 +96,15 @@ class CoinbaseConnector extends BaseEvmConnector {
         this.disconnect();
       });
       let identityTokenInfo;
-      if (getIdentityToken) {
-        identityTokenInfo = await this.getIdentityToken();
-      }
       this.emit(CONNECTOR_EVENTS.CONNECTED, {
         connector: WALLET_CONNECTORS.COINBASE,
         reconnected: this.rehydrated,
         provider: this.provider,
         identityTokenInfo
       });
+      if (getIdentityToken) {
+        identityTokenInfo = await this.getIdentityToken();
+      }
       return this.provider;
     } catch (error) {
       // ready again to be connected
@@ -132,7 +132,7 @@ class CoinbaseConnector extends BaseEvmConnector {
     await super.disconnect();
   }
   async getUserInfo() {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
   async switchChain(params, init = false) {

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

@@ -44,7 +44,7 @@ class InjectedEvmConnector extends BaseEvmConnector {
         this.rehydrated = true;
         const provider = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
         if (!provider) {
           this.rehydrated = false;
@@ -90,15 +90,15 @@ class InjectedEvmConnector extends BaseEvmConnector {
       };
       this.injectedProvider.on("accountsChanged", accountDisconnectHandler);
       let identityTokenInfo;
-      if (getIdentityToken) {
-        identityTokenInfo = await this.getIdentityToken();
-      }
       this.emit(CONNECTOR_EVENTS.CONNECTED, {
         connector: this.name,
         reconnected: this.rehydrated,
         provider: this.injectedProvider,
         identityTokenInfo
       });
+      if (getIdentityToken) {
+        identityTokenInfo = await this.getIdentityToken();
+      }
       return this.injectedProvider;
     } catch (error) {
       // ready again to be connected
@@ -135,7 +135,7 @@ class InjectedEvmConnector extends BaseEvmConnector {
     await super.disconnect();
   }
   async getUserInfo() {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
   async addChain(chainConfig, _init = false) {

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

@@ -35,7 +35,7 @@ class WalletStandardConnector extends BaseSolanaConnector {
     return null;
   }
   get isWalletConnected() {
-    return !!(this.status === CONNECTOR_STATUS.CONNECTED && this.wallet.accounts.length > 0);
+    return !!(this.connected && this.wallet.accounts.length > 0);
   }
   async init(options) {
     await super.init(options);
@@ -58,7 +58,7 @@ class WalletStandardConnector extends BaseSolanaConnector {
         this.rehydrated = true;
         const provider = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
         if (!provider) {
           this.rehydrated = false;
@@ -89,15 +89,15 @@ class WalletStandardConnector extends BaseSolanaConnector {
       if (this.wallet.accounts.length === 0) throw WalletLoginError.connectionError();
       this.status = CONNECTOR_STATUS.CONNECTED;
       let identityTokenInfo;
-      if (getIdentityToken) {
-        identityTokenInfo = await this.getIdentityToken();
-      }
       this.emit(CONNECTOR_EVENTS.CONNECTED, {
         connector: this.name,
         reconnected: this.rehydrated,
         provider: this.provider,
         identityTokenInfo
       });
+      if (getIdentityToken) {
+        identityTokenInfo = await this.getIdentityToken();
+      }
       return this.provider;
     } catch (error) {
       // ready again to be connected
@@ -126,7 +126,7 @@ class WalletStandardConnector extends BaseSolanaConnector {
     }
   }
   async getUserInfo() {
-    if (!this.isWalletConnected) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
   async switchChain(params, init = false) {

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

@@ -74,7 +74,7 @@ class MetaMaskConnector extends BaseEvmConnector {
         this.rehydrated = true;
         const provider = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
         if (!provider) {
           this.rehydrated = false;
@@ -199,7 +199,7 @@ class MetaMaskConnector extends BaseEvmConnector {
     await super.disconnect();
   }
   async getUserInfo() {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
   async switchChain(params, init = false) {

package/dist/lib.esm/connectors/wallet-connect-v2-connector/walletConnectV2Connector.js

@@ -100,7 +100,7 @@ class WalletConnectV2Connector extends BaseConnector {
         try {
           await this.onConnectHandler({
             chain: chainConfig,
-            getIdentityToken: false
+            getIdentityToken: options.getIdentityToken
           });
         } catch (error) {
           log.error("wallet auto connect", error);
@@ -167,7 +167,7 @@ class WalletConnectV2Connector extends BaseConnector {
       if (this.connected) {
         await this.onConnectHandler({
           chain: chainConfig,
-          getIdentityToken: false
+          getIdentityToken
         });
         return this.provider;
       }
@@ -211,7 +211,7 @@ class WalletConnectV2Connector extends BaseConnector {
     }
   }
   async getUserInfo() {
-    if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
   async disconnect(options = {
@@ -240,7 +240,11 @@ class WalletConnectV2Connector extends BaseConnector {
     this.emit(CONNECTOR_EVENTS.DISCONNECTED);
   }
   async getIdentityToken() {
-    if (!this.provider || this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError();
+    if (!this.provider || !this.canAuthorize) throw WalletLoginError.notConnectedError();
+    this.status = CONNECTOR_STATUS.AUTHORIZING;
+    this.emit(CONNECTOR_EVENTS.AUTHORIZING, {
+      connector: WALLET_CONNECTORS.WALLET_CONNECT_V2
+    });
     const {
       chainId
     } = this.provider;
@@ -257,6 +261,13 @@ class WalletConnectV2Connector extends BaseConnector {
       if (existingToken) {
         const isExpired = checkIfTokenIsExpired(existingToken);
         if (!isExpired) {
+          this.status = CONNECTOR_STATUS.AUTHORIZED;
+          this.emit(CONNECTOR_EVENTS.AUTHORIZED, {
+            connector: WALLET_CONNECTORS.WALLET_CONNECT_V2,
+            identityTokenInfo: {
+              idToken: existingToken
+            }
+          });
           return {
             idToken: existingToken
           };
@@ -275,6 +286,13 @@ class WalletConnectV2Connector extends BaseConnector {
       const signedMessage = await this._getSignedMessage(challenge, accounts, chainNamespace);
       const idToken = await verifySignedChallenge(chainNamespace, signedMessage, challenge, this.name, this.coreOptions.sessionTime, this.coreOptions.clientId, this.coreOptions.web3AuthNetwork);
       saveToken(accounts[0], this.name, idToken);
+      this.status = CONNECTOR_STATUS.AUTHORIZED;
+      this.emit(CONNECTOR_EVENTS.AUTHORIZED, {
+        connector: WALLET_CONNECTORS.WALLET_CONNECT_V2,
+        identityTokenInfo: {
+          idToken
+        }
+      });
       return {
         idToken
       };
@@ -414,15 +432,15 @@ class WalletConnectV2Connector extends BaseConnector {
     // track connection events
     if (trackCompletionEvents) trackCompletionEvents();
     let identityTokenInfo;
-    if (getIdentityToken) {
-      identityTokenInfo = await this.getIdentityToken();
-    }
     this.emit(CONNECTOR_EVENTS.CONNECTED, {
       connector: WALLET_CONNECTORS.WALLET_CONNECT_V2,
       reconnected: this.rehydrated,
       provider: this.provider,
       identityTokenInfo
     });
+    if (getIdentityToken) {
+      identityTokenInfo = await this.getIdentityToken();
+    }
   }
   subscribeEvents() {
     if (!this.connector) throw WalletInitializationError.notReady("Wallet connector is not ready yet");

package/dist/lib.esm/index.js

@@ -5,7 +5,8 @@ export { CONNECTOR_NAMESPACES } from './base/chain/IChainInterface.js';
 export { CHAIN_NAMESPACES, cloneDeep } from '@toruslabs/base-controllers';
 export { Web3AuthContextKey } from './base/composables/index.js';
 export { BaseConnector } from './base/connector/baseConnector.js';
-export { CONNECTOR_CATEGORY, CONNECTOR_EVENTS, CONNECTOR_STATUS } from './base/connector/constants.js';
+export { CAN_AUTHORIZE_STATUSES, CONNECTED_STATUSES } from './base/connector/connectorStatus.js';
+export { CONNECTOR_CATEGORY, CONNECTOR_EVENTS, CONNECTOR_INITIAL_AUTHENTICATION_MODE, CONNECTOR_STATUS } from './base/connector/constants.js';
 export { AUTH_CONNECTION, MFA_FACTOR, MFA_LEVELS, UX_MODE, WEB3AUTH_NETWORK, getED25519Key } from '@web3auth/auth';
 export { checkIfTokenIsExpired, clearToken, getSavedToken, saveToken, storageAvailable } from './base/connector/utils.js';
 export { LOGIN_MODE, MODAL_SIGN_IN_METHODS, SMART_ACCOUNT_WALLET_SCOPE, SOLANA_CAIP_CHAIN_MAP, WALLET_REGISTRY_URL, WEB3AUTH_STATE_STORAGE_KEY, WIDGET_TYPE } from './base/constants.js';