fix: connect-and-sign auth mode is not working

Author: tanguyenvn

packages/modal/src/modalManager.ts

@@ -528,7 +528,11 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
           this.subscribeToConnectorEvents(connector);
           const initialChain = this.getInitialChainIdForConnector(connector);
           const autoConnect = super.checkIfAutoConnect(connector);
-          await connector.init({ autoConnect, chainId: initialChain.chainId });
+          await connector.init({
+            autoConnect,
+            chainId: initialChain.chainId,
+            getIdentityToken: this.options.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN,
+          });
 
           // note: not adding cachedWallet to modal if it is external wallet.
           // adding it later if no in-app wallets are available.
@@ -574,7 +578,11 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
         try {
           this.subscribeToConnectorEvents(connector);
           const initialChain = this.getInitialChainIdForConnector(connector);
-          await connector.init({ autoConnect: this.cachedConnector === connectorName, chainId: initialChain.chainId });
+          await connector.init({
+            autoConnect: this.cachedConnector === connectorName,
+            chainId: initialChain.chainId,
+            getIdentityToken: this.options.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN,
+          });
         } catch (error) {
           log.error(error, "error while initializing connector", connectorName);
         }

packages/no-modal/src/base/connector/interfaces.ts

@@ -38,6 +38,10 @@ export interface ConnectorInitOptions {
    * The chainId to connect to
    */
   chainId: string;
+  /**
+   * Whether to get the identity token
+   */
+  getIdentityToken?: boolean;
 }
 
 export type CONNECTOR_STATUS_TYPE = (typeof CONNECTOR_STATUS)[keyof typeof CONNECTOR_STATUS];

packages/no-modal/src/connectors/auth-connector/authConnector.ts

@@ -188,7 +188,7 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
       // connect only if it is redirect result or if connect (connector is cached/already connected in same session) is true
       if (sessionId && (options.autoConnect || isRedirectResult)) {
         this.rehydrated = true;
-        await this.connect({ chainId: options.chainId, getIdentityToken: false });
+        await this.connect({ chainId: options.chainId, getIdentityToken: options.getIdentityToken });
       } else if (!sessionId && options.autoConnect) {
         // if here, this means that the connector is cached but the sessionId is not available.
         // this can happen if the sessionId has expired.

packages/no-modal/src/connectors/coinbase-connector/coinbaseConnector.ts

@@ -82,7 +82,7 @@ class CoinbaseConnector extends BaseEvmConnector<void> {
     try {
       if (options.autoConnect) {
         this.rehydrated = true;
-        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: false });
+        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: options.getIdentityToken });
         // the connect function could fail silently as well.
         if (!provider) {
           this.rehydrated = false;

packages/no-modal/src/connectors/injected-evm-connector/injectedEvmConnector.ts

@@ -71,7 +71,7 @@ class InjectedEvmConnector extends BaseEvmConnector<void> {
       log.debug(`initializing ${this.name} injected connector`);
       if (options.autoConnect) {
         this.rehydrated = true;
-        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: false });
+        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: options.getIdentityToken });
         if (!provider) {
           this.rehydrated = false;
           throw WalletLoginError.connectionError("Failed to rehydrate.");

packages/no-modal/src/connectors/injected-solana-connector/walletStandardConnector.ts

@@ -81,7 +81,7 @@ export class WalletStandardConnector extends BaseSolanaConnector<void> {
       log.debug("initializing solana injected connector");
       if (options.autoConnect) {
         this.rehydrated = true;
-        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: false });
+        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: options.getIdentityToken });
         if (!provider) {
           this.rehydrated = false;
           throw WalletLoginError.connectionError("Failed to rehydrate.");

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

@@ -105,7 +105,7 @@ class MetaMaskConnector extends BaseEvmConnector<void> {
     try {
       if (options.autoConnect) {
         this.rehydrated = true;
-        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: false });
+        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: options.getIdentityToken });
         if (!provider) {
           this.rehydrated = false;
           throw WalletLoginError.connectionError("Failed to rehydrate.");

packages/no-modal/src/connectors/wallet-connect-v2-connector/walletConnectV2Connector.ts

@@ -140,7 +140,7 @@ class WalletConnectV2Connector extends BaseConnector<void> {
       if (this.connected) {
         this.rehydrated = true;
         try {
-          await this.onConnectHandler({ chain: chainConfig, getIdentityToken: false });
+          await this.onConnectHandler({ chain: chainConfig, getIdentityToken: options.getIdentityToken });
         } catch (error) {
           log.error("wallet auto connect", error);
           this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, error as Web3AuthError);
@@ -196,7 +196,7 @@ class WalletConnectV2Connector extends BaseConnector<void> {
 
       // if already connected
       if (this.connected) {
-        await this.onConnectHandler({ chain: chainConfig, getIdentityToken: false });
+        await this.onConnectHandler({ chain: chainConfig, getIdentityToken });
         return this.provider;
       }
 

packages/no-modal/src/noModal.ts

@@ -730,7 +730,11 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     try {
       const initialChain = this.getInitialChainIdForConnector(connector);
       const autoConnect = this.checkIfAutoConnect(connector);
-      await connector.init({ autoConnect, chainId: initialChain.chainId });
+      await connector.init({
+        autoConnect,
+        chainId: initialChain.chainId,
+        getIdentityToken: this.coreOptions.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN,
+      });
     } catch (e) {
       log.error(e, connector.name);
     }