@web3auth/no-modal 10.16.0 → 11.0.0-beta.1

package/dist/lib.cjs/connectors/auth-connector/authSolanaWallet.js

@@ -0,0 +1,187 @@
+'use strict';
+
+var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var kit = require('@solana/kit');
+var walletStandardFeatures = require('@solana/wallet-standard-features');
+var features = require('@wallet-standard/features');
+var wsEmbed = require('@web3auth/ws-embed');
+require('@segment/analytics-next');
+require('../../base/loglevel.js');
+require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
+require('@web3auth/auth');
+var index$1 = require('../../base/errors/index.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+var constants = require('../../base/constants.js');
+var index = require('../../base/wallet/index.js');
+require('../../base/connector/connectorStatus.js');
+require('../../base/connector/constants.js');
+require('jwt-decode');
+require('../../base/plugin/errors.js');
+require('../../base/plugin/IPlugin.js');
+var solana = require('../../base/wallet/solana.js');
+
+const base58Encoder = kit.getBase58Encoder();
+const base64Decoder = kit.getBase64Decoder();
+const base64Encoder = kit.getBase64Encoder();
+const transactionDecoder = kit.getTransactionDecoder();
+const ACCOUNT_FEATURES = [walletStandardFeatures.SolanaSignAndSendTransaction, walletStandardFeatures.SolanaSignMessage, walletStandardFeatures.SolanaSignTransaction];
+function solanaWalletChainsFromConfigs(solanaChainConfigs) {
+  const ids = solanaChainConfigs.map(solana.getSolanaChainByChainConfig).filter(id => id != null);
+  const unique = [...new Set(ids)];
+  return unique;
+}
+const SOLANA_PROVIDER_HEX_CHAIN_IDS = new Set(Object.keys(constants.SOLANA_CAIP_CHAIN_MAP).map(id => id.toLowerCase()));
+/**
+ * AuthSolanaWallet implements the Wallet Standard interface, wrapping a JRPC provider.
+ * Used by AuthConnector so consumers get a standards-compliant Wallet from `connection.solanaWallet`.
+ *
+ * {@link Wallet.accounts} is synchronous in the Wallet Standard; it returns `[]` until accounts have been loaded
+ * (`null` internally). The first async operation ({@link StandardConnect}, sign, etc.) calls `ensureAccountsLoaded`, which
+ * requires {@link IProvider.chainId} to be a configured Solana network (see {@link SOLANA_CAIP_CHAIN_MAP}) before {@link SOLANA_METHOD_TYPES.GET_ACCOUNTS}.
+ */
+class AuthSolanaWallet {
+  /**
+   * @param solanaChainConfigs - All configured Solana {@link CustomChainConfig} entries (same namespace).
+   */
+  constructor(_provider, solanaChainConfigs) {
+    _defineProperty(this, "_provider", void 0);
+    _defineProperty(this, "version", "1.0.0");
+    _defineProperty(this, "name", "Web3Auth");
+    _defineProperty(this, "icon", index.WEB3AUTH_ICON);
+    _defineProperty(this, "chains", void 0);
+    _defineProperty(this, "features", void 0);
+    _defineProperty(this, "_accounts", null);
+    _defineProperty(this, "_listeners", {});
+    this._provider = _provider;
+    this.chains = solanaWalletChainsFromConfigs(solanaChainConfigs);
+    this.features = {
+      [features.StandardConnect]: {
+        version: "1.0.0",
+        connect: async () => {
+          await this.ensureAccountsLoaded();
+          return {
+            accounts: this.accounts
+          };
+        }
+      },
+      [features.StandardDisconnect]: {
+        version: "1.0.0",
+        disconnect: async () => {}
+      },
+      [features.StandardEvents]: {
+        version: "1.0.0",
+        on: (event, listener) => {
+          var _this$_listeners, _this$_listeners$even;
+          ((_this$_listeners$even = (_this$_listeners = this._listeners)[event]) !== null && _this$_listeners$even !== void 0 ? _this$_listeners$even : _this$_listeners[event] = new Set()).add(listener);
+          return () => this._listeners[event].delete(listener);
+        }
+      },
+      [walletStandardFeatures.SolanaSignAndSendTransaction]: {
+        version: "1.0.0",
+        supportedTransactionVersions: ["legacy", 0],
+        signAndSendTransaction: async (...inputs) => {
+          await this.ensureAccountsLoaded();
+          return Promise.all(inputs.map(async input => {
+            const base64Tx = base64Decoder.decode(input.transaction);
+            const signature = await this._provider.request({
+              method: wsEmbed.SOLANA_METHOD_TYPES.SEND_TRANSACTION,
+              params: {
+                message: base64Tx
+              }
+            });
+            return {
+              signature: new Uint8Array(base58Encoder.encode(signature))
+            };
+          }));
+        }
+      },
+      [walletStandardFeatures.SolanaSignMessage]: {
+        version: "1.0.0",
+        signMessage: async (...inputs) => {
+          await this.ensureAccountsLoaded();
+          return Promise.all(inputs.map(async input => {
+            const message = new TextDecoder().decode(input.message);
+            const signature = await this._provider.request({
+              method: wsEmbed.SOLANA_METHOD_TYPES.SIGN_MESSAGE,
+              params: {
+                data: message,
+                from: input.account.address
+              }
+            });
+            return {
+              signedMessage: new Uint8Array(input.message),
+              signature: new Uint8Array(base58Encoder.encode(signature))
+            };
+          }));
+        }
+      },
+      [walletStandardFeatures.SolanaSignTransaction]: {
+        version: "1.0.0",
+        supportedTransactionVersions: ["legacy", 0],
+        signTransaction: async (...inputs) => {
+          await this.ensureAccountsLoaded();
+          return Promise.all(inputs.map(async input => {
+            const base64Tx = base64Decoder.decode(input.transaction);
+            const signatureBase58 = await this._provider.request({
+              method: wsEmbed.SOLANA_METHOD_TYPES.SIGN_TRANSACTION,
+              params: {
+                message: base64Tx
+              }
+            });
+            const sigBytes = new Uint8Array(base58Encoder.encode(signatureBase58));
+            const decodedTx = transactionDecoder.decode(input.transaction);
+            const signedTx = _objectSpread(_objectSpread({}, decodedTx), {}, {
+              signatures: _objectSpread(_objectSpread({}, decodedTx.signatures), {}, {
+                [input.account.address]: sigBytes
+              })
+            });
+            const signedBase64 = kit.getBase64EncodedWireTransaction(signedTx);
+            return {
+              signedTransaction: new Uint8Array(base64Encoder.encode(signedBase64))
+            };
+          }));
+        }
+      }
+    };
+  }
+  /**
+   * Wallet Standard requires a synchronous getter; RPC runs on first async wallet operation instead.
+   */
+  get accounts() {
+    var _this$_accounts;
+    return (_this$_accounts = this._accounts) !== null && _this$_accounts !== void 0 ? _this$_accounts : [];
+  }
+  /** Throws if the embed is not on Solana; otherwise loads accounts once via {@link SOLANA_METHOD_TYPES.GET_ACCOUNTS}. */
+  async ensureAccountsLoaded() {
+    var _await$this$_provider;
+    // assert solana chain
+    const chainId = this._provider.chainId;
+    if (!SOLANA_PROVIDER_HEX_CHAIN_IDS.has(chainId.toLowerCase())) throw index$1.WalletLoginError.unsupportedOperation(`Solana wallet operations require the embedded provider to be on a Solana network (current chainId: ${chainId}). Switch chain first.`);
+    if (this._accounts !== null) return;
+    const addresses = (_await$this$_provider = await this._provider.request({
+      method: wsEmbed.SOLANA_METHOD_TYPES.GET_ACCOUNTS
+    })) !== null && _await$this$_provider !== void 0 ? _await$this$_provider : [];
+    const accountChains = this.chains;
+    this._accounts = addresses.map(address => ({
+      address,
+      publicKey: new Uint8Array(base58Encoder.encode(address)),
+      chains: accountChains.length ? accountChains : [],
+      features: ACCOUNT_FEATURES
+    }));
+    this.emitChange({
+      accounts: this.accounts
+    });
+  }
+  emitChange(properties) {
+    const listeners = this._listeners.change;
+    if (!listeners) return;
+    listeners.forEach(listener => {
+      listener(properties);
+    });
+  }
+}
+
+exports.AuthSolanaWallet = AuthSolanaWallet;

package/dist/lib.cjs/connectors/base-evm-connector/baseEvmConnector.js

@@ -1,7 +1,9 @@
 'use strict';
 
 var baseControllers = require('@toruslabs/base-controllers');
+var metadataHelpers = require('@toruslabs/metadata-helpers');
 var wsEmbed = require('@web3auth/ws-embed');
+var siwe = require('viem/siwe');
 require('@babel/runtime/helpers/objectSpread2');
 require('@babel/runtime/helpers/defineProperty');
 require('@segment/analytics-next');
@@ -10,17 +12,17 @@ var baseConnector = require('../../base/connector/baseConnector.js');
 require('../../base/connector/connectorStatus.js');
 var constants = require('../../base/connector/constants.js');
 require('@web3auth/auth');
-var utils = require('../../base/connector/utils.js');
+require('jwt-decode');
+require('../../base/constants.js');
 var index = require('../../base/errors/index.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
+var utils = require('../../base/utils.js');
 require('../../base/wallet/index.js');
 
 class BaseEvmConnector extends baseConnector.BaseConnector {
   async init(_) {}
-  async getIdentityToken() {
+  async getAuthTokenInfo() {
     if (!this.provider || !this.canAuthorize) throw index.WalletLoginError.notConnectedError();
     if (!this.coreOptions) throw index.WalletInitializationError.invalidParams("Please initialize Web3Auth with valid options");
     this.status = constants.CONNECTOR_STATUS.AUTHORIZING;
@@ -31,68 +33,63 @@ class BaseEvmConnector extends baseConnector.BaseConnector {
       method: wsEmbed.EVM_METHOD_TYPES.GET_ACCOUNTS
     });
     if (accounts && accounts.length > 0) {
-      const existingToken = utils.getSavedToken(accounts[0], this.name);
-      if (existingToken) {
-        const isExpired = utils.checkIfTokenIsExpired(existingToken);
-        if (!isExpired) {
-          this.status = constants.CONNECTOR_STATUS.AUTHORIZED;
-          this.emit(constants.CONNECTOR_EVENTS.AUTHORIZED, {
-            connector: this.name,
-            identityTokenInfo: {
-              idToken: existingToken
-            }
-          });
-          return {
-            idToken: existingToken
-          };
-        }
-      }
-      const chainId = await this.provider.request({
-        method: "eth_chainId"
-      });
-      const currentChainConfig = this.coreOptions.chains.find(x => x.chainId === chainId);
-      if (!currentChainConfig) throw index.WalletInitializationError.invalidParams("chainConfig is required before authentication");
+      const cached = await this.getCachedOrNullAuthTokenInfo(accounts[0]);
+      if (cached) return cached;
+      const authServer = utils.citadelServerUrl(this.coreOptions.authBuildEnv);
       const {
+        challenge,
+        signature,
         chainNamespace
-      } = currentChainConfig;
-      const payload = {
-        domain: window.location.origin,
-        uri: window.location.href,
-        address: accounts[0],
-        chainId: parseInt(chainId, 16),
-        version: "1",
-        nonce: Math.random().toString(36).slice(2),
-        issuedAt: new Date().toISOString()
-      };
-      const challenge = await baseControllers.signChallenge(payload, chainNamespace);
-      const hexChallenge = `0x${Buffer.from(challenge, "utf8").toString("hex")}`;
-      const signedMessage = await this.provider.request({
-        method: wsEmbed.EVM_METHOD_TYPES.PERSONAL_SIGN,
-        params: [hexChallenge, accounts[0]]
-      });
-      const idToken = await baseControllers.verifySignedChallenge(chainNamespace, signedMessage, challenge, this.name, this.coreOptions.sessionTime, this.coreOptions.clientId, this.coreOptions.web3AuthNetwork);
-      utils.saveToken(accounts[0], this.name, idToken);
-      this.status = constants.CONNECTOR_STATUS.AUTHORIZED;
-      this.emit(constants.CONNECTOR_EVENTS.AUTHORIZED, {
-        connector: this.name,
-        identityTokenInfo: {
-          idToken
-        }
+      } = await this.generateChallengeAndSign(authServer, accounts);
+      return this.verifyAndAuthorize({
+        chainNamespace,
+        signedMessage: signature,
+        challenge,
+        authServer
       });
-      return {
-        idToken
-      };
     }
     throw index.WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
   }
+  async generateChallengeAndSign(authServerUrl, accounts) {
+    const accountsToUse = accounts || (await this.provider.request({
+      method: wsEmbed.EVM_METHOD_TYPES.GET_ACCOUNTS
+    }));
+    if (!accountsToUse || accountsToUse.length === 0) {
+      throw index.WalletLoginError.notConnectedError("No accounts found in the connected wallet");
+    }
+    const chainId = await this.provider.request({
+      method: "eth_chainId"
+    });
+    const currentChainConfig = this.coreOptions.chains.find(x => x.chainId === chainId);
+    if (!currentChainConfig) throw index.WalletInitializationError.invalidParams("chainConfig is required before authentication");
+    const {
+      chainNamespace
+    } = currentChainConfig;
+    const authServer = authServerUrl || utils.citadelServerUrl(this.coreOptions.authBuildEnv);
+    const payload = {
+      domain: window.location.origin,
+      uri: window.location.href,
+      address: accountsToUse[0],
+      chainId: parseInt(chainId, 16),
+      version: "1",
+      nonce: siwe.generateSiweNonce(),
+      issuedAt: new Date().toISOString()
+    };
+    const challenge = await baseControllers.signChallenge(payload, chainNamespace, authServer);
+    const hexChallenge = metadataHelpers.bytesToHexPrefixedString(metadataHelpers.utf8ToBytes(challenge));
+    const signature = await this.provider.request({
+      method: wsEmbed.EVM_METHOD_TYPES.PERSONAL_SIGN,
+      params: [hexChallenge, accountsToUse[0]]
+    });
+    return {
+      challenge,
+      signature,
+      chainNamespace
+    };
+  }
   async disconnectSession() {
     super.checkDisconnectionRequirements();
-    const accounts = await this.provider.request({
-      method: "eth_accounts"
-    });
-    if (accounts && accounts.length > 0) {
-      utils.clearToken(accounts[0], this.name);
-    }
+    await this.clearWalletSession();
   }
   async disconnect() {
     this.rehydrated = false;

package/dist/lib.cjs/connectors/base-solana-connector/baseSolanaConnector.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var baseControllers = require('@toruslabs/base-controllers');
-var wsEmbed = require('@web3auth/ws-embed');
+var siwe = require('viem/siwe');
 require('@babel/runtime/helpers/objectSpread2');
 require('@babel/runtime/helpers/defineProperty');
 require('@segment/analytics-next');
@@ -10,91 +10,82 @@ var baseConnector = require('../../base/connector/baseConnector.js');
 require('../../base/connector/connectorStatus.js');
 var constants = require('../../base/connector/constants.js');
 require('@web3auth/auth');
-var utils = require('../../base/connector/utils.js');
+require('jwt-decode');
+require('../../base/constants.js');
 var index = require('../../base/errors/index.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
+var utils = require('../../base/utils.js');
 require('../../base/wallet/index.js');
+var solana = require('../../base/wallet/solana.js');
 
 class BaseSolanaConnector extends baseConnector.BaseConnector {
   async init(_) {}
-  async getIdentityToken() {
-    if (!this.provider || !this.canAuthorize) throw index.WalletLoginError.notConnectedError();
+  async getAuthTokenInfo() {
+    if (!this.solanaWallet || !this.canAuthorize) throw index.WalletLoginError.notConnectedError();
     if (!this.coreOptions) throw index.WalletInitializationError.invalidParams("Please initialize Web3Auth with a valid options");
     this.status = constants.CONNECTOR_STATUS.AUTHORIZING;
     this.emit(constants.CONNECTOR_EVENTS.AUTHORIZING, {
       connector: this.name
     });
-    const accounts = await this.provider.request({
-      method: wsEmbed.SOLANA_METHOD_TYPES.GET_ACCOUNTS
-    });
-    if (accounts && accounts.length > 0) {
-      const existingToken = utils.getSavedToken(accounts[0], this.name);
-      if (existingToken) {
-        const isExpired = utils.checkIfTokenIsExpired(existingToken);
-        if (!isExpired) {
-          this.status = constants.CONNECTOR_STATUS.AUTHORIZED;
-          this.emit(constants.CONNECTOR_EVENTS.AUTHORIZED, {
-            connector: this.name,
-            identityTokenInfo: {
-              idToken: existingToken
-            }
-          });
-          return {
-            idToken: existingToken
-          };
-        }
-      }
-      const chainId = await this.provider.request({
-        method: "solana_chainId"
-      });
-      const currentChainConfig = this.coreOptions.chains.find(x => x.chainId === chainId);
-      if (!currentChainConfig) throw index.WalletInitializationError.invalidParams("chainConfig is required before authentication");
+    const accounts = this.solanaWallet.accounts.map(a => a.address);
+    if (accounts.length > 0) {
+      const cached = await this.getCachedOrNullAuthTokenInfo(accounts[0]);
+      if (cached) return cached;
+      const authServer = utils.citadelServerUrl(this.coreOptions.authBuildEnv);
       const {
+        challenge,
+        signature,
         chainNamespace
-      } = currentChainConfig;
-      const payload = {
-        domain: window.location.origin,
-        uri: window.location.href,
-        address: accounts[0],
-        chainId: parseInt(chainId, 16),
-        version: "1",
-        nonce: Math.random().toString(36).slice(2),
-        issuedAt: new Date().toISOString()
-      };
-      const challenge = await baseControllers.signChallenge(payload, chainNamespace);
-      const signedMessage = await this.provider.request({
-        method: wsEmbed.SOLANA_METHOD_TYPES.SIGN_MESSAGE,
-        params: {
-          data: challenge,
-          display: "utf8"
-        }
-      });
-      const idToken = await baseControllers.verifySignedChallenge(chainNamespace, signedMessage, challenge, this.name, this.coreOptions.sessionTime, this.coreOptions.clientId, this.coreOptions.web3AuthNetwork);
-      utils.saveToken(accounts[0], this.name, idToken);
-      this.status = constants.CONNECTOR_STATUS.AUTHORIZED;
-      this.emit(constants.CONNECTOR_EVENTS.AUTHORIZED, {
-        connector: this.name,
-        identityTokenInfo: {
-          idToken
-        }
+      } = await this.generateChallengeAndSign(authServer);
+      return this.verifyAndAuthorize({
+        chainNamespace,
+        signedMessage: signature,
+        challenge,
+        authServer
       });
-      return {
-        idToken
-      };
     }
     throw index.WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
   }
-  async disconnectSession() {
-    super.checkDisconnectionRequirements();
-    const accounts = await this.provider.request({
-      method: wsEmbed.SOLANA_METHOD_TYPES.GET_ACCOUNTS
+  async generateChallengeAndSign(authServerUrl, accounts) {
+    const accountsToUse = accounts || this.solanaWallet.accounts.map(a => a.address);
+    if (!accountsToUse || accountsToUse.length === 0) {
+      throw index.WalletLoginError.notConnectedError("No accounts found in the connected wallet");
+    }
+    const walletChains = new Set(this.solanaWallet.chains);
+    const currentChainConfig = this.coreOptions.chains.find(c => {
+      if (c.chainNamespace !== baseControllers.CHAIN_NAMESPACES.SOLANA) return false;
+      const id = solana.getSolanaChainByChainConfig(c);
+      return id != null && walletChains.has(id);
     });
-    if (accounts && accounts.length > 0) {
-      utils.clearToken(accounts[0], this.name);
+    if (!currentChainConfig) {
+      throw index.WalletInitializationError.invalidParams("No Solana chain in common between the connected wallet and Web3Auth chain configuration");
     }
+    const {
+      chainId,
+      chainNamespace
+    } = currentChainConfig;
+    const authServer = authServerUrl || utils.citadelServerUrl(this.coreOptions.authBuildEnv);
+    const payload = {
+      domain: window.location.origin,
+      uri: window.location.href,
+      address: accountsToUse[0],
+      chainId: parseInt(chainId, 16),
+      version: "1",
+      nonce: siwe.generateSiweNonce(),
+      issuedAt: new Date().toISOString()
+    };
+    const challenge = await baseControllers.signChallenge(payload, chainNamespace, authServer);
+    const signedMessage = await solana.walletSignMessage(this.solanaWallet, challenge, accountsToUse[0]);
+    return {
+      challenge,
+      signature: signedMessage,
+      chainNamespace
+    };
+  }
+  async disconnectSession() {
+    super.checkDisconnectionRequirements();
+    await this.clearWalletSession();
   }
   async disconnect() {
     this.rehydrated = false;

package/dist/lib.cjs/connectors/coinbase-connector/coinbaseConnector.js

@@ -5,17 +5,19 @@ var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 require('@segment/analytics-next');
 require('../../base/loglevel.js');
 var IChainInterface = require('../../base/chain/IChainInterface.js');
+var baseControllers = require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
 require('@web3auth/auth');
 var index$1 = require('../../base/errors/index.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+require('../../base/constants.js');
 var index = 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');
 require('../../base/plugin/IPlugin.js');
-var baseControllers = require('@toruslabs/base-controllers');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
 var baseEvmConnector = require('../base-evm-connector/baseEvmConnector.js');
 
 class CoinbaseConnector extends baseEvmConnector.BaseEvmConnector {
@@ -64,12 +66,12 @@ class CoinbaseConnector extends baseEvmConnector.BaseEvmConnector {
     try {
       if (options.autoConnect) {
         this.rehydrated = true;
-        const provider = await this.connect({
+        const connection = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: options.getIdentityToken
+          getAuthTokenInfo: options.getAuthTokenInfo
         });
         // the connect function could fail silently as well.
-        if (!provider) {
+        if (!connection) {
           this.rehydrated = false;
           throw index$1.WalletLoginError.connectionError("Failed to rehydrate.");
         }
@@ -80,7 +82,7 @@ class CoinbaseConnector extends baseEvmConnector.BaseEvmConnector {
   }
   async connect({
     chainId,
-    getIdentityToken
+    getAuthTokenInfo
   }) {
     super.checkConnectionRequirements();
     if (!this.coinbaseProvider) throw index$1.WalletLoginError.notConnectedError("Connector is not initialized");
@@ -106,17 +108,20 @@ class CoinbaseConnector extends baseEvmConnector.BaseEvmConnector {
         // ready to be connected again
         this.disconnect();
       });
-      let identityTokenInfo;
       this.emit(constants.CONNECTOR_EVENTS.CONNECTED, {
-        connector: index.WALLET_CONNECTORS.COINBASE,
+        connectorName: index.WALLET_CONNECTORS.COINBASE,
         reconnected: this.rehydrated,
-        provider: this.provider,
-        identityTokenInfo
+        ethereumProvider: this.provider,
+        solanaWallet: null
       });
-      if (getIdentityToken) {
-        identityTokenInfo = await this.getIdentityToken();
+      if (getAuthTokenInfo) {
+        await this.getAuthTokenInfo();
       }
-      return this.provider;
+      return {
+        ethereumProvider: this.provider,
+        solanaWallet: null,
+        connectorName: this.name
+      };
     } catch (error) {
       // ready again to be connected
       this.status = constants.CONNECTOR_STATUS.READY;

package/dist/lib.cjs/connectors/injected-evm-connector/injectedEvmConnector.js

@@ -5,17 +5,19 @@ require('@babel/runtime/helpers/objectSpread2');
 require('@segment/analytics-next');
 var loglevel = require('../../base/loglevel.js');
 var IChainInterface = require('../../base/chain/IChainInterface.js');
+var baseControllers = require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
 require('@web3auth/auth');
 var index = require('../../base/errors/index.js');
+var utils = require('../../base/utils.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
 var constants = require('../../base/connector/constants.js');
 require('jwt-decode');
+require('../../base/constants.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
-var utils = require('../../base/utils.js');
 var baseEvmConnector = require('../base-evm-connector/baseEvmConnector.js');
-var baseControllers = require('@toruslabs/base-controllers');
 
 class InjectedEvmConnector extends baseEvmConnector.BaseEvmConnector {
   constructor(options) {
@@ -52,11 +54,11 @@ class InjectedEvmConnector extends baseEvmConnector.BaseEvmConnector {
       loglevel.log.debug(`initializing ${this.name} injected connector`);
       if (options.autoConnect) {
         this.rehydrated = true;
-        const provider = await this.connect({
+        const connection = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: options.getIdentityToken
+          getAuthTokenInfo: options.getAuthTokenInfo
         });
-        if (!provider) {
+        if (!connection) {
           this.rehydrated = false;
           throw index.WalletLoginError.connectionError("Failed to rehydrate.");
         }
@@ -67,7 +69,7 @@ class InjectedEvmConnector extends baseEvmConnector.BaseEvmConnector {
   }
   async connect({
     chainId,
-    getIdentityToken
+    getAuthTokenInfo
   }) {
     super.checkConnectionRequirements();
     if (!this.injectedProvider) throw index.WalletLoginError.connectionError("Injected provider is not available");
@@ -99,17 +101,20 @@ class InjectedEvmConnector extends baseEvmConnector.BaseEvmConnector {
         }
       };
       this.injectedProvider.on("accountsChanged", accountDisconnectHandler);
-      let identityTokenInfo;
       this.emit(constants.CONNECTOR_EVENTS.CONNECTED, {
-        connector: this.name,
+        connectorName: this.name,
         reconnected: this.rehydrated,
-        provider: this.injectedProvider,
-        identityTokenInfo
+        ethereumProvider: this.injectedProvider,
+        solanaWallet: null
       });
-      if (getIdentityToken) {
-        identityTokenInfo = await this.getIdentityToken();
+      if (getAuthTokenInfo) {
+        await this.getAuthTokenInfo();
       }
-      return this.injectedProvider;
+      return {
+        ethereumProvider: this.injectedProvider,
+        solanaWallet: null,
+        connectorName: this.name
+      };
     } catch (error) {
       // ready again to be connected
       this.status = constants.CONNECTOR_STATUS.READY;