@web3auth/modal 10.0.0-beta.8 → 10.0.0

package/dist/lib.esm/packages/modal/src/utils.js

@@ -0,0 +1,20 @@
+const getLoginModalAnalyticsProperties = uiConfig => {
+  return {
+    ui_modal_login_methods_order: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.loginMethodsOrder,
+    ui_modal_z_index: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.modalZIndex,
+    ui_modal_display_errors_on_modal: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.displayErrorsOnModal,
+    ui_modal_login_grid_col: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.loginGridCol,
+    ui_modal_primary_button: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.primaryButton,
+    ui_modal_widget_type: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.widgetType,
+    ui_modal_target_id_used: Boolean(uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.targetId),
+    ui_modal_logo_alignment: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.logoAlignment,
+    ui_modal_border_radius_type: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.borderRadiusType,
+    ui_modal_button_radius_type: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.buttonRadiusType,
+    ui_modal_sign_in_methods: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.signInMethods,
+    ui_modal_add_previous_login_hint: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.addPreviousLoginHint,
+    ui_modal_display_installed_external_wallets: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.displayInstalledExternalWallets,
+    ui_modal_display_external_wallets_count: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.displayExternalWalletsCount
+  };
+};
+
+export { getLoginModalAnalyticsProperties };

package/dist/lib.esm/packages/modal/src/vue/Web3AuthProvider.js

@@ -1,4 +1,4 @@
-import { CONNECTOR_EVENTS, Web3AuthContextKey, CONNECTOR_STATUS, WalletInitializationError } from '@web3auth/no-modal';
+import { ANALYTICS_INTEGRATION_TYPE, CONNECTOR_EVENTS, Web3AuthContextKey, CONNECTOR_STATUS, WalletInitializationError } from '@web3auth/no-modal';
 import { defineComponent, h, shallowRef, ref, watch, provide } from 'vue';
 import { Web3Auth } from '../modalManager.js';
 import { WalletServicesInnerProvider } from './WalletServicesInnerProvider.js';
