fix events of authorized emits

chaitanyapotti · chaitanyapotti · commit 4c289dd42d06 · 2025-12-05T23:27:23.000+08:00
diff --git a/packages/modal/src/modalManager.ts b/packages/modal/src/modalManager.ts
@@ -197,7 +197,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
 
       const handleVisibility = (visibility: boolean) => {
         // modal is closed but user is not connected to any wallet.
-        if (!visibility && this.status !== CONNECTOR_STATUS.CONNECTED) {
+        if (!visibility && !CONNECTED_STATUSES.includes(this.status)) {
           this.removeListener(CONNECTOR_EVENTS.CONNECTED, handleConnected);
           this.removeListener(CONNECTOR_EVENTS.ERRORED, handleError);
           this.removeListener(CONNECTOR_EVENTS.AUTHORIZED, handleConnected);
diff --git a/packages/modal/src/react/hooks/useIdentityToken.ts b/packages/modal/src/react/hooks/useIdentityToken.ts
@@ -11,7 +11,7 @@ export interface IUseIdentityToken {
 }
 
 export const useIdentityToken = () => {
-  const { web3Auth, isConnected } = useWeb3AuthInner();
+  const { web3Auth, isAuthorized } = useWeb3AuthInner();
 
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<Web3AuthError | null>(null);
@@ -34,10 +34,14 @@ export const useIdentityToken = () => {
   }, [web3Auth]);
 
   useEffect(() => {
-    if (!isConnected && token) {
+    if (!web3Auth) return;
+    if (!isAuthorized && token) {
       setToken(null);
     }
-  }, [isConnected, token]);
+    if (isAuthorized && !token) {
+      setToken(web3Auth.idToken);
+    }
+  }, [isAuthorized, token, web3Auth]);
 
   return { loading, error, token, getIdentityToken };
 };
diff --git a/packages/modal/src/vue/composables/useIdentityToken.ts b/packages/modal/src/vue/composables/useIdentityToken.ts
@@ -11,7 +11,7 @@ export interface IUseIdentityToken {
 }
 
 export const useIdentityToken = (): IUseIdentityToken => {
-  const { web3Auth, isConnected } = useWeb3AuthInner();
+  const { web3Auth, isAuthorized } = useWeb3AuthInner();
   const loading = ref(false);
   const error = ref<Web3AuthError | null>(null);
   const token = ref<string | null>(null);
@@ -33,11 +33,19 @@ export const useIdentityToken = (): IUseIdentityToken => {
     }
   };
 
-  watch(isConnected, (newIsConnected) => {
-    if (!newIsConnected && token.value) {
-      token.value = null;
-    }
-  });
+  watch(
+    isAuthorized,
+    (newIsAuthorized) => {
+      if (!web3Auth.value) return;
+      if (!newIsAuthorized && token.value) {
+        token.value = null;
+      }
+      if (newIsAuthorized && !token.value) {
+        token.value = web3Auth.value.idToken;
+      }
+    },
+    { immediate: true }
+  );
 
   return {
     loading,
diff --git a/packages/no-modal/src/base/connector/interfaces.ts b/packages/no-modal/src/base/connector/interfaces.ts
@@ -101,25 +101,30 @@ export type BaseConnectorLoginParams = {
 export type ConnectorFn = (params: ConnectorParams) => IConnector<unknown>;
 
 export type CONNECTED_EVENT_DATA = {
-  connector: WALLET_CONNECTOR_TYPE;
+  connector: WALLET_CONNECTOR_TYPE | string;
   provider: IProvider;
   reconnected: boolean;
   identityTokenInfo: IdentityTokenInfo;
 };
 
+export type AUTHORIZED_EVENT_DATA = {
+  connector: WALLET_CONNECTOR_TYPE | string;
+  identityTokenInfo: IdentityTokenInfo;
+};
+
 export interface IConnectorDataEvent {
   connectorName: string;
   data: unknown;
 }
 
 export type ConnectorEvents = {
   [CONNECTOR_EVENTS.NOT_READY]: () => void;
-  [CONNECTOR_EVENTS.READY]: (connector: string) => void;
+  [CONNECTOR_EVENTS.READY]: (connector: WALLET_CONNECTOR_TYPE | string) => void;
   [CONNECTOR_EVENTS.CONNECTED]: (data: CONNECTED_EVENT_DATA) => void;
   [CONNECTOR_EVENTS.DISCONNECTED]: () => void;
-  [CONNECTOR_EVENTS.CONNECTING]: (data: { connector: string }) => void;
-  [CONNECTOR_EVENTS.AUTHORIZING]: (data: { connector: string }) => void;
-  [CONNECTOR_EVENTS.AUTHORIZED]: (data: { connector: string }) => void;
+  [CONNECTOR_EVENTS.CONNECTING]: (data: { connector: WALLET_CONNECTOR_TYPE | string }) => void;
+  [CONNECTOR_EVENTS.AUTHORIZING]: (data: { connector: WALLET_CONNECTOR_TYPE | string }) => void;
+  [CONNECTOR_EVENTS.AUTHORIZED]: (data: AUTHORIZED_EVENT_DATA) => void;
   [CONNECTOR_EVENTS.ERRORED]: (error: Web3AuthError) => void;
   [CONNECTOR_EVENTS.REHYDRATION_ERROR]: (error: Web3AuthError) => void;
   [CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED]: (data: IConnectorDataEvent) => void;
diff --git a/packages/no-modal/src/connectors/auth-connector/authConnector.ts b/packages/no-modal/src/connectors/auth-connector/authConnector.ts
@@ -273,7 +273,11 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
 
   async getIdentityToken(): Promise<{ idToken: string }> {
     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 as string } });
     return { idToken: userInfo.idToken as string };
   }
 
@@ -410,11 +414,7 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
           } as CONNECTED_EVENT_DATA);
 
           if (params.getIdentityToken) {
-            this.status = CONNECTOR_STATUS.AUTHORIZING;
-            this.emit(CONNECTOR_EVENTS.AUTHORIZING, { connector: WALLET_CONNECTORS.AUTH });
             identityTokenInfo = await this.getIdentityToken();
-            this.status = CONNECTOR_STATUS.AUTHORIZED;
-            this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: WALLET_CONNECTORS.AUTH });
           }
           // handle disconnect from ws embed
           this.wsEmbedInstance?.provider.on("accountsChanged", (accounts: unknown[] = []) => {
diff --git a/packages/no-modal/src/connectors/base-evm-connector/baseEvmConnector.ts b/packages/no-modal/src/connectors/base-evm-connector/baseEvmConnector.ts
@@ -6,10 +6,12 @@ import {
   checkIfTokenIsExpired,
   clearToken,
   CONNECTOR_EVENTS,
+  CONNECTOR_STATUS,
   ConnectorInitOptions,
   getSavedToken,
   IdentityTokenInfo,
   saveToken,
+  WALLET_CONNECTOR_TYPE,
   WalletInitializationError,
   WalletLoginError,
 } from "../../base";
@@ -20,13 +22,16 @@ export abstract class BaseEvmConnector<T> extends BaseConnector<T> {
   async getIdentityToken(): Promise<IdentityTokenInfo> {
     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 as WALLET_CONNECTOR_TYPE });
     const accounts = await this.provider.request<never, string[]>({ method: EVM_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 };
         }
       }
@@ -63,6 +68,8 @@ export abstract class BaseEvmConnector<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");
diff --git a/packages/no-modal/src/connectors/coinbase-connector/coinbaseConnector.ts b/packages/no-modal/src/connectors/coinbase-connector/coinbaseConnector.ts
@@ -125,11 +125,7 @@ class CoinbaseConnector extends BaseEvmConnector<void> {
       } as CONNECTED_EVENT_DATA);
 
       if (getIdentityToken) {
-        this.status = CONNECTOR_STATUS.AUTHORIZING;
-        this.emit(CONNECTOR_EVENTS.AUTHORIZING, { connector: WALLET_CONNECTORS.COINBASE });
         identityTokenInfo = await this.getIdentityToken();
-        this.status = CONNECTOR_STATUS.AUTHORIZED;
-        this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: WALLET_CONNECTORS.COINBASE });
       }
 
       return this.provider;
