can authorize status and logs for nomodal

chaitanyapotti · chaitanyapotti · commit 1de748e743bd · 2025-12-06T00:52:53.000+08:00
diff --git a/packages/no-modal/src/base/connector/baseConnector.ts b/packages/no-modal/src/base/connector/baseConnector.ts
@@ -3,7 +3,7 @@ import { SafeEventEmitter } from "@web3auth/auth";
 import { CHAIN_NAMESPACES, CONNECTOR_NAMESPACES, ConnectorNamespaceType, CustomChainConfig } from "../chain/IChainInterface";
 import { WalletInitializationError, WalletLoginError } from "../errors";
 import { WALLET_CONNECTOR_TYPE, WALLET_CONNECTORS } from "../wallet";
-import { CONNECTED_STATUSES } from "./connectorStatus";
+import { CAN_AUTHORIZE_STATUSES, CONNECTED_STATUSES } from "./connectorStatus";
 import { CONNECTOR_EVENTS, CONNECTOR_STATUS } from "./constants";
 import type {
   BaseConnectorLoginParams,
@@ -47,7 +47,7 @@ export abstract class BaseConnector<T> extends SafeEventEmitter<ConnectorEvents>
   }
 
   get canAuthorize(): boolean {
-    return ([CONNECTOR_STATUS.AUTHORIZING, CONNECTOR_STATUS.AUTHORIZED, CONNECTOR_STATUS.CONNECTED] as CONNECTOR_STATUS_TYPE[]).includes(this.status);
+    return CAN_AUTHORIZE_STATUSES.includes(this.status);
   }
 
   public abstract get provider(): IProvider | null;
diff --git a/packages/no-modal/src/base/connector/connectorStatus.ts b/packages/no-modal/src/base/connector/connectorStatus.ts
@@ -2,3 +2,9 @@ import { CONNECTOR_STATUS } from "./constants";
 import { CONNECTOR_STATUS_TYPE } from "./interfaces";
 
 export const CONNECTED_STATUSES: CONNECTOR_STATUS_TYPE[] = [CONNECTOR_STATUS.CONNECTED, CONNECTOR_STATUS.AUTHORIZED];
+
+export const CAN_AUTHORIZE_STATUSES: CONNECTOR_STATUS_TYPE[] = [
+  CONNECTOR_STATUS.AUTHORIZING,
+  CONNECTOR_STATUS.AUTHORIZED,
+  CONNECTOR_STATUS.CONNECTED,
+];
diff --git a/packages/no-modal/src/connectors/injected-solana-connector/walletStandardConnector.ts b/packages/no-modal/src/connectors/injected-solana-connector/walletStandardConnector.ts
@@ -151,7 +151,7 @@ export class WalletStandardConnector extends BaseSolanaConnector<void> {
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
-    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 {};
   }
 
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
@@ -242,7 +242,7 @@ class WalletConnectV2Connector extends BaseConnector<void> {
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
-    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 {};
   }
 
