@web3auth/no-modal 10.15.0 → 11.0.0-beta.0

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

@@ -1,87 +1,61 @@
-import { signChallenge, verifySignedChallenge } from '@toruslabs/base-controllers';
-import { SOLANA_METHOD_TYPES } from '@web3auth/ws-embed';
+import { CHAIN_NAMESPACES, signChallenge } from '@toruslabs/base-controllers';
+import { generateSiweNonce } from 'viem/siwe';
+import { getSolanaChainByChainConfig, walletSignMessage } from '../../base/wallet/solana.js';
 import { BaseConnector } from '../../base/connector/baseConnector.js';
 import { WalletLoginError, WalletInitializationError } from '../../base/errors/index.js';
 import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
-import { getSavedToken, checkIfTokenIsExpired, saveToken, clearToken } from '../../base/connector/utils.js';
+import { citadelServerUrl } from '../../base/utils.js';
 
 class BaseSolanaConnector extends BaseConnector {
   async init(_) {}
-  async getIdentityToken() {
-    if (!this.provider || !this.canAuthorize) throw WalletLoginError.notConnectedError();
+  async getAuthTokenInfo() {
+    if (!this.solanaWallet || !this.canAuthorize) throw WalletLoginError.notConnectedError();
     if (!this.coreOptions) throw WalletInitializationError.invalidParams("Please initialize Web3Auth with a valid options");
     this.status = CONNECTOR_STATUS.AUTHORIZING;
     this.emit(CONNECTOR_EVENTS.AUTHORIZING, {
       connector: this.name
     });
-    const accounts = await this.provider.request({
-      method: SOLANA_METHOD_TYPES.GET_ACCOUNTS
-    });
-    if (accounts && accounts.length > 0) {
-      const existingToken = getSavedToken(accounts[0], this.name);
-      if (existingToken) {
-        const isExpired = checkIfTokenIsExpired(existingToken);
-        if (!isExpired) {
-          this.status = CONNECTOR_STATUS.AUTHORIZED;
-          this.emit(CONNECTOR_EVENTS.AUTHORIZED, {
-            connector: this.name,
-            identityTokenInfo: {
-              idToken: existingToken
-            }
-          });
-          return {
-            idToken: existingToken
-          };
-        }
-      }
-      const chainId = await this.provider.request({
-        method: "solana_chainId"
+    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 walletChains = new Set(this.solanaWallet.chains);
+      const currentChainConfig = this.coreOptions.chains.find(c => {
+        if (c.chainNamespace !== CHAIN_NAMESPACES.SOLANA) return false;
+        const id = getSolanaChainByChainConfig(c);
+        return id != null && walletChains.has(id);
       });
-      const currentChainConfig = this.coreOptions.chains.find(x => x.chainId === chainId);
-      if (!currentChainConfig) throw WalletInitializationError.invalidParams("chainConfig is required before authentication");
+      if (!currentChainConfig) {
+        throw WalletInitializationError.invalidParams("No Solana chain in common between the connected wallet and Web3Auth chain configuration");
+      }
       const {
+        chainId,
         chainNamespace
       } = currentChainConfig;
+      const authServer = citadelServerUrl(this.coreOptions.authBuildEnv);
       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),
+        nonce: generateSiweNonce(),
         issuedAt: new Date().toISOString()
       };
-      const challenge = await signChallenge(payload, chainNamespace);
-      const signedMessage = await this.provider.request({
-        method: SOLANA_METHOD_TYPES.SIGN_MESSAGE,
-        params: {
-          data: challenge,
-          display: "utf8"
-        }
-      });
-      const idToken = await verifySignedChallenge(chainNamespace, signedMessage, challenge, this.name, this.coreOptions.sessionTime, this.coreOptions.clientId, this.coreOptions.web3AuthNetwork);
-      saveToken(accounts[0], this.name, idToken);
-      this.status = CONNECTOR_STATUS.AUTHORIZED;
-      this.emit(CONNECTOR_EVENTS.AUTHORIZED, {
-        connector: this.name,
-        identityTokenInfo: {
-          idToken
-        }
+      const challenge = await signChallenge(payload, chainNamespace, authServer);
+      const signedMessage = await walletSignMessage(this.solanaWallet, challenge, accounts[0]);
+      return this.verifyAndAuthorize({
+        chainNamespace,
+        signedMessage,
+        challenge,
+        authServer
       });
-      return {
-        idToken
-      };
     }
     throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
   }
   async disconnectSession() {
     super.checkDisconnectionRequirements();
-    const accounts = await this.provider.request({
-      method: SOLANA_METHOD_TYPES.GET_ACCOUNTS
-    });
-    if (accounts && accounts.length > 0) {
-      clearToken(accounts[0], this.name);
-    }
+    await this.clearWalletSession();
   }
   async disconnect() {
     this.rehydrated = false;

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

@@ -53,12 +53,12 @@ class CoinbaseConnector extends 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 WalletLoginError.connectionError("Failed to rehydrate.");
         }
@@ -69,7 +69,7 @@ class CoinbaseConnector extends BaseEvmConnector {
   }
   async connect({
     chainId,
-    getIdentityToken
+    getAuthTokenInfo
   }) {
     super.checkConnectionRequirements();
     if (!this.coinbaseProvider) throw WalletLoginError.notConnectedError("Connector is not initialized");
@@ -95,17 +95,20 @@ class CoinbaseConnector extends BaseEvmConnector {
         // ready to be connected again
         this.disconnect();
       });
-      let identityTokenInfo;
       this.emit(CONNECTOR_EVENTS.CONNECTED, {
-        connector: WALLET_CONNECTORS.COINBASE,
+        connectorName: 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 = CONNECTOR_STATUS.READY;

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

@@ -42,11 +42,11 @@ class InjectedEvmConnector extends BaseEvmConnector {
       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 WalletLoginError.connectionError("Failed to rehydrate.");
         }
@@ -57,7 +57,7 @@ class InjectedEvmConnector extends BaseEvmConnector {
   }
   async connect({
     chainId,
-    getIdentityToken
+    getAuthTokenInfo
   }) {
     super.checkConnectionRequirements();
     if (!this.injectedProvider) throw WalletLoginError.connectionError("Injected provider is not available");
@@ -89,17 +89,20 @@ class InjectedEvmConnector extends BaseEvmConnector {
         }
       };
       this.injectedProvider.on("accountsChanged", accountDisconnectHandler);
-      let identityTokenInfo;
       this.emit(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 = CONNECTOR_STATUS.READY;

package/dist/lib.esm/connectors/injected-solana-connector/walletStandardConnector.js

@@ -1,14 +1,13 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { StandardConnect, StandardDisconnect } from '@wallet-standard/features';
 import { BaseSolanaConnector } from '../base-solana-connector/baseSolanaConnector.js';
-import { WalletStandardProvider } from '../../providers/solana-provider/providers/injectedProviders/walletStandardProvider.js';
-import { getSolanaChainByChainConfig } from '../../providers/solana-provider/providers/injectedProviders/utils.js';
 import { normalizeWalletName } from '../../base/utils.js';
 import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
 import { log } from '../../base/loglevel.js';
 import { WalletLoginError } from '../../base/errors/index.js';
+import { getSolanaChainByChainConfig } from '../../base/wallet/solana.js';
 
 class WalletStandardConnector extends BaseSolanaConnector {
   constructor(options) {
@@ -20,7 +19,6 @@ class WalletStandardConnector extends BaseSolanaConnector {
     _defineProperty(this, "isInjected", true);
     _defineProperty(this, "status", CONNECTOR_STATUS.NOT_READY);
     _defineProperty(this, "wallet", null);
-    _defineProperty(this, "injectedProvider", null);
     this.name = options.name;
     this.icon = options.wallet.icon;
     // in VueJS, for some wallets e.g. Gate, Solflare, when connecting it throws error "attempted to get private field on non-instance"
@@ -28,11 +26,8 @@ class WalletStandardConnector extends BaseSolanaConnector {
     // ref: https://stackoverflow.com/questions/64917686/vue-array-converted-to-proxy-object
     this.wallet = ["gate", "solflare"].includes(this.name) ? Object.freeze(options.wallet) : options.wallet;
   }
-  get provider() {
-    if (this.status !== CONNECTOR_STATUS.NOT_READY && this.injectedProvider) {
-      return this.injectedProvider;
-    }
-    return null;
+  get solanaWallet() {
+    return this.wallet;
   }
   get isWalletConnected() {
     return !!(this.connected && this.wallet.accounts.length > 0);
@@ -43,24 +38,17 @@ class WalletStandardConnector extends BaseSolanaConnector {
     super.checkInitializationRequirements({
       chainConfig
     });
-    this.injectedProvider = new WalletStandardProvider({
-      config: {
-        chain: chainConfig,
-        chains: this.coreOptions.chains
-      }
-    });
-    await this.injectedProvider.setupProvider(this.wallet, options.chainId);
     this.status = CONNECTOR_STATUS.READY;
     this.emit(CONNECTOR_EVENTS.READY, this.name);
     try {
       log.debug("initializing solana 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 WalletLoginError.connectionError("Failed to rehydrate.");
         }
@@ -71,7 +59,7 @@ class WalletStandardConnector extends BaseSolanaConnector {
   }
   async connect({
     chainId,
-    getIdentityToken
+    getAuthTokenInfo
   }) {
     try {
       super.checkConnectionRequirements();
@@ -88,17 +76,20 @@ class WalletStandardConnector extends BaseSolanaConnector {
       }
       if (this.wallet.accounts.length === 0) throw WalletLoginError.connectionError();
       this.status = CONNECTOR_STATUS.CONNECTED;
-      let identityTokenInfo;
       this.emit(CONNECTOR_EVENTS.CONNECTED, {
-        connector: this.name,
+        connectorName: this.name,
         reconnected: this.rehydrated,
-        provider: this.provider,
-        identityTokenInfo
+        ethereumProvider: null,
+        solanaWallet: this.solanaWallet
       });
-      if (getIdentityToken) {
-        identityTokenInfo = await this.getIdentityToken();
+      if (getAuthTokenInfo) {
+        await this.getAuthTokenInfo();
       }
-      return this.provider;
+      return {
+        ethereumProvider: null,
+        solanaWallet: this.solanaWallet,
+        connectorName: this.name
+      };
     } catch (error) {
       // ready again to be connected
       this.status = CONNECTOR_STATUS.READY;
@@ -116,7 +107,6 @@ class WalletStandardConnector extends BaseSolanaConnector {
       await ((_this$wallet$features = this.wallet.features[StandardDisconnect]) === null || _this$wallet$features === void 0 ? void 0 : _this$wallet$features.disconnect());
       if (options.cleanup) {
         this.status = CONNECTOR_STATUS.NOT_READY;
-        this.injectedProvider = null;
       } else {
         this.status = CONNECTOR_STATUS.READY;
       }
@@ -129,10 +119,8 @@ class WalletStandardConnector extends BaseSolanaConnector {
     if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
-  async switchChain(params, init = false) {
-    var _this$injectedProvide;
-    super.checkSwitchChainRequirements(params, init);
-    await ((_this$injectedProvide = this.injectedProvider) === null || _this$injectedProvide === void 0 ? void 0 : _this$injectedProvide.switchChain(params));
+  async switchChain(_params, _init = false) {
+    throw WalletLoginError.unsupportedOperation("Injected Solana wallets do not support chain switching.");
   }
   async enableMFA() {
     throw new Error("Method not implemented.");