@web3auth/no-modal 10.8.2 → 10.9.0-alpha.0

package/dist/lib.cjs/noModal.js

@@ -10,6 +10,7 @@ var analytics = require('./base/analytics.js');
 var IChainInterface = require('./base/chain/IChainInterface.js');
 var index = require('./base/errors/index.js');
 var index$1 = require('./base/wallet/index.js');
+var connectorStatus = require('./base/connector/connectorStatus.js');
 var constants = require('./base/connector/constants.js');
 var utils$1 = require('./base/connector/utils.js');
 var constants$1 = require('./base/constants.js');
@@ -56,7 +57,8 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     });
     this.loadState(initialState);
     if (this.state.idToken && this.coreOptions.ssr) {
-      this.status = constants.CONNECTOR_STATUS.CONNECTED;
+      // connect-only is the default authentication mode, so we need to set the status to connected if the idToken is present and ssr is enabled
+      this.status = this.coreOptions.initialAuthenticationMode === constants.CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN ? constants.CONNECTOR_STATUS.AUTHORIZED : constants.CONNECTOR_STATUS.CONNECTED;
     }
   }
   get currentChain() {
@@ -90,6 +92,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   get accountAbstractionProvider() {
     return this.aaProvider;
   }
+  get idToken() {
+    return this.state.idToken || null;
+  }
   set provider(_) {
     throw new Error("Not implemented");
   }
@@ -213,7 +218,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     if (params.chainId === ((_this$currentChain2 = this.currentChain) === null || _this$currentChain2 === void 0 ? void 0 : _this$currentChain2.chainId)) return;
     const newChainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId);
     if (!newChainConfig) throw index.WalletInitializationError.invalidParams("Invalid chainId");