diff --git a/packages/no-modal/src/connectors/injected-evm-connector/injectedEvmConnector.ts b/packages/no-modal/src/connectors/injected-evm-connector/injectedEvmConnector.ts
@@ -119,11 +119,7 @@ class InjectedEvmConnector extends BaseEvmConnector<void> {
       } as CONNECTED_EVENT_DATA);
 
       if (getIdentityToken) {
-        this.status = CONNECTOR_STATUS.AUTHORIZING;
-        this.emit(CONNECTOR_EVENTS.AUTHORIZING, { connector: this.name });
         identityTokenInfo = await this.getIdentityToken();
-        this.status = CONNECTOR_STATUS.AUTHORIZED;
-        this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: this.name });
       }
 
       return this.injectedProvider;
diff --git a/packages/no-modal/src/connectors/injected-solana-connector/walletStandardConnector.ts b/packages/no-modal/src/connectors/injected-solana-connector/walletStandardConnector.ts
@@ -121,11 +121,7 @@ export class WalletStandardConnector extends BaseSolanaConnector<void> {
       } as CONNECTED_EVENT_DATA);
 
       if (getIdentityToken) {
-        this.status = CONNECTOR_STATUS.AUTHORIZING;
-        this.emit(CONNECTOR_EVENTS.AUTHORIZING, { connector: this.name });
         identityTokenInfo = await this.getIdentityToken();
-        this.status = CONNECTOR_STATUS.AUTHORIZED;
-        this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: this.name });
       }
 
       return this.provider;