diff --git a/packages/no-modal/src/noModal.ts b/packages/no-modal/src/noModal.ts
@@ -11,6 +11,7 @@ import {
   ANALYTICS_SDK_TYPE,
   AuthLoginParams,
   AUTHORIZED_EVENT_DATA,
+  CAN_AUTHORIZE_STATUSES,
   CHAIN_NAMESPACES,
   type ChainNamespaceType,
   type CONNECTED_EVENT_DATA,
@@ -441,7 +442,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
     log.debug("Getting user info", this.status, this.connectedConnector?.name);
-    if (!CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!CAN_AUTHORIZE_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
     return this.connectedConnector.getUserInfo();
   }
 
@@ -484,8 +485,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   async getIdentityToken(): Promise<IdentityTokenInfo> {
-    if (![...CONNECTED_STATUSES, CONNECTOR_STATUS.AUTHORIZING].includes(this.status) || !this.connectedConnector)
-      throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!CAN_AUTHORIZE_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
 
     const trackData = { connector: this.connectedConnector.name };
     try {
@@ -891,7 +891,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
 
       this.status = CONNECTOR_STATUS.CONNECTED;
       log.debug("connected", this.status, this.connectedConnectorName);
-      this.connectToPlugins({ connector: data.connector as WALLET_CONNECTOR_TYPE });
+      this.connectToPlugins({ ...data, connector: data.connector as WALLET_CONNECTOR_TYPE });
       this.emit(CONNECTOR_EVENTS.CONNECTED, { ...data, loginMode: this.loginMode });
     });
 
diff --git a/packages/no-modal/src/plugins/wallet-services-plugin/plugin.ts b/packages/no-modal/src/plugins/wallet-services-plugin/plugin.ts
@@ -5,9 +5,9 @@ import WsEmbed from "@web3auth/ws-embed";
 import {
   type Analytics,
   ANALYTICS_EVENTS,
+  CAN_AUTHORIZE_STATUSES,
   CHAIN_NAMESPACES,
   ChainNamespaceType,
-  CONNECTED_STATUSES,
   EVM_PLUGINS,
   IPlugin,
   IProvider,
@@ -91,7 +91,7 @@ class WalletServicesPlugin extends SafeEventEmitter implements IPlugin {
       }
     }
 
-    if (!CONNECTED_STATUSES.includes(this.web3auth.status)) {
+    if (!CAN_AUTHORIZE_STATUSES.includes(this.web3auth.status)) {
       throw WalletServicesPluginError.web3AuthNotConnected();
     } else if (!this.web3auth.provider) {
       throw WalletServicesPluginError.providerRequired();
diff --git a/packages/no-modal/src/vue/Web3AuthProvider.ts b/packages/no-modal/src/vue/Web3AuthProvider.ts
@@ -6,6 +6,7 @@ import {
   CONNECTOR_STATUS,
   type CONNECTOR_STATUS_TYPE,
   type IProvider,
+  log,
   WalletInitializationError,
   Web3AuthContextKey,
 } from "../base";
@@ -82,6 +83,7 @@ export const Web3AuthProvider = defineComponent({
             isInitializing.value = true;
             await newWeb3Auth.init({ signal: controller.signal });
           } catch (error) {
+            log.error("Error initializing web3auth", error);
             initError.value = error as Error;
           } finally {
             isInitializing.value = false;
diff --git a/packages/no-modal/src/vue/composables/useCheckout.ts b/packages/no-modal/src/vue/composables/useCheckout.ts
@@ -1,7 +1,7 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
 import { Ref, ref } from "vue";
 
-import { WalletServicesPluginError, Web3AuthError } from "../../base";
+import { log, WalletServicesPluginError, Web3AuthError } from "../../base";
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
 
 export interface IUseCheckout {
@@ -24,6 +24,7 @@ export const useCheckout = (): IUseCheckout => {
 
       await plugin.value.showCheckout(showCheckoutParams);
     } catch (err) {
+      log.error("Error showing checkout", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useEnableMFA.ts b/packages/no-modal/src/vue/composables/useEnableMFA.ts
@@ -1,6 +1,6 @@
 import { Ref, ref } from "vue";
 
-import { WalletInitializationError, Web3AuthError } from "../../base";
+import { log, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseEnableMFA {
@@ -21,6 +21,7 @@ export const useEnableMFA = (): IUseEnableMFA => {
       loading.value = true;
       await web3Auth.value.enableMFA();
     } catch (err) {
+      log.error("Error enabling MFA", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useFunding.ts b/packages/no-modal/src/vue/composables/useFunding.ts
@@ -1,7 +1,7 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
 import { Ref, ref } from "vue";
 
-import { WalletServicesPluginError, Web3AuthError } from "../../base";
+import { log, WalletServicesPluginError, Web3AuthError } from "../../base";
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
 
 export interface IUseFunding {
@@ -24,6 +24,7 @@ export const useFunding = (): IUseFunding => {
 
       await plugin.value.showFunding(showFundingParams);
     } catch (err) {
+      log.error("Error showing funding", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useIdentityToken.ts b/packages/no-modal/src/vue/composables/useIdentityToken.ts
@@ -1,6 +1,6 @@
 import { Ref, ref, watch } from "vue";
 
-import { WalletInitializationError, Web3AuthError } from "../../base";
+import { log, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseIdentityToken {
@@ -27,6 +27,7 @@ export const useIdentityToken = (): IUseIdentityToken => {
       }
       return result?.idToken;
     } catch (err) {
+      log.error("Error getting identity token", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useManageMFA.ts b/packages/no-modal/src/vue/composables/useManageMFA.ts
@@ -1,6 +1,6 @@
 import { Ref, ref } from "vue";
 
-import { WalletInitializationError, Web3AuthError } from "../../base";
+import { log, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseManageMFA {
@@ -21,6 +21,7 @@ export const useManageMFA = (): IUseManageMFA => {
       loading.value = true;
       await web3Auth.value.manageMFA();
     } catch (err) {
+      log.error("Error managing MFA", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useReceive.ts b/packages/no-modal/src/vue/composables/useReceive.ts
@@ -1,7 +1,7 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
 import { Ref, ref } from "vue";
 
-import { WalletServicesPluginError, Web3AuthError } from "../../base";
+import { log, WalletServicesPluginError, Web3AuthError } from "../../base";
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
 
 export interface IUseReceive {
@@ -24,6 +24,7 @@ export const useReceive = (): IUseReceive => {
 
       await plugin.value.showReceive(showReceiveParams);
     } catch (err) {
+      log.error("Error showing receive", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useSwap.ts b/packages/no-modal/src/vue/composables/useSwap.ts
@@ -1,7 +1,7 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
 import { Ref, ref } from "vue";
 
-import { WalletServicesPluginError, Web3AuthError } from "../../base";
+import { log, WalletServicesPluginError, Web3AuthError } from "../../base";
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
 
 export interface IUseSwap {
@@ -24,6 +24,7 @@ export const useSwap = (): IUseSwap => {
 
       await plugin.value.showSwap(showSwapParams);
     } catch (err) {
+      log.error("Error showing swap", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useSwitchChain.ts b/packages/no-modal/src/vue/composables/useSwitchChain.ts
@@ -1,6 +1,6 @@
 import { Ref, ref } from "vue";
 
-import { WalletInitializationError, Web3AuthError } from "../../base";
+import { log, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseSwitchChain {
@@ -21,6 +21,7 @@ export const useSwitchChain = (): IUseSwitchChain => {
       loading.value = true;
       await web3Auth.value.switchChain(chainParams);
     } catch (err) {
+      log.error("Error switching chain", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useWalletConnectScanner.ts b/packages/no-modal/src/vue/composables/useWalletConnectScanner.ts
@@ -1,7 +1,7 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
 import { Ref, ref } from "vue";
 
-import { WalletServicesPluginError, Web3AuthError } from "../../base";
+import { log, WalletServicesPluginError, Web3AuthError } from "../../base";
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
 
 export interface IUseWalletConnectScanner {
@@ -24,6 +24,7 @@ export const useWalletConnectScanner = (): IUseWalletConnectScanner => {
 
       await plugin.value.showWalletConnectScanner(showWalletConnectScannerParams);
     } catch (err) {
+      log.error("Error showing wallet connect scanner", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useWalletUI.ts b/packages/no-modal/src/vue/composables/useWalletUI.ts
@@ -1,7 +1,7 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
 import { Ref, ref } from "vue";
 
-import { WalletServicesPluginError, Web3AuthError } from "../../base";
+import { log, WalletServicesPluginError, Web3AuthError } from "../../base";
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
 
 export interface IUseWalletUI {
@@ -24,6 +24,7 @@ export const useWalletUI = (): IUseWalletUI => {
 
       await plugin.value.showWalletUi(showWalletUiParams);
     } catch (err) {
+      log.error("Error showing wallet UI", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useWeb3AuthConnect.ts b/packages/no-modal/src/vue/composables/useWeb3AuthConnect.ts
@@ -1,6 +1,6 @@
 import { Ref, ref, watch } from "vue";
 
-import { IProvider, LoginParamMap, WALLET_CONNECTOR_TYPE, WalletInitializationError, Web3AuthError } from "../../base";
+import { IProvider, log, LoginParamMap, WALLET_CONNECTOR_TYPE, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseWeb3AuthConnect {
@@ -39,6 +39,7 @@ export const useWeb3AuthConnect = (): IUseWeb3AuthConnect => {
       connectorName.value = web3Auth.value.connectedConnectorName;
       return localProvider;
     } catch (err) {
+      log.error("Error connecting", err);
       error.value = err as Web3AuthError;
       return null;
     } finally {
diff --git a/packages/no-modal/src/vue/composables/useWeb3AuthDisconnect.ts b/packages/no-modal/src/vue/composables/useWeb3AuthDisconnect.ts
@@ -1,6 +1,6 @@
 import { Ref, ref } from "vue";
 
-import { WalletInitializationError, Web3AuthError } from "../../base";
+import { log, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseWeb3AuthDisconnect {
@@ -21,6 +21,7 @@ export const useWeb3AuthDisconnect = (): IUseWeb3AuthDisconnect => {
       loading.value = true;
       await web3Auth.value.logout(options);
     } catch (err) {
+      log.error("Error disconnecting", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useWeb3AuthUser.ts b/packages/no-modal/src/vue/composables/useWeb3AuthUser.ts
@@ -1,6 +1,6 @@
 import { Ref, ref, watch } from "vue";
 
-import { type UserInfo, WalletInitializationError, Web3AuthError } from "../../base";
+import { log, type UserInfo, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseWeb3AuthUser {
@@ -26,6 +26,7 @@ export const useWeb3AuthUser = (): IUseWeb3AuthUser => {
       userInfo.value = result;
       return result;
     } catch (err) {
+      log.error("Error getting user info", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/solana/composables/useSignAndSendTransaction.ts b/packages/no-modal/src/vue/solana/composables/useSignAndSendTransaction.ts
@@ -1,5 +1,6 @@
 import { Ref, ref } from "vue";
 
+import { log } from "../../../base";
 import { WalletInitializationError, type Web3AuthError } from "../../../base/errors";
 import type { TransactionOrVersionedTransaction } from "../../../providers/solana-provider";
 import { useSolanaWallet } from "./useSolanaWallet";
@@ -26,6 +27,7 @@ export const useSignAndSendTransaction = (): IUseSignAndSendTransaction => {
       data.value = signature;
       return signature;
     } catch (err) {
+      log.error("Error signing and sending transaction", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/solana/composables/useSignMessage.ts b/packages/no-modal/src/vue/solana/composables/useSignMessage.ts
@@ -1,6 +1,6 @@
 import { Ref, ref } from "vue";
 
-import { WalletInitializationError, type Web3AuthError } from "../../../base/errors";
+import { log, WalletInitializationError, type Web3AuthError } from "../../../base";
 import { useSolanaWallet } from "./useSolanaWallet";
 
 export type IUseSignMessage = {
@@ -25,6 +25,7 @@ export const useSignMessage = (): IUseSignMessage => {
       data.value = signature;
       return signature;
     } catch (err) {
+      log.error("Error signing message", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/solana/composables/useSignTransaction.ts b/packages/no-modal/src/vue/solana/composables/useSignTransaction.ts
@@ -1,5 +1,6 @@
 import { Ref, ref } from "vue";
 
+import { log } from "../../../base";
 import { WalletInitializationError, type Web3AuthError } from "../../../base/errors";
 import { TransactionOrVersionedTransaction } from "../../../providers/solana-provider";
 import { useSolanaWallet } from "./useSolanaWallet";
@@ -26,6 +27,7 @@ export const useSignTransaction = (): IUseSignTransaction => {
       data.value = signedTransaction;
       return signedTransaction;
     } catch (err) {
+      log.error("Error signing transaction", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ export class WalletStandardConnector extends BaseSolanaConnector<void> {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`async getUserInfo(): Promise<Partial<UserInfo>> {`
`154`		`- if (!this.isWalletConnected) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");`
	`154`	`+ if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");`
`155`	`155`	`return {};`
`156`	`156`	`}`
`157`	`157`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ class WalletConnectV2Connector extends BaseConnector<void> {`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`async getUserInfo(): Promise<Partial<UserInfo>> {`
`245`		`- if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");`
	`245`	`+ if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");`
`246`	`246`	`return {};`
`247`	`247`	`}`
`248`	`248`