fix more cursor comments reg. tokens

Author: chaitanyapotti

packages/modal/src/modalManager.ts

@@ -191,6 +191,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
 
       const handleError = (err: unknown) => {
         this.removeListener(CONNECTOR_EVENTS.CONNECTED, handleConnected);
+        this.removeListener(CONNECTOR_EVENTS.AUTHORIZED, handleConnected);
         this.removeListener(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, handleVisibility);
         return reject(err);
       };

packages/no-modal/src/connectors/base-solana-connector/baseSolanaConnector.ts

@@ -6,10 +6,12 @@ import {
   checkIfTokenIsExpired,
   clearToken,
   CONNECTOR_EVENTS,
+  CONNECTOR_STATUS,
   ConnectorInitOptions,
   getSavedToken,
   IdentityTokenInfo,
   saveToken,
+  WALLET_CONNECTOR_TYPE,
   WalletInitializationError,
   WalletLoginError,
 } from "../../base";
@@ -21,12 +23,17 @@ export abstract class BaseSolanaConnector<T> extends BaseConnector<T> {
     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 as WALLET_CONNECTOR_TYPE });
+
     const accounts = await this.provider.request<never, string[]>({ method: SOLANA_METHOD_TYPES.GET_ACCOUNTS });
     if (accounts && accounts.length > 0) {
       const existingToken = getSavedToken(accounts[0] as string, this.name);
       if (existingToken) {
         const isExpired = checkIfTokenIsExpired(existingToken);
         if (!isExpired) {
+          this.status = CONNECTOR_STATUS.AUTHORIZED;
+          this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: this.name as WALLET_CONNECTOR_TYPE, identityTokenInfo: { idToken: existingToken } });
           return { idToken: existingToken };
         }
       }
@@ -61,6 +68,8 @@ export abstract class BaseSolanaConnector<T> extends BaseConnector<T> {
         this.coreOptions.web3AuthNetwork
       );
       saveToken(accounts[0] as string, this.name, idToken);
+      this.status = CONNECTOR_STATUS.AUTHORIZED;
+      this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: this.name as WALLET_CONNECTOR_TYPE, identityTokenInfo: { idToken } });
       return { idToken };
     }
     throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");

packages/no-modal/src/connectors/metamask-connector/metamaskConnector.ts

@@ -180,17 +180,17 @@ class MetaMaskConnector extends BaseEvmConnector<void> {
 
       let identityTokenInfo: IdentityTokenInfo | undefined;
 
+      if (getIdentityToken) {
+        identityTokenInfo = await this.getIdentityToken();
+      }
+
       this.emit(CONNECTOR_EVENTS.CONNECTED, {
         connector: WALLET_CONNECTORS.METAMASK,
         reconnected: this.rehydrated,
         provider: this.metamaskProvider,
         identityTokenInfo,
       } as CONNECTED_EVENT_DATA);
 
-      if (getIdentityToken) {
-        identityTokenInfo = await this.getIdentityToken();
-      }
-
       return this.metamaskProvider;
     } catch (error) {
       // ready again to be connected