@@ -44,6 +44,9 @@ const Web3AuthProvider = defineComponent({
         web3AuthOptions
       } = newConfig;
       const web3AuthInstance = new Web3Auth(web3AuthOptions);
+      web3AuthInstance.setAnalyticsProperties({
+        integration_type: ANALYTICS_INTEGRATION_TYPE.VUE_COMPOSABLES
+      });
       web3Auth.value = web3AuthInstance;
     }, {
       immediate: true
@@ -59,7 +62,7 @@ const Web3AuthProvider = defineComponent({
         try {
           initError.value = null;
           isInitializing.value = true;
-          await newWeb3Auth.initModal({
+          await newWeb3Auth.init({
             signal: controller.signal
           });
         } catch (error) {
@@ -98,7 +101,11 @@ const Web3AuthProvider = defineComponent({
         status.value = web3Auth.value.status;
       };
       const errorListener = () => {
-        status.value = CONNECTOR_EVENTS.ERRORED;
+        status.value = web3Auth.value.status;
+        if (isConnected.value) {
+          isConnected.value = false;
+          provider.value = null;
+        }
       };
       const mfaEnabledListener = () => {
         isMFAEnabled.value = true;
@@ -112,6 +119,7 @@ const Web3AuthProvider = defineComponent({
         prevWeb3Auth.off(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
         prevWeb3Auth.off(CONNECTOR_EVENTS.CONNECTING, connectingListener);
         prevWeb3Auth.off(CONNECTOR_EVENTS.ERRORED, errorListener);
+        prevWeb3Auth.off(CONNECTOR_EVENTS.REHYDRATION_ERROR, errorListener);
         prevWeb3Auth.off(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
       }
       if (newWeb3Auth && newWeb3Auth !== prevWeb3Auth) {
@@ -123,6 +131,7 @@ const Web3AuthProvider = defineComponent({
         newWeb3Auth.on(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
         newWeb3Auth.on(CONNECTOR_EVENTS.CONNECTING, connectingListener);
         newWeb3Auth.on(CONNECTOR_EVENTS.ERRORED, errorListener);
+        newWeb3Auth.on(CONNECTOR_EVENTS.REHYDRATION_ERROR, errorListener);
         newWeb3Auth.on(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
       }
     }, {

package/dist/lib.esm/packages/modal/src/vue/composables/useIdentityToken.js

@@ -10,12 +10,12 @@ const useIdentityToken = () => {
   const loading = ref(false);
   const error = ref(null);
   const token = ref(null);
-  const authenticateUser = async () => {
+  const getIdentityToken = async () => {
     try {
       if (!web3Auth.value) throw WalletInitializationError.notReady();
       error.value = null;
       loading.value = true;
-      const result = await web3Auth.value.authenticateUser();
+      const result = await web3Auth.value.getIdentityToken();
       if (result !== null && result !== void 0 && result.idToken) {
         token.value = result.idToken;
       }
@@ -35,7 +35,7 @@ const useIdentityToken = () => {
     loading,
     error,
     token,
-    authenticateUser
+    getIdentityToken
   };
 };
 

package/dist/lib.esm/packages/modal/src/vue/composables/useManageMFA.js

@@ -13,7 +13,7 @@ const useManageMFA = () => {
       if (!web3Auth.value) throw WalletInitializationError.notReady();
       error.value = null;
       loading.value = true;
-      await web3Auth.value.enableMFA();
+      await web3Auth.value.manageMFA();
     } catch (err) {
       error.value = err;
     } finally {

package/dist/lib.esm/packages/modal/src/vue/composables/useWeb3AuthConnect.js

@@ -36,12 +36,28 @@ const useWeb3AuthConnect = () => {
       loading.value = false;
     }
   };
+  const connectTo = async (connectorType, loginParams) => {
+    try {
+      if (!web3Auth.value) throw WalletInitializationError.notReady();
+      error.value = null;
+      loading.value = true;
+      const localProvider = await web3Auth.value.connectTo(connectorType, loginParams);
+      connectorName.value = web3Auth.value.connectedConnectorName;
+      return localProvider;
+    } catch (err) {
+      error.value = err;
+      return null;
+    } finally {
+      loading.value = false;
+    }
+  };
   return {
     isConnected,
     loading,
     error,
     connectorName,
-    connect
+    connect,
+    connectTo
   };
 };
 

package/dist/lib.esm/packages/modal/src/vue/solana/composables/useSolanaWallet.js

@@ -1,5 +1,5 @@
 import { Connection } from '@solana/web3.js';
-import { SolanaWallet } from '@web3auth/no-modal';
+import { CHAIN_NAMESPACES, SolanaWallet } from '@web3auth/no-modal';
 import { ref, shallowRef, watch } from 'vue';
 import '@web3auth/no-modal/vue';
 import { useWeb3Auth } from '../../composables/useWeb3Auth.js';
@@ -12,27 +12,33 @@ const useSolanaWallet = () => {
   const accounts = ref([]);
   const solanaWallet = shallowRef(null);
   const connection = shallowRef(null);
+  const setupWallet = async () => {
+    var _web3Auth$value, _web3Auth$value2;
+    if (!((_web3Auth$value = web3Auth.value) !== null && _web3Auth$value !== void 0 && (_web3Auth$value = _web3Auth$value.currentChain) !== null && _web3Auth$value !== void 0 && _web3Auth$value.chainNamespace) || web3Auth.value.currentChain.chainNamespace !== CHAIN_NAMESPACES.SOLANA) {
+      return;
+    }
+    solanaWallet.value = new SolanaWallet(provider.value);
+    const result = await solanaWallet.value.requestAccounts();
+    if ((result === null || result === void 0 ? void 0 : result.length) > 0) {
+      accounts.value = result;
+    }
+    connection.value = new Connection((_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 || (_web3Auth$value2 = _web3Auth$value2.currentChain) === null || _web3Auth$value2 === void 0 ? void 0 : _web3Auth$value2.rpcTarget);
+  };
+  if (provider.value && !solanaWallet.value) {
+    setupWallet();
+  }
   watch(provider, async newVal => {
-    var _accounts$value;
     if (!newVal && solanaWallet.value) {
       solanaWallet.value = null;
       accounts.value = null;
       connection.value = null;
       return;
     }
-    if (!solanaWallet.value) {
-      solanaWallet.value = new SolanaWallet(newVal);
-    }
-    if (solanaWallet.value && ((_accounts$value = accounts.value) === null || _accounts$value === void 0 ? void 0 : _accounts$value.length) === 0) {
-      const result = await solanaWallet.value.requestAccounts();
-      if ((result === null || result === void 0 ? void 0 : result.length) > 0) {
-        accounts.value = result;
-      }
-    }
-    if (solanaWallet.value && !connection.value) {
-      var _web3Auth$value;
-      connection.value = new Connection((_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 || (_web3Auth$value = _web3Auth$value.currentChain) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.rpcTarget);
+    if (newVal && !solanaWallet.value) {
+      setupWallet();
     }
+  }, {
+    immediate: true
   });
   return {
     solanaWallet,

package/dist/lib.esm/packages/modal/src/vue/wagmi/constants.js

@@ -0,0 +1,14 @@
+import { createConfig, http } from '@wagmi/vue';
+import { mainnet } from '@wagmi/vue/chains';
+
+const defaultWagmiConfig = createConfig({
+  chains: [mainnet],
+  connectors: [],
+  // or your basic wallets
+  ssr: true,
+  transports: {
+    [mainnet.id]: http(mainnet.rpcUrls.default.http[0])
+  }
+});
+
+export { defaultWagmiConfig };

package/dist/lib.esm/packages/modal/src/vue/wagmi/provider.js

@@ -1,13 +1,15 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { hydrate } from '@wagmi/core';
-import { useConfig, useAccountEffect, configKey, createConfig } from '@wagmi/vue';
+import { useConfig, useReconnect, useAccountEffect, configKey, createConfig } from '@wagmi/vue';
 import { injected } from '@wagmi/vue/connectors';
-import { log } from '@web3auth/no-modal';
-import { defineChain, http } from 'viem';
-import { defineComponent, h, watch, provide, shallowRef } from 'vue';
+import { randomId } from '@web3auth/auth';
+import { log, CHAIN_NAMESPACES, WalletInitializationError } from '@web3auth/no-modal';
+import { defineChain, webSocket, http } from 'viem';
+import { defineComponent, h, watch, provide, shallowRef, ref } from 'vue';
 import '@web3auth/no-modal/vue';
 import { useWeb3Auth } from '../composables/useWeb3Auth.js';
 import { useWeb3AuthDisconnect } from '../composables/useWeb3AuthDisconnect.js';
+import { defaultWagmiConfig } from './constants.js';
 
 const WEB3AUTH_CONNECTOR_ID = "web3auth";
 
@@ -71,6 +73,9 @@ const Web3AuthWagmiProvider = defineComponent({
       disconnect
     } = useWeb3AuthDisconnect();
     const wagmiConfig = useConfig();
+    const {
+      reconnect
+    } = useReconnect();
     useAccountEffect({
       onDisconnect: async () => {
         log.info("Disconnected from wagmi");
@@ -85,6 +90,7 @@ const Web3AuthWagmiProvider = defineComponent({
           throw new Error("Failed to setup connector");
         }
         await connectWeb3AuthWithWagmi(connector, wagmiConfig);
+        reconnect();
       } else if (!newIsConnected) {
         if (wagmiConfig.state.status === "connected") {
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
@@ -127,6 +133,7 @@ const WagmiProvider = defineComponent({
     }
   },
   setup(props) {
+    var _web3Auth$value;
     const {
       config
     } = props;
@@ -134,9 +141,13 @@ const WagmiProvider = defineComponent({
       web3Auth,
       isInitialized
     } = useWeb3Auth();
-    const finalConfig = shallowRef(null);
+    const finalConfig = shallowRef(defaultWagmiConfig);
+    const configKey = ref(randomId());
+    (_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 || _web3Auth$value.setAnalyticsProperties({
+      wagmi_enabled: true
+    });
     const defineWagmiConfig = () => {
-      var _web3Auth$value;
+      var _web3Auth$value2;
       const configParams = _objectSpread(_objectSpread({
         ssr: true
       }, config), {}, {
@@ -147,10 +158,11 @@ const WagmiProvider = 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;
+        const chains = web3Auth.value.coreOptions.chains.filter(chain => chain.chainNamespace === CHAIN_NAMESPACES.EIP155);
+        if (chains.length === 0) throw WalletInitializationError.invalidParams("No valid chains found in web3auth config for wagmi.");
         chains.forEach(chain => {
           const wagmiChain = defineChain({
             id: Number.parseInt(chain.chainId, 16),
@@ -180,33 +192,40 @@ const WagmiProvider = defineComponent({
           } else {
             wagmiChains.push(wagmiChain);
           }
-          configParams.transports[wagmiChain.id] = http(chain.rpcTarget);
+          configParams.transports[wagmiChain.id] = chain.wsTarget ? webSocket(chain.wsTarget) : http(chain.rpcTarget);
         });
         configParams.chains = [wagmiChains[0], ...wagmiChains.slice(1)];
       }
-      if (!configParams.chains) return;
       return createConfig(configParams);
     };
-    watch(isInitialized, newIsInitialized => {
-      if (newIsInitialized && !finalConfig.value) {
+    const hydrateWagmiConfig = () => {
+      if (finalConfig.value) {
+        hydrate(finalConfig.value, _objectSpread({
+          reconnectOnMount: false
+        }, props.config));
+      }
+    };
+    watch(isInitialized, (newIsInitialized, prevIsInitialized) => {
+      if (newIsInitialized && !prevIsInitialized) {
         finalConfig.value = defineWagmiConfig();
-        if (finalConfig.value) {
-          hydrate(finalConfig.value, _objectSpread({
-            reconnectOnMount: false
-          }, props.config));
-        }
+        hydrateWagmiConfig();
+        configKey.value = randomId();
       }
     }, {
       immediate: true
     });
+    if (!isInitialized.value) {
+      hydrateWagmiConfig();
+    }
     return {
-      finalConfig
+      finalConfig,
+      configKey
     };
   },
   render() {
-    if (!this.finalConfig) return null;
     return h(Web3AuthWagmiInnerProvider, {
-      config: this.finalConfig
+      config: this.finalConfig,
+      key: this.configKey
     }, {
       default: () => {
         var _this$$slots$default3, _this$$slots;