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

package/dist/lib.cjs/vue/wagmi/provider.js

@@ -3,7 +3,6 @@
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var core = require('@wagmi/core');
 var vue$1 = require('@wagmi/vue');
-var connectors = require('@wagmi/vue/connectors');
 var auth = require('@web3auth/auth');
 var viem = require('viem');
 var vue = require('vue');
@@ -18,7 +17,7 @@ require('@toruslabs/http-helpers');
 require('../../base/constants.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
-require('../../base/connector/constants.js');
+var constants$1 = require('../../base/connector/constants.js');
 require('jwt-decode');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
@@ -26,23 +25,42 @@ var useWeb3Auth = require('../composables/useWeb3Auth.js');
 var useWeb3AuthDisconnect = require('../composables/useWeb3AuthDisconnect.js');
 var constants = require('./constants.js');
 
-const WEB3AUTH_CONNECTOR_ID = "web3auth";
 function getWeb3authConnector(config) {
-  return config.connectors.find(c => c.id === WEB3AUTH_CONNECTOR_ID);
+  return config.connectors.find(c => c.id === constants$1.WEB3AUTH_CONNECTOR_ID);
 }
-// Helper to initialize connectors for the given wallets
+// Helper to create a Web3Auth connector to connect with wagmi
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-async function setupConnector(provider, config) {
-  let connector = getWeb3authConnector(config);
-  if (connector) return connector;
-  // Create new connector if not already existing
-  connector = connectors.injected({
+function createWeb3AuthConnectorForWagmi(provider) {
+  const baseConnector = core.injected({
     target: {
       provider: provider,
-      id: WEB3AUTH_CONNECTOR_ID,
+      id: constants$1.WEB3AUTH_CONNECTOR_ID,
       name: "Web3Auth"
     }
   });
+  return config => {
+    const connector = baseConnector(config);
+    const baseOnAccountsChanged = connector.onAccountsChanged.bind(connector);
+    connector.onAccountsChanged = accounts => {
+      // we need to handle the `accountsChanged` event emitted on the cross-namespace chain switch.
+      // on evm -> solana, the accountsChanged event is emitted with the solana address, which is not valid for evm.
+      // that causes the `invalid account address` error in wagmi. So, here, we're filtering out the solana addresses.
+      if (accounts.length > 0 && !accounts.every(account => typeof account === "string" && viem.isAddress(account))) {
+        loglevel.log.warn("onAccountsChanged::accountsChanged event received on non-EVM address");
+        return;
+      }
+      baseOnAccountsChanged(accounts);
+    };
+    return connector;
+  };
+}
+// Helper to initialize connectors for the given wallets
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function setupConnector(provider, config) {
+  let connector = getWeb3authConnector(config);
+  if (connector) return connector;
+  // Create new connector if not already existing
+  connector = createWeb3AuthConnectorForWagmi(provider);
   const result = config._internal.connectors.setup(connector);
   config._internal.connectors.setState(current => [...current, result]);
   return result;
@@ -69,8 +87,8 @@ async function connectWeb3AuthWithWagmi(connector, config) {
   }));
 }
 function resetConnectorState(config) {
-  config._internal.connectors.setState(prev => prev.filter(c => c.id !== WEB3AUTH_CONNECTOR_ID));
-  config.connectors.filter(c => c.id !== WEB3AUTH_CONNECTOR_ID);
+  config._internal.connectors.setState(prev => prev.filter(c => c.id !== constants$1.WEB3AUTH_CONNECTOR_ID));
+  config.connectors.filter(c => c.id !== constants$1.WEB3AUTH_CONNECTOR_ID);
 }
 async function disconnectWeb3AuthFromWagmi(config) {
   var _config$storage3, _config$storage4;
@@ -89,7 +107,9 @@ const Web3AuthWagmiProvider = vue.defineComponent({
   setup() {
     const {
       isConnected,
-      connection
+      connection,
+      web3Auth,
+      chainNamespace
     } = useWeb3Auth.useWeb3Auth();
     const {
       disconnect
@@ -98,11 +118,15 @@ const Web3AuthWagmiProvider = vue.defineComponent({
     const {
       mutate: reconnect
     } = vue$1.useReconnect();
-    const lastSyncedWeb3AuthConnection = vue.shallowRef(null);
+    const lastSyncedProvider = vue.shallowRef(null);
+    const lastSyncedConnectorName = vue.ref(null);
+    const suppressWagmiDisconnect = vue.ref(false);
     vue$1.useConnectionEffect({
       onDisconnect: async () => {
         loglevel.log.info("Disconnected from wagmi");
-        if (isConnected.value) await disconnect();
+        const isSuppressed = suppressWagmiDisconnect.value;
+        suppressWagmiDisconnect.value = false;
+        if (!isSuppressed && isConnected.value) await disconnect();
         const connector = getWeb3authConnector(wagmiConfig);
         // reset wagmi connector state if the provider handles disconnection because of the accountsChanged event
         // from the connected provider
@@ -111,30 +135,43 @@ const Web3AuthWagmiProvider = vue.defineComponent({
         }
       }
     });
-    vue.watch([isConnected, connection], async () => {
+    vue.watch([isConnected, connection, chainNamespace], async () => {
       var _newConnection$ethere;
       const newIsConnected = isConnected.value;
       const newConnection = connection.value;
       const newEth = (_newConnection$ethere = newConnection === null || newConnection === void 0 ? void 0 : newConnection.ethereumProvider) !== null && _newConnection$ethere !== void 0 ? _newConnection$ethere : null;
-      if (newIsConnected && newConnection && newEth) {
-        // Linked-account switches can reuse or replace the underlying wallet provider,
-        // so key wagmi resyncs off the Web3Auth connection object instead of provider identity.
-        if (lastSyncedWeb3AuthConnection.value !== newConnection) {
-          if (getWeb3authConnector(wagmiConfig)) {
+      const w3aWagmiConnector = getWeb3authConnector(wagmiConfig);
+      const shouldBindToWagmi = newIsConnected && chainNamespace.value === baseControllers.CHAIN_NAMESPACES.EIP155 && Boolean(newConnection && newEth);
+      if (shouldBindToWagmi) {
+        var _web3Auth$value;
+        const hasSameBinding = lastSyncedProvider.value === newEth && lastSyncedConnectorName.value === newConnection.connectorName && (newConnection === null || newConnection === void 0 ? void 0 : newConnection.connectorName) === ((_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.connection.connectorName) && wagmiConfig.state.status === "connected";
+        if (hasSameBinding) {
+          return;
+        }
+        if (!hasSameBinding && w3aWagmiConnector) {
+          if (wagmiConfig.state.status === "connected") {
+            suppressWagmiDisconnect.value = true;
+            await disconnectWeb3AuthFromWagmi(wagmiConfig);
+          } else {
             resetConnectorState(wagmiConfig);
           }
-          lastSyncedWeb3AuthConnection.value = newConnection;
-          const connector = await setupConnector(newEth, wagmiConfig);
-          if (!connector) {
-            throw new Error("Failed to setup connector");
-          }
-          await connectWeb3AuthWithWagmi(connector, wagmiConfig);
-          reconnect();
         }
-      } else if (!newIsConnected) {
-        lastSyncedWeb3AuthConnection.value = null;
+        lastSyncedProvider.value = newEth;
+        lastSyncedConnectorName.value = newConnection.connectorName;
+        const connector = setupConnector(newEth, wagmiConfig);
+        if (!connector) {
+          throw new Error("Failed to setup connector");
+        }
+        await connectWeb3AuthWithWagmi(connector, wagmiConfig);
+        reconnect();
+      } else if (!newIsConnected || chainNamespace.value !== baseControllers.CHAIN_NAMESPACES.EIP155) {
+        lastSyncedProvider.value = null;
+        lastSyncedConnectorName.value = null;
         if (wagmiConfig.state.status === "connected") {
+          suppressWagmiDisconnect.value = true;
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
+        } else if (w3aWagmiConnector) {
+          resetConnectorState(wagmiConfig);
         }
       }
     }, {
@@ -198,7 +235,7 @@ const WagmiProvider = vue.defineComponent({
       return viem.fallback(transports);
     };
     const defineWagmiConfig = () => {
-      var _web3Auth$value;
+      var _web3Auth$value2;
       const configParams = _objectSpread(_objectSpread({
         ssr: true
       }, config), {}, {
@@ -209,7 +246,7 @@ const WagmiProvider = vue.defineComponent({
         client: undefined
       });
       const wagmiChains = [];
-      if (isInitialized.value && web3Auth !== null && web3Auth !== void 0 && (_web3Auth$value = web3Auth.value) !== null && _web3Auth$value !== void 0 && (_web3Auth$value = _web3Auth$value.coreOptions) !== null && _web3Auth$value !== void 0 && _web3Auth$value.chains) {
+      if (isInitialized.value && web3Auth !== null && web3Auth !== void 0 && (_web3Auth$value2 = web3Auth.value) !== null && _web3Auth$value2 !== void 0 && (_web3Auth$value2 = _web3Auth$value2.coreOptions) !== null && _web3Auth$value2 !== void 0 && _web3Auth$value2.chains) {
         var _web3Auth$value$curre;
         const defaultChainId = (_web3Auth$value$curre = web3Auth.value.currentChain) === null || _web3Auth$value$curre === void 0 ? void 0 : _web3Auth$value$curre.chainId;
         const chains = web3Auth.value.coreOptions.chains.filter(chain => chain.chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155);
@@ -257,8 +294,8 @@ const WagmiProvider = vue.defineComponent({
       }
     };
     vue.watch(isInitialized, (newIsInitialized, prevIsInitialized) => {
-      var _web3Auth$value2;
-      (_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 || _web3Auth$value2.setAnalyticsProperties({
+      var _web3Auth$value3;
+      (_web3Auth$value3 = web3Auth.value) === null || _web3Auth$value3 === void 0 || _web3Auth$value3.setAnalyticsProperties({
         wagmi_enabled: true
       });
       if (newIsInitialized && !prevIsInitialized) {
@@ -291,3 +328,9 @@ const WagmiProvider = vue.defineComponent({
 });
 
 exports.WagmiProvider = WagmiProvider;
+exports.connectWeb3AuthWithWagmi = connectWeb3AuthWithWagmi;
+exports.createWeb3AuthConnectorForWagmi = createWeb3AuthConnectorForWagmi;
+exports.disconnectWeb3AuthFromWagmi = disconnectWeb3AuthFromWagmi;
+exports.getWeb3authConnector = getWeb3authConnector;
+exports.resetConnectorState = resetConnectorState;
+exports.setupConnector = setupConnector;

package/dist/lib.esm/account-linking/errors.js

@@ -0,0 +1,92 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import { Web3AuthError } from '../base/errors/index.js';
+
+class AccountLinkingError extends Web3AuthError {
+  constructor(code, message, cause) {
+    super(code, message, cause);
+    Object.defineProperty(this, "name", {
+      value: "AccountLinkingError",
+      configurable: true
+    });
+  }
+  static fromCode(code, extraMessage = "", cause) {
+    return new AccountLinkingError(code, `${AccountLinkingError.messages[code]}. ${extraMessage}`, cause);
+  }
+  static requestFailed(extraMessage = "", cause) {
+    return AccountLinkingError.fromCode(5401, extraMessage, cause);
+  }
+  static serverNotConfigured(extraMessage = "", cause) {
+    return AccountLinkingError.fromCode(5402, extraMessage, cause);
+  }
+  static primaryTokenNotAvailable(extraMessage = "", cause) {
+    return AccountLinkingError.fromCode(5403, extraMessage, cause);
+  }
+  static walletProofFailed(extraMessage = "", cause) {
+    return AccountLinkingError.fromCode(5404, extraMessage, cause);
+  }
+  static unsupportedConnector(extraMessage = "", cause) {
+    return AccountLinkingError.fromCode(5405, extraMessage, cause);
+  }
+  static cannotUnlinkActiveAccount() {
+    return AccountLinkingError.fromCode(5406);
+  }
+  static accountNotLinked(message = "", cause) {
+    return AccountLinkingError.fromCode(5407, message, cause);
+  }
+  static cannotUnlinkPrimaryAccount() {
+    return AccountLinkingError.fromCode(5408);
+  }
+  toString() {
+    return `[${this.code}] ${this.message}`;
+  }
+}
+_defineProperty(AccountLinkingError, "messages", {
+  5000: "Custom",
+  5401: "Account linking request failed",
+  5402: "Citadel server URL is not configured",
+  5403: "Primary identity token is not available",
+  5404: "Failed to obtain wallet proof token",
+  5405: "Connector is not supported for wallet linking",
+  5406: "Cannot unlink active account",
+  5407: "Account not linked",
+  5408: "Cannot unlink primary account"
+});
+async function getAccountLinkingRequestError(error) {
+  if (error instanceof AccountLinkingError) {
+    return error;
+  }
+  if (error instanceof Response) {
+    if (error.status === 409) {
+      return AccountLinkingError.requestFailed("This wallet address is already registered on this dApp");
+    }
+    if (error.json && typeof error.json === "function") {
+      try {
+        var _json$message;
+        const json = await error.json();
+        return AccountLinkingError.requestFailed((_json$message = json.message) !== null && _json$message !== void 0 ? _json$message : "Failed to link account");
+      } catch {
+        // continue
+      }
+    }
+  }
+  return AccountLinkingError.requestFailed(error instanceof Error ? error.message : JSON.stringify(error), error);
+}
+function formatAccountLinkingErrorMessage(error, fallbackMessage = "Unknown error during the operation.") {
+  if (error instanceof AccountLinkingError) {
+    return error.toString();
+  }
+  if (error instanceof Web3AuthError) {
+    return `[${error.code}] Account linking error: ${error.message || fallbackMessage}`;
+  }
+  if (error instanceof Error) {
+    return `Account linking error: ${error.message || fallbackMessage}`;
+  }
+  try {
+    const stringifiedError = JSON.stringify(error);
+    return stringifiedError;
+  } catch {
+    return fallbackMessage;
+  }
+}
+
+export { AccountLinkingError, formatAccountLinkingErrorMessage, getAccountLinkingRequestError };

package/dist/lib.esm/account-linking/index.js

@@ -1 +1,2 @@
+export { AccountLinkingError, formatAccountLinkingErrorMessage, getAccountLinkingRequestError } from './errors.js';
 export { makeAccountLinkingRequest, makeAccountUnlinkingRequest } from './rest.js';

package/dist/lib.esm/account-linking/rest.js

@@ -1,5 +1,5 @@
 import { post } from '@toruslabs/http-helpers';
-import { AccountLinkingError } from '../base/errors/index.js';
+import { getAccountLinkingRequestError, AccountLinkingError } from './errors.js';
 
 /**
  * Send both identity proofs to the Citadel account-linking endpoint and
@@ -17,8 +17,8 @@ async function makeAccountLinkingRequest(authServerUrl, accessToken, payload) {
       }
     });
   } catch (cause) {
-    const message = cause instanceof Error ? cause.message : String(cause);
-    throw AccountLinkingError.requestFailed(message, cause);
+    const accountLinkingError = await getAccountLinkingRequestError(cause);
+    throw accountLinkingError;
   }
   if (!result.success) {
     var _result$message;

package/dist/lib.esm/account-linking/vue.js

@@ -20,7 +20,6 @@ const useLinkAccount = () => {
       linkedAccounts.value = result.linkedAccounts;
       return result;
     } catch (err) {
-      log.error("Error linking account", err);
       error.value = err;
     } finally {
       loading.value = false;

package/dist/lib.esm/base/connector/constants.js

@@ -1,5 +1,6 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 
+const WEB3AUTH_CONNECTOR_ID = "web3auth";
 const CONNECTOR_STATUS = {
   NOT_READY: "not_ready",
   READY: "ready",
@@ -31,4 +32,4 @@ const CONNECTOR_INITIAL_AUTHENTICATION_MODE = {
   CONNECT_AND_SIGN: "connect-and-sign"
 };
 
-export { CONNECTOR_CATEGORY, CONNECTOR_EVENTS, CONNECTOR_INITIAL_AUTHENTICATION_MODE, CONNECTOR_STATUS };
+export { CONNECTOR_CATEGORY, CONNECTOR_EVENTS, CONNECTOR_INITIAL_AUTHENTICATION_MODE, CONNECTOR_STATUS, WEB3AUTH_CONNECTOR_ID };

package/dist/lib.esm/base/errors/index.js

@@ -188,7 +188,11 @@ class WalletOperationsError extends Web3AuthError {
     });
   }
   static fromCode(code, extraMessage = "", cause) {
-    return new WalletOperationsError(code, `${WalletOperationsError.messages[code]}, ${extraMessage}`, cause);
+    let message = WalletOperationsError.messages[code];
+    if (extraMessage) {
+      message = `${message}, ${extraMessage}`;
+    }
+    return new WalletOperationsError(code, message, cause);
   }
 
   // Custom methods
@@ -201,58 +205,16 @@ class WalletOperationsError extends Web3AuthError {
   static chainNamespaceNotAllowed(extraMessage = "", cause) {
     return WalletOperationsError.fromCode(5203, extraMessage, cause);
   }
+  static userRejected(extraMessage = "", cause) {
+    return WalletOperationsError.fromCode(5204, extraMessage, cause);
+  }
 }
 _defineProperty(WalletOperationsError, "messages", {
   5000: "Custom",
   5201: "Provided chainId is not allowed",
-  5202: "This operation is not allowed"
-});
-class AccountLinkingError extends Web3AuthError {
-  constructor(code, message, cause) {
-    super(code, message, cause);
-    Object.defineProperty(this, "name", {
-      value: "AccountLinkingError",
-      configurable: true
-    });
-  }
-  static fromCode(code, extraMessage = "", cause) {
-    return new AccountLinkingError(code, `${AccountLinkingError.messages[code]}. ${extraMessage}`, cause);
-  }
-  static requestFailed(extraMessage = "", cause) {
-    return AccountLinkingError.fromCode(5401, extraMessage, cause);
-  }
-  static serverNotConfigured(extraMessage = "", cause) {
-    return AccountLinkingError.fromCode(5402, extraMessage, cause);
-  }
-  static primaryTokenNotAvailable(extraMessage = "", cause) {
-    return AccountLinkingError.fromCode(5403, extraMessage, cause);
-  }
-  static walletProofFailed(extraMessage = "", cause) {
-    return AccountLinkingError.fromCode(5404, extraMessage, cause);
-  }
-  static unsupportedConnector(extraMessage = "", cause) {
-    return AccountLinkingError.fromCode(5405, extraMessage, cause);
-  }
-  static cannotUnlinkActiveAccount() {
-    return AccountLinkingError.fromCode(5406);
-  }
-  static accountNotLinked(message = "", cause) {
-    return AccountLinkingError.fromCode(5407, message, cause);
-  }
-  static cannotUnlinkPrimaryAccount() {
-    return AccountLinkingError.fromCode(5408);
-  }
-}
-_defineProperty(AccountLinkingError, "messages", {
-  5000: "Custom",
-  5401: "Account linking request failed",
-  5402: "Citadel server URL is not configured",
-  5403: "Primary identity token is not available",
-  5404: "Failed to obtain wallet proof token",
-  5405: "Connector is not supported for wallet linking",
-  5406: "Cannot unlink active account",
-  5407: "Account not linked",
-  5408: "Cannot unlink primary account"
+  5202: "This operation is not allowed",
+  5203: "Chain namespace is not allowed",
+  5204: "User rejected the request"
 });
 class WalletProviderError extends Web3AuthError {
   constructor(code, message, cause) {
@@ -286,5 +248,14 @@ _defineProperty(WalletProviderError, "messages", {
   5302: "'args.method' must be a non-empty string.",
   5303: "'args.params' must be an object or array if provided."
 });
+function isUserRejectedError(error) {
+  if (error instanceof Web3AuthError && error.code === 5203) return true;
+  if (error instanceof Error) {
+    var _error$message;
+    const normalizedMessage = ((_error$message = error.message) === null || _error$message === void 0 ? void 0 : _error$message.toLowerCase()) || "";
+    return normalizedMessage.includes("user rejected the request");
+  }
+  return false;
+}
 
-export { AccountLinkingError, WalletInitializationError, WalletLoginError, WalletOperationsError, WalletProviderError, Web3AuthError };
+export { WalletInitializationError, WalletLoginError, WalletOperationsError, WalletProviderError, Web3AuthError, isUserRejectedError };

package/dist/lib.esm/base/utils.js

@@ -149,7 +149,7 @@ const getWalletServicesAnalyticsProperties = walletServicesConfig => {
     ws_default_portfolio: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig10 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig10 === void 0 ? void 0 : _walletServicesConfig10.defaultPortfolio
   };
 };
-const sdkVersion = "11.0.0-beta.1";
+const sdkVersion = "11.0.0";
 const getErrorAnalyticsProperties = error => {
   try {
     const code = error instanceof Web3AuthError ? error.code : error === null || error === void 0 ? void 0 : error.code;