-    if (this.status === constants.CONNECTOR_STATUS.CONNECTED && this.connectedConnector) {
+    if (connectorStatus.CONNECTED_STATUSES.includes(this.status) && this.connectedConnector) {
       await this.connectedConnector.switchChain(params);
       return;
     }
@@ -233,7 +238,8 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     if (!connector || !this.commonJRPCProvider) throw index.WalletInitializationError.notFound(`Please add wallet connector for ${connectorName} wallet, before connecting`);
     const initialChain = this.getInitialChainIdForConnector(connector);
     const finalLoginParams = _objectSpread(_objectSpread({}, loginParams), {}, {
-      chainId: initialChain.chainId
+      chainId: initialChain.chainId,
+      getIdentityToken: this.coreOptions.initialAuthenticationMode === constants.CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN
     });
     // track connection started event
     const startTime = Date.now();
@@ -278,19 +284,48 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     // track connection started event
     this.analytics.track(analytics.ANALYTICS_EVENTS.CONNECTION_STARTED, eventData);
     return new Promise((resolve, reject) => {
+      let connectedEventCompleted = false;
+      let authorizedEventReceived = false;
       const cleanup = () => {
         this.off(constants.CONNECTOR_EVENTS.CONNECTED, onConnected);
         this.off(constants.CONNECTOR_EVENTS.ERRORED, onErrored);
+        this.off(constants.CONNECTOR_EVENTS.AUTHORIZED, onAuthorized);
+      };
+      const checkCompletion = async () => {
+        // In CONNECT_AND_SIGN mode, wait for both connected event and authorized event
+        if (finalLoginParams.getIdentityToken) {
+          if (connectedEventCompleted && authorizedEventReceived) {
+            await completeConnection();
+          }
+        } else {
+          // In CONNECT_ONLY mode, just wait for connected event
+          if (connectedEventCompleted) {
+            await completeConnection();
+          }
+        }
+      };
+      const completeConnection = async () => {
+        try {
+          // track connection completed event
+          const userInfo = await connector.getUserInfo();
+          this.analytics.track(analytics.ANALYTICS_EVENTS.CONNECTION_COMPLETED, _objectSpread(_objectSpread({}, eventData), {}, {
+            is_mfa_enabled: userInfo === null || userInfo === void 0 ? void 0 : userInfo.isMfaEnabled,
+            duration: Date.now() - startTime
+          }));
+          cleanup();
+          resolve(this.provider);
+        } catch (error) {
+          cleanup();
+          reject(error);
+        }
       };
       const onConnected = async () => {
-        // track connection completed event
-        const userInfo = await connector.getUserInfo();
-        this.analytics.track(analytics.ANALYTICS_EVENTS.CONNECTION_COMPLETED, _objectSpread(_objectSpread({}, eventData), {}, {
-          is_mfa_enabled: userInfo === null || userInfo === void 0 ? void 0 : userInfo.isMfaEnabled,
-          duration: Date.now() - startTime
-        }));
-        cleanup();
-        resolve(this.provider);
+        connectedEventCompleted = true;
+        await checkCompletion();
+      };
+      const onAuthorized = async () => {
+        authorizedEventReceived = true;
+        await checkCompletion();
       };
       const onErrored = async err => {
         // track connection failed event
@@ -301,6 +336,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
         reject(err);
       };
       this.once(constants.CONNECTOR_EVENTS.CONNECTED, onConnected);
+      if (finalLoginParams.getIdentityToken) {
+        this.once(constants.CONNECTOR_EVENTS.AUTHORIZED, onAuthorized);
+      }
       this.once(constants.CONNECTOR_EVENTS.ERRORED, onErrored);
       connector.connect(finalLoginParams);
       this.setCurrentChain(initialChain.chainId);
@@ -309,18 +347,18 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   async logout(options = {
     cleanup: false
   }) {
-    if (this.status !== constants.CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw index.WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!connectorStatus.CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw index.WalletLoginError.notConnectedError(`No wallet is connected`);
     await this.connectedConnector.disconnect(options);
   }
   async getUserInfo() {
     var _this$connectedConnec;
     loglevel.log.debug("Getting user info", this.status, (_this$connectedConnec = this.connectedConnector) === null || _this$connectedConnec === void 0 ? void 0 : _this$connectedConnec.name);
-    if (this.status !== constants.CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw index.WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!connectorStatus.CAN_AUTHORIZE_STATUSES.includes(this.status) || !this.connectedConnector) throw index.WalletLoginError.notConnectedError(`No wallet is connected`);
     return this.connectedConnector.getUserInfo();
   }
   async enableMFA(loginParams) {
     var _authConnector$authIn2;
-    if (this.status !== constants.CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw index.WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!connectorStatus.CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw index.WalletLoginError.notConnectedError(`No wallet is connected`);
     if (this.connectedConnector.name !== index$1.WALLET_CONNECTORS.AUTH) throw index.WalletLoginError.unsupportedOperation(`EnableMFA is not supported for this connector.`);
     const authConnector = this.connectedConnector;
     const trackData = {
@@ -337,7 +375,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   }
   async manageMFA(loginParams) {
     var _authConnector$authIn3;
-    if (this.status !== constants.CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw index.WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!connectorStatus.CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw index.WalletLoginError.notConnectedError(`No wallet is connected`);
     if (this.connectedConnector.name !== index$1.WALLET_CONNECTORS.AUTH) throw index.WalletLoginError.unsupportedOperation(`ManageMFA is not supported for this connector.`);
     const authConnector = this.connectedConnector;
     const trackData = {
@@ -353,7 +391,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     }
   }
   async getIdentityToken() {
-    if (this.status !== constants.CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw index.WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!connectorStatus.CAN_AUTHORIZE_STATUSES.includes(this.status) || !this.connectedConnector) throw index.WalletLoginError.notConnectedError(`No wallet is connected`);
     const trackData = {
       connector: this.connectedConnector.name
     };
@@ -597,9 +635,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     const isExternalWalletEnabled = Boolean(projectConfig.externalWalletAuth);
     const isMipdEnabled = isExternalWalletEnabled && ((_this$coreOptions$mul = this.coreOptions.multiInjectedProviderDiscovery) !== null && _this$coreOptions$mul !== void 0 ? _this$coreOptions$mul : true);
     const chainNamespaces = new Set(this.coreOptions.chains.map(chain => chain.chainNamespace));
-    // prioritize using MM connector over injected connector for EVM chains
-    if (utils.isBrowser() && chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.EIP155)) {
-      // only set headless to true if modal SDK is used, otherwise just use the modal from native Metamask SDK
+    // it's safe to add it here as if there is a MetaMask injected provider, this won't override it
+    // only set headless to true if modal SDK is used, otherwise just use the modal from native Metamask SDK
+    if (utils.isBrowser() && chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.EIP155) && !chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.SOLANA)) {
       connectorFns.push(metamaskConnector.metaMaskConnector(modalMode ? {
         headless: true
       } : undefined));
@@ -635,6 +673,13 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
         connectorFns.push(...evmMipd.getProviders().map(injectedEvmConnector));
       }
     }
+    // it's safe to add it here as if there is a MetaMask injected provider, this won't override it
+    // only set headless to true if modal SDK is used, otherwise just use the modal from native Metamask SDK
+    if (utils.isBrowser() && (chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.SOLANA) || chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.EIP155))) {
+      connectorFns.push(metamaskConnector.metaMaskConnector(modalMode ? {
+        headless: true
+      } : undefined));
+    }
     // add WalletConnectV2 connector if external wallets are enabled
     if (utils.isBrowser() && isExternalWalletEnabled && (chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.SOLANA) || chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.EIP155))) {
       const {
@@ -682,8 +727,14 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       var _this$currentChain3, _accountAbstractionCo;
       if (!this.commonJRPCProvider) throw index.WalletInitializationError.notFound(`CommonJrpcProvider not found`);
       const {
-        provider
+        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) {
         try {
@@ -738,7 +789,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       this.cacheWallet(data.connector);
       this.status = constants.CONNECTOR_STATUS.CONNECTED;
       loglevel.log.debug("connected", this.status, this.connectedConnectorName);
-      this.connectToPlugins(data);
+      this.connectToPlugins(_objectSpread(_objectSpread({}, data), {}, {
+        connector: data.connector
+      }));
       this.emit(constants.CONNECTOR_EVENTS.CONNECTED, _objectSpread(_objectSpread({}, data), {}, {
         loginMode: this.loginMode
       }));
@@ -808,6 +861,19 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       });
       this.emit(constants.CONNECTOR_EVENTS.MFA_ENABLED, isMFAEnabled);
     });
+    connector.on(constants.CONNECTOR_EVENTS.AUTHORIZING, data => {
+      this.status = constants.CONNECTOR_STATUS.AUTHORIZING;
+      this.emit(constants.CONNECTOR_EVENTS.AUTHORIZING, data);
+      loglevel.log.debug("authorizing", this.status, this.connectedConnectorName);
+    });
+    connector.on(constants.CONNECTOR_EVENTS.AUTHORIZED, data => {
+      this.status = constants.CONNECTOR_STATUS.AUTHORIZED;
+      this.setState({
+        idToken: data.identityTokenInfo.idToken
+      });
+      this.emit(constants.CONNECTOR_EVENTS.AUTHORIZED, data);
+      loglevel.log.debug("authorized", this.status, this.connectedConnectorName);
+    });
   }
   checkInitRequirements() {
     if (this.status === constants.CONNECTOR_STATUS.READY) throw index.WalletInitializationError.notReady("Connector is already initialized");

package/dist/lib.cjs/plugins/nft-checkout-plugin/plugin.js

@@ -8,7 +8,8 @@ require('../../base/loglevel.js');
 require('@toruslabs/base-controllers');
 require('../../base/errors/index.js');
 var index = require('../../base/wallet/index.js');
-var constants = require('../../base/connector/constants.js');
+var connectorStatus = require('../../base/connector/connectorStatus.js');
+require('../../base/connector/constants.js');
 require('jwt-decode');
 var errors = require('../../base/plugin/errors.js');
 var IPlugin = require('../../base/plugin/IPlugin.js');
@@ -44,7 +45,7 @@ class NFTCheckoutPlugin extends auth.SafeEventEmitter {
     if (!this.isInitialized) throw errors.NFTCheckoutPluginError.notInitialized();
     this.emit(IPlugin.PLUGIN_EVENTS.CONNECTING);
     this.status = IPlugin.PLUGIN_STATUS.CONNECTING;
-    if (this.web3auth.status !== constants.CONNECTOR_STATUS.CONNECTED) throw errors.NFTCheckoutPluginError.web3AuthNotConnected();
+    if (!connectorStatus.CONNECTED_STATUSES.includes(this.web3auth.status)) throw errors.NFTCheckoutPluginError.web3AuthNotConnected();
     if (!this.web3auth.provider) throw errors.NFTCheckoutPluginError.providerRequired();
     const accounts = await this.web3auth.provider.request({
       method: "eth_accounts"

package/dist/lib.cjs/plugins/wallet-services-plugin/plugin.js

@@ -6,7 +6,8 @@ var analytics = require('../../base/analytics.js');
 var baseControllers = require('@toruslabs/base-controllers');
 require('../../base/errors/index.js');
 var index = require('../../base/wallet/index.js');
-var constants = require('../../base/connector/constants.js');
+var connectorStatus = require('../../base/connector/connectorStatus.js');
+require('../../base/connector/constants.js');
 require('jwt-decode');
 var loglevel = require('../../base/loglevel.js');
 var errors = require('../../base/plugin/errors.js');
@@ -15,7 +16,6 @@ require('@toruslabs/constants');
 require('@toruslabs/http-helpers');
 var wsEmbed = require('@web3auth/ws-embed');
 
-// TODO: support project config items here. incl. key export flag, multiple chains
 class WalletServicesPlugin extends auth.SafeEventEmitter {
   constructor(...args) {
     super(...args);
@@ -67,7 +67,7 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
         this.provider = this.web3auth.provider;
       }
     }
-    if (this.web3auth.status !== constants.CONNECTOR_STATUS.CONNECTED) {
+    if (!connectorStatus.CAN_AUTHORIZE_STATUSES.includes(this.web3auth.status)) {
       throw errors.WalletServicesPluginError.web3AuthNotConnected();
     } else if (!this.web3auth.provider) {
       throw errors.WalletServicesPluginError.providerRequired();
@@ -108,8 +108,6 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
     (_this$analytics3 = this.analytics) === null || _this$analytics3 === void 0 || _this$analytics3.track(analytics.ANALYTICS_EVENTS.WALLET_CHECKOUT_CLICKED, {
       is_visible: showCheckoutParams === null || showCheckoutParams === void 0 ? void 0 : showCheckoutParams.show,
       receive_wallet_address_enabled: !!(showCheckoutParams !== null && showCheckoutParams !== void 0 && showCheckoutParams.receiveWalletAddress),
-      // TODO: where is the below?
-      // receive_wallet_address: showCheckoutParams?.receiveWalletAddress,
       token_list: showCheckoutParams === null || showCheckoutParams === void 0 ? void 0 : showCheckoutParams.tokenList,
       fiat_list: showCheckoutParams === null || showCheckoutParams === void 0 ? void 0 : showCheckoutParams.fiatList,
       crypto: showCheckoutParams === null || showCheckoutParams === void 0 ? void 0 : showCheckoutParams.crypto,

package/dist/lib.cjs/providers/account-abstraction-provider/providers/AccountAbstractionProvider.js

@@ -11,6 +11,7 @@ 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.cjs/providers/account-abstraction-provider/providers/utils.js

@@ -10,6 +10,7 @@ var loglevel = require('../../../base/loglevel.js');
 require('@toruslabs/base-controllers');
 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/providers/base-provider/baseProvider.js

@@ -8,6 +8,7 @@ require('@segment/analytics-next');
 require('../../base/loglevel.js');
 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.cjs/providers/ethereum-mpc-provider/providers/signingProviders/EthereumSigningProvider.js

@@ -9,6 +9,7 @@ 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.cjs/providers/ethereum-mpc-provider/providers/signingProviders/signingUtils.js

@@ -11,6 +11,7 @@ require('@segment/analytics-next');
 var loglevel = require('../../../../base/loglevel.js');
 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/providers/ethereum-provider/providers/privateKeyProviders/TransactionFormatter/formatter.js

@@ -10,6 +10,7 @@ require('@toruslabs/base-controllers');
 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/providers/solana-provider/providers/injectedProviders/base/baseInjectedProvider.js

@@ -8,6 +8,7 @@ require('../../../../../base/loglevel.js');
 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.cjs/providers/solana-provider/providers/injectedProviders/walletStandardProvider.js

@@ -11,6 +11,7 @@ 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');

package/dist/lib.cjs/providers/xrpl-provider/providers/privateKeyProviders/xrplPrivateKeyProvider.js

@@ -8,6 +8,7 @@ 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.cjs/react/context/WalletServicesInnerContext.js

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

package/dist/lib.cjs/react/context/Web3AuthInnerContext.js

@@ -7,6 +7,7 @@ require('@babel/runtime/helpers/defineProperty');
 require('@web3auth/auth');
 var index = require('../../base/errors/index.js');
 require('../../base/wallet/index.js');
+require('../../base/connector/connectorStatus.js');
 var constants = require('../../base/connector/constants.js');
 require('jwt-decode');
 require('../../base/loglevel.js');
@@ -39,6 +40,7 @@ function Web3AuthInnerProvider(params) {
   const [isInitialized, setIsInitialized] = react.useState(false);
   const [status, setStatus] = react.useState(null);
   const [isMFAEnabled, setIsMFAEnabled] = react.useState(false);
+  const [isAuthorized, setIsAuthorized] = react.useState(false);
   const getPlugin = react.useCallback(name => {
     if (!web3Auth) throw index.WalletInitializationError.notReady();
     return web3Auth.getPlugin(name);
@@ -78,7 +80,9 @@ function Web3AuthInnerProvider(params) {
     if (provider) {
       provider.on("chainChanged", handleChainChange);
       return () => {
-        provider.off("chainChanged", handleChainChange);
+        if (provider) {
+          provider.off("chainChanged", handleChainChange);
+        }
       };
     }
   }, [web3Auth, provider]);
@@ -100,6 +104,7 @@ function Web3AuthInnerProvider(params) {
     const disconnectedListener = () => {
       setStatus(web3Auth.status);
       setIsConnected(false);
+      setIsAuthorized(false);
       setProvider(null);
     };
     const connectingListener = () => {
@@ -111,17 +116,27 @@ function Web3AuthInnerProvider(params) {
     const rehydrationErrorListener = () => {
       setStatus(web3Auth.status);
       setIsConnected(false);
+      setIsAuthorized(false);
       setProvider(null);
     };
+    const authorizedListener = () => {
+      setStatus(web3Auth.status);
+      if (web3Auth.status === constants.CONNECTOR_STATUS.AUTHORIZED) {
+        setIsConnected(true);
+        setIsAuthorized(true);
+      }
+    };
     const mfaEnabledListener = isMFAEnabled => {
       if (typeof isMFAEnabled === "boolean") setIsMFAEnabled(isMFAEnabled);
     };
+    // TODO: In strict mode, web3auth becomes null and .off throws an error sometimes.
     if (web3Auth) {
       // web3Auth is initialized here.
       setStatus(web3Auth.status);
       web3Auth.on(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
       web3Auth.on(constants.CONNECTOR_EVENTS.READY, readyListener);
       web3Auth.on(constants.CONNECTOR_EVENTS.CONNECTED, connectedListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
       web3Auth.on(constants.CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
       web3Auth.on(constants.CONNECTOR_EVENTS.CONNECTING, connectingListener);
       web3Auth.on(constants.CONNECTOR_EVENTS.ERRORED, errorListener);
@@ -138,6 +153,7 @@ function Web3AuthInnerProvider(params) {
         web3Auth.off(constants.CONNECTOR_EVENTS.ERRORED, errorListener);
         web3Auth.off(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
         web3Auth.off(constants.CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
+        web3Auth.off(constants.CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
       }
     };
   }, [web3Auth]);
@@ -154,9 +170,10 @@ function Web3AuthInnerProvider(params) {
       chainId,
       chainNamespace,
       getPlugin,
-      setIsMFAEnabled
+      setIsMFAEnabled,
+      isAuthorized
     };
-  }, [web3Auth, isConnected, isInitialized, provider, status, getPlugin, isInitializing, initError, isMFAEnabled, setIsMFAEnabled, chainId, chainNamespace]);
+  }, [web3Auth, isConnected, isInitialized, provider, status, getPlugin, isInitializing, initError, isMFAEnabled, setIsMFAEnabled, chainId, chainNamespace, isAuthorized]);
   return react.createElement(Web3AuthInnerContext.Provider, {
     value
   }, children);

package/dist/lib.cjs/react/hooks/useCheckout.js

@@ -9,6 +9,7 @@ require('@toruslabs/base-controllers');
 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');
 var errors = require('../../base/plugin/errors.js');

package/dist/lib.cjs/react/hooks/useFunding.js

@@ -9,6 +9,7 @@ require('@toruslabs/base-controllers');
 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');
 var errors = require('../../base/plugin/errors.js');

package/dist/lib.cjs/react/hooks/useIdentityToken.js

@@ -6,7 +6,8 @@ var useWeb3AuthInner = require('./useWeb3AuthInner.js');
 const useIdentityToken = () => {
   const {
     web3Auth,
-    isConnected
+    isConnected,
+    isAuthorized
   } = useWeb3AuthInner.useWeb3AuthInner();
   const [loading, setLoading] = react.useState(false);
   const [error, setError] = react.useState(null);
@@ -27,10 +28,14 @@ const useIdentityToken = () => {
     }
   }, [web3Auth]);
   react.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,

package/dist/lib.cjs/react/hooks/useReceive.js

@@ -9,6 +9,7 @@ require('@toruslabs/base-controllers');
 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');
 var errors = require('../../base/plugin/errors.js');

package/dist/lib.cjs/react/hooks/useSwap.js

@@ -9,6 +9,7 @@ require('@toruslabs/base-controllers');
 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');
 var errors = require('../../base/plugin/errors.js');

package/dist/lib.cjs/react/hooks/useWalletConnectScanner.js

@@ -9,6 +9,7 @@ require('@toruslabs/base-controllers');
 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');
 var errors = require('../../base/plugin/errors.js');

package/dist/lib.cjs/react/hooks/useWalletUI.js

@@ -9,6 +9,7 @@ require('@toruslabs/base-controllers');
 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');
 var errors = require('../../base/plugin/errors.js');

package/dist/lib.cjs/react/hooks/useWeb3Auth.js

@@ -6,6 +6,7 @@ const useWeb3Auth = () => {
   const {
     initError,
     isConnected,
+    isAuthorized,
     isInitialized,
     isInitializing,
     provider,
@@ -21,6 +22,7 @@ const useWeb3Auth = () => {
     provider,
     status,
     web3Auth,
+    isAuthorized,
     getPlugin
   };
 };

package/dist/lib.cjs/react/hooks/useWeb3AuthInner.js

@@ -9,6 +9,7 @@ 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');

package/dist/lib.cjs/react/solana/hooks/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/react/wagmi/provider.js

@@ -13,6 +13,7 @@ var baseControllers = 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');

package/dist/lib.cjs/types/base/connector/baseConnector.d.ts

@@ -13,7 +13,8 @@ export declare abstract class BaseConnector<T> extends SafeEventEmitter<Connecto
     abstract name: WALLET_CONNECTOR_TYPE | string;
     abstract status: CONNECTOR_STATUS_TYPE;
     constructor(options: BaseConnectorSettings);
-    get connnected(): boolean;
+    get connected(): boolean;
+    get canAuthorize(): boolean;
     abstract get provider(): IProvider | null;
     checkConnectionRequirements(): void;
     checkInitializationRequirements({ chainConfig }: {

package/dist/lib.cjs/types/base/connector/connectorStatus.d.ts

@@ -0,0 +1,3 @@
+import { CONNECTOR_STATUS_TYPE } from "./interfaces";
+export declare const CONNECTED_STATUSES: CONNECTOR_STATUS_TYPE[];
+export declare const CAN_AUTHORIZE_STATUSES: CONNECTOR_STATUS_TYPE[];

package/dist/lib.cjs/types/base/connector/constants.d.ts

@@ -6,6 +6,8 @@ export declare const CONNECTOR_STATUS: {
     readonly DISCONNECTING: "disconnecting";
     readonly DISCONNECTED: "disconnected";
     readonly ERRORED: "errored";
+    readonly AUTHORIZED: "authorized";
+    readonly AUTHORIZING: "authorizing";
 };
 export declare const CONNECTOR_EVENTS: {
     readonly CONNECTOR_DATA_UPDATED: "connector_data_updated";
@@ -20,8 +22,14 @@ export declare const CONNECTOR_EVENTS: {
     readonly DISCONNECTING: "disconnecting";
     readonly DISCONNECTED: "disconnected";
     readonly ERRORED: "errored";
+    readonly AUTHORIZED: "authorized";
+    readonly AUTHORIZING: "authorizing";
 };
 export declare const CONNECTOR_CATEGORY: {
     readonly EXTERNAL: "external";
     readonly IN_APP: "in_app";
 };
+export declare const CONNECTOR_INITIAL_AUTHENTICATION_MODE: {
+    readonly CONNECT_ONLY: "connect-only";
+    readonly CONNECT_AND_SIGN: "connect-and-sign";
+};

package/dist/lib.cjs/types/base/connector/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./baseConnector";
+export * from "./connectorStatus";
 export * from "./constants";
 export * from "./interfaces";
 export * from "./utils";