diff --git a/packages/no-modal/src/connectors/metamask-connector/metamaskConnector.ts b/packages/no-modal/src/connectors/metamask-connector/metamaskConnector.ts
@@ -188,11 +188,7 @@ class MetaMaskConnector extends BaseEvmConnector<void> {
       } as CONNECTED_EVENT_DATA);
 
       if (getIdentityToken) {
-        this.status = CONNECTOR_STATUS.AUTHORIZING;
-        this.emit(CONNECTOR_EVENTS.AUTHORIZING, { connector: WALLET_CONNECTORS.METAMASK });
         identityTokenInfo = await this.getIdentityToken();
-        this.status = CONNECTOR_STATUS.AUTHORIZED;
-        this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: WALLET_CONNECTORS.METAMASK });
       }
 
       return this.metamaskProvider;
diff --git a/packages/no-modal/src/connectors/wallet-connect-v2-connector/walletConnectV2Connector.ts b/packages/no-modal/src/connectors/wallet-connect-v2-connector/walletConnectV2Connector.ts
@@ -268,6 +268,8 @@ class WalletConnectV2Connector extends BaseConnector<void> {
 
   async getIdentityToken(): Promise<IdentityTokenInfo> {
     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;
     const currentChainConfig = this.coreOptions.chains.find((x) => x.chainId === chainId);
     if (!currentChainConfig) throw WalletLoginError.connectionError("Chain config is not available");
@@ -308,6 +310,8 @@ class WalletConnectV2Connector extends BaseConnector<void> {
         this.coreOptions.web3AuthNetwork
       );
       saveToken(accounts[0] as string, this.name, idToken);
+      this.status = CONNECTOR_STATUS.AUTHORIZED;
+      this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: WALLET_CONNECTORS.WALLET_CONNECT_V2, identityTokenInfo: { idToken } });
       return { idToken };
     }
     throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
@@ -447,11 +451,7 @@ class WalletConnectV2Connector extends BaseConnector<void> {
     } as CONNECTED_EVENT_DATA);
 
     if (getIdentityToken) {
-      this.status = CONNECTOR_STATUS.AUTHORIZING;
-      this.emit(CONNECTOR_EVENTS.AUTHORIZING, { connector: WALLET_CONNECTORS.WALLET_CONNECT_V2 });
       identityTokenInfo = await this.getIdentityToken();
-      this.status = CONNECTOR_STATUS.AUTHORIZED;
-      this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: WALLET_CONNECTORS.WALLET_CONNECT_V2 });
     }
   }
 
diff --git a/packages/no-modal/src/noModal.ts b/packages/no-modal/src/noModal.ts
@@ -10,6 +10,7 @@ import {
   ANALYTICS_INTEGRATION_TYPE,
   ANALYTICS_SDK_TYPE,
   AuthLoginParams,
+  AUTHORIZED_EVENT_DATA,
   CHAIN_NAMESPACES,
   type ChainNamespaceType,
   type CONNECTED_EVENT_DATA,
@@ -149,6 +150,10 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     return this.aaProvider;
   }
 
+  get idToken(): string | null {
+    return this.state.idToken || null;
+  }
+
   set provider(_: IProvider | null) {
     throw new Error("Not implemented");
   }
@@ -797,7 +802,11 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   protected subscribeToConnectorEvents(connector: IConnector<unknown>): void {
     connector.on(CONNECTOR_EVENTS.CONNECTED, async (data: CONNECTED_EVENT_DATA) => {
       if (!this.commonJRPCProvider) throw WalletInitializationError.notFound(`CommonJrpcProvider not found`);
-      const { provider } = data;
+      const { provider, identityTokenInfo } = data;
+
+      if (identityTokenInfo) {
+        this.setState({ idToken: identityTokenInfo.idToken });
+      }
 
       // when ssr is enabled, we need to get the idToken from the connector.
       if (this.coreOptions.ssr) {
@@ -849,7 +858,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
 
       this.status = CONNECTOR_STATUS.CONNECTED;
       log.debug("connected", this.status, this.connectedConnectorName);
-      this.connectToPlugins(data);
+      this.connectToPlugins({ connector: data.connector as WALLET_CONNECTOR_TYPE });
       this.emit(CONNECTOR_EVENTS.CONNECTED, { ...data, loginMode: this.loginMode });
     });
 
@@ -930,8 +939,9 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
       this.emit(CONNECTOR_EVENTS.AUTHORIZING, data);
       log.debug("authorizing", this.status, this.connectedConnectorName);
     });
-    connector.on(CONNECTOR_EVENTS.AUTHORIZED, (data) => {
+    connector.on(CONNECTOR_EVENTS.AUTHORIZED, (data: AUTHORIZED_EVENT_DATA) => {
       this.status = CONNECTOR_STATUS.AUTHORIZED;
+      this.setState({ idToken: data.identityTokenInfo.idToken });
       this.emit(CONNECTOR_EVENTS.AUTHORIZED, data);
       log.debug("authorized", this.status, this.connectedConnectorName);
     });
diff --git a/packages/no-modal/src/react/hooks/useIdentityToken.ts b/packages/no-modal/src/react/hooks/useIdentityToken.ts
@@ -11,12 +11,12 @@ export interface IUseIdentityToken {
 }
 
 export const useIdentityToken = () => {
-  const { web3Auth, isConnected } = useWeb3AuthInner();
+  const { web3Auth, isConnected, isAuthorized } = useWeb3AuthInner();
 
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<Web3AuthError | null>(null);
   const [token, setToken] = useState<string | null>(null);
-  // TODO: store the authorized token in state so that we can return it here if already authorized
+
   const getIdentityToken = useCallback(async () => {
     setLoading(true);
     setError(null);
@@ -34,10 +34,14 @@ export const useIdentityToken = () => {
   }, [web3Auth]);
 
   useEffect(() => {
-    if (!isConnected && token) {
+    if (!web3Auth) return;
+    if (!isAuthorized && token) {
       setToken(null);
     }
-  }, [isConnected, token]);
+    if (isAuthorized && !token) {
+      setToken(web3Auth.idToken);
+    }
+  }, [isConnected, isAuthorized, token]);
 
   return { loading, error, token, getIdentityToken };
 };
diff --git a/packages/no-modal/src/vue/composables/useIdentityToken.ts b/packages/no-modal/src/vue/composables/useIdentityToken.ts
@@ -11,7 +11,7 @@ export interface IUseIdentityToken {
 }
 
 export const useIdentityToken = (): IUseIdentityToken => {
-  const { web3Auth, isConnected } = useWeb3AuthInner();
+  const { web3Auth, isAuthorized } = useWeb3AuthInner();
   const loading = ref(false);
   const error = ref<Web3AuthError | null>(null);
   const token = ref<string | null>(null);
@@ -33,11 +33,19 @@ export const useIdentityToken = (): IUseIdentityToken => {
     }
   };
 
-  watch(isConnected, (newIsConnected) => {
-    if (!newIsConnected && token.value) {
-      token.value = null;
-    }
-  });
+  watch(
+    isAuthorized,
+    (newIsAuthorized) => {
+      if (!web3Auth.value) return;
+      if (!newIsAuthorized && token.value) {
+        token.value = null;
+      }
+      if (newIsAuthorized && !token.value) {
+        token.value = web3Auth.value.idToken;
+      }
+    },
+    { immediate: true }
+  );
 
   return {
     loading,
