@web3auth/no-modal 10.0.0-alpha.0 → 10.0.0-alpha.1

package/dist/lib.esm/react/no-modal/Web3AuthInnerContext.js

@@ -1,7 +1,7 @@
 import { createContext, useState, useCallback, useEffect, useMemo, createElement } from 'react';
 import { WalletInitializationError, WalletLoginError } from '../../base/errors/index.js';
 import { Web3AuthNoModal } from '../../noModal.js';
-import { ADAPTER_EVENTS, ADAPTER_STATUS } from '../../base/adapter/constants.js';
+import { CONNECTOR_EVENTS, CONNECTOR_STATUS } from '../../base/connector/constants.js';
 
 const Web3AuthInnerContext = createContext(null);
 function Web3AuthInnerProvider(params) {
@@ -20,10 +20,6 @@ function Web3AuthInnerProvider(params) {
   const [isMFAEnabled, setIsMFAEnabled] = useState(false);
   const [isInitialized, setIsInitialized] = useState(false);
   const [status, setStatus] = useState(null);
-  const addPlugin = useCallback(plugin => {
-    if (!web3Auth) throw WalletInitializationError.notReady();
-    return web3Auth.addPlugin(plugin);
-  }, [web3Auth]);
   const getPlugin = useCallback(name => {
     if (!web3Auth) throw WalletInitializationError.notReady();
     return web3Auth.getPlugin(name);
@@ -38,15 +34,9 @@ function Web3AuthInnerProvider(params) {
     };
     resetHookState();
     const {
-      web3AuthOptions,
-      adapters = [],
-      plugins = []
+      web3AuthOptions
     } = config;
     const web3Instance = new Web3AuthNoModal(web3AuthOptions);
-    if (adapters.length) adapters.map(adapter => web3Instance.configureAdapter(adapter));
-    if (plugins.length) plugins.forEach(plugin => {
-      web3Instance.addPlugin(plugin);
-    });
     setWeb3Auth(web3Instance);
   }, [config]);
   useEffect(() => {
@@ -83,7 +73,7 @@ function Web3AuthInnerProvider(params) {
   // TODO: don't throw error in init, connect in v9
 
   useEffect(() => {
-    const notReadyListener = () => setStatus(ADAPTER_STATUS.NOT_READY);
+    const notReadyListener = () => setStatus(CONNECTOR_STATUS.NOT_READY);
     const readyListener = () => {
       setStatus(web3Auth.status);
       setIsInitialized(true);
@@ -91,7 +81,7 @@ function Web3AuthInnerProvider(params) {
     const connectedListener = () => {
       setStatus(web3Auth.status);
       // we do this because of rehydration issues. status connected is fired first but web3auth sdk is not ready yet.
-      if (web3Auth.status === ADAPTER_STATUS.CONNECTED) {
+      if (web3Auth.status === CONNECTOR_STATUS.CONNECTED) {
         setIsInitialized(true);
         setIsConnected(true);
       }
@@ -104,26 +94,26 @@ function Web3AuthInnerProvider(params) {
       setStatus(web3Auth.status);
     };
     const errorListener = () => {
-      setStatus(ADAPTER_STATUS.ERRORED);
+      setStatus(CONNECTOR_STATUS.ERRORED);
     };
     if (web3Auth) {
       // web3Auth is initialized here.
       setStatus(web3Auth.status);
-      web3Auth.on(ADAPTER_EVENTS.NOT_READY, notReadyListener);
-      web3Auth.on(ADAPTER_EVENTS.READY, readyListener);
-      web3Auth.on(ADAPTER_EVENTS.CONNECTED, connectedListener);
-      web3Auth.on(ADAPTER_EVENTS.DISCONNECTED, disconnectedListener);
-      web3Auth.on(ADAPTER_EVENTS.CONNECTING, connectingListener);
-      web3Auth.on(ADAPTER_EVENTS.ERRORED, errorListener);
+      web3Auth.on(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
+      web3Auth.on(CONNECTOR_EVENTS.READY, readyListener);
+      web3Auth.on(CONNECTOR_EVENTS.CONNECTED, connectedListener);
+      web3Auth.on(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
+      web3Auth.on(CONNECTOR_EVENTS.CONNECTING, connectingListener);
+      web3Auth.on(CONNECTOR_EVENTS.ERRORED, errorListener);
     }
     return () => {
       if (web3Auth) {
-        web3Auth.off(ADAPTER_EVENTS.NOT_READY, notReadyListener);
-        web3Auth.off(ADAPTER_EVENTS.READY, readyListener);
-        web3Auth.off(ADAPTER_EVENTS.CONNECTED, connectedListener);
-        web3Auth.off(ADAPTER_EVENTS.DISCONNECTED, disconnectedListener);
-        web3Auth.off(ADAPTER_EVENTS.CONNECTING, connectingListener);
-        web3Auth.off(ADAPTER_EVENTS.ERRORED, errorListener);
+        web3Auth.off(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
+        web3Auth.off(CONNECTOR_EVENTS.READY, readyListener);
+        web3Auth.off(CONNECTOR_EVENTS.CONNECTED, connectedListener);
+        web3Auth.off(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
+        web3Auth.off(CONNECTOR_EVENTS.CONNECTING, connectingListener);
+        web3Auth.off(CONNECTOR_EVENTS.ERRORED, errorListener);
       }
     };
   }, [web3Auth]);
@@ -161,21 +151,10 @@ function Web3AuthInnerProvider(params) {
       setIsConnecting(false);
     }
   }, [web3Auth]);
-  const addAndSwitchChain = useCallback(async chainConfig => {
-    if (!web3Auth) throw WalletInitializationError.notReady();
-    await web3Auth.addChain(chainConfig);
-    await web3Auth.switchChain({
-      chainId: chainConfig.chainId
-    });
-  }, [web3Auth]);
   const authenticateUser = useCallback(async () => {
     if (!web3Auth) throw WalletInitializationError.notReady();
     return web3Auth.authenticateUser();
   }, [web3Auth]);
-  const addChain = useCallback(async chainConfig => {
-    if (!web3Auth) throw WalletInitializationError.notReady();
-    return web3Auth.addChain(chainConfig);
-  }, [web3Auth]);
   const switchChain = useCallback(chainParams => {
     if (!web3Auth) throw WalletInitializationError.notReady();
     return web3Auth.switchChain(chainParams);
@@ -194,9 +173,6 @@ function Web3AuthInnerProvider(params) {
       enableMFA,
       manageMFA,
       logout,
-      addAndSwitchChain,
-      addChain,
-      addPlugin,
       authenticateUser,
       switchChain,
       isInitializing,
@@ -204,7 +180,7 @@ function Web3AuthInnerProvider(params) {
       initError,
       connectError
     };
-  }, [web3Auth, isConnected, isInitialized, provider, userInfo, isMFAEnabled, status, connectTo, getPlugin, enableMFA, manageMFA, logout, addAndSwitchChain, addChain, addPlugin, authenticateUser, switchChain, isConnecting, isInitializing, initError, connectError]);
+  }, [web3Auth, isConnected, isInitialized, provider, userInfo, isMFAEnabled, status, connectTo, getPlugin, enableMFA, manageMFA, logout, authenticateUser, switchChain, isConnecting, isInitializing, initError, connectError]);
   return createElement(Web3AuthInnerContext.Provider, {
     value
   }, children);

package/dist/lib.esm/react/wallet-services-plugin/WalletServicesContext.js

@@ -1,5 +1,6 @@
 import { createContext, useState, useContext, useEffect, useCallback, useMemo, createElement } from 'react';
 import { EVM_PLUGINS, PLUGIN_EVENTS } from '../../base/plugin/IPlugin.js';
+import { CONNECTOR_STATUS } from '../../base/connector/constants.js';
 import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 
 const WalletServicesContext = createContext(null);
@@ -25,6 +26,8 @@ function WalletServicesContextProvider({
     if (isConnected) {
       const plugin = getPlugin(EVM_PLUGINS.WALLET_SERVICES);
       if (!walletServicesPlugin) setWalletServicesPlugin(plugin);
+      // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
+      if ((walletServicesPlugin === null || walletServicesPlugin === void 0 ? void 0 : walletServicesPlugin.status) === CONNECTOR_STATUS.CONNECTED) setIsPluginConnected(true);
     }
   }, [isConnected, getPlugin, walletServicesPlugin]);
   useEffect(() => {

package/dist/lib.esm/vue/no-modal/Web3AuthProvider.js

@@ -2,7 +2,7 @@ import { defineComponent, h, shallowRef, ref, watch, provide } from 'vue';
 import { Web3AuthContextKey } from '../../base/composables/index.js';
 import { WalletInitializationError, WalletLoginError } from '../../base/errors/index.js';
 import { Web3AuthNoModal } from '../../noModal.js';
-import { ADAPTER_EVENTS, ADAPTER_STATUS } from '../../base/adapter/constants.js';
+import { CONNECTOR_EVENTS, CONNECTOR_STATUS } from '../../base/connector/constants.js';
 
 const Web3AuthProvider = defineComponent({
   name: "Web3AuthProvider",
@@ -24,10 +24,6 @@ const Web3AuthProvider = defineComponent({
     const isConnecting = ref(false);
     const connectError = ref(null);
     const isConnected = ref(false);
-    const addPlugin = plugin => {
-      if (!web3Auth.value) throw WalletInitializationError.notReady();
-      return web3Auth.value.addPlugin(plugin);
-    };
     const getPlugin = name => {
       if (!web3Auth.value) throw WalletInitializationError.notReady();
       return web3Auth.value.getPlugin(name);
@@ -65,21 +61,10 @@ const Web3AuthProvider = defineComponent({
         isConnecting.value = false;
       }
     };
-    const addAndSwitchChain = async chainConfig => {
-      if (!web3Auth.value) throw WalletInitializationError.notReady();
-      await web3Auth.value.addChain(chainConfig);
-      await web3Auth.value.switchChain({
-        chainId: chainConfig.chainId
-      });
-    };
     const authenticateUser = async () => {
       if (!web3Auth.value) throw WalletInitializationError.notReady();
       return web3Auth.value.authenticateUser();
     };
-    const addChain = async chainConfig => {
-      if (!web3Auth.value) throw WalletInitializationError.notReady();
-      return web3Auth.value.addChain(chainConfig);
-    };
     const switchChain = chainParams => {
       if (!web3Auth.value) throw WalletInitializationError.notReady();
       return web3Auth.value.switchChain(chainParams);
@@ -94,17 +79,9 @@ const Web3AuthProvider = defineComponent({
       };
       resetHookState();
       const {
-        web3AuthOptions,
-        adapters = [],
-        plugins = []
+        web3AuthOptions
       } = newConfig;
       const web3AuthInstance = new Web3AuthNoModal(web3AuthOptions);
-      if (adapters.length) adapters.map(adapter => web3AuthInstance.configureAdapter(adapter));
-      if (plugins.length) {
-        plugins.forEach(plugin => {
-          web3AuthInstance.addPlugin(plugin);
-        });
-      }
       web3Auth.value = web3AuthInstance;
     }, {
       immediate: true
@@ -149,7 +126,7 @@ const Web3AuthProvider = defineComponent({
       const connectedListener = () => {
         status.value = web3Auth.value.status;
         // we do this because of rehydration issues. status connected is fired first but web3auth sdk is not ready yet.
-        if (web3Auth.value.status === ADAPTER_STATUS.CONNECTED) {
+        if (web3Auth.value.status === CONNECTOR_STATUS.CONNECTED) {
           isInitialized.value = true;
           isConnected.value = true;
         }
@@ -162,27 +139,27 @@ const Web3AuthProvider = defineComponent({
         status.value = web3Auth.value.status;
       };
       const errorListener = () => {
-        status.value = ADAPTER_EVENTS.ERRORED;
+        status.value = CONNECTOR_EVENTS.ERRORED;
       };
 
       // unregister previous listeners
       if (prevWeb3Auth && newWeb3Auth !== prevWeb3Auth) {
-        prevWeb3Auth.off(ADAPTER_EVENTS.NOT_READY, notReadyListener);
-        prevWeb3Auth.off(ADAPTER_EVENTS.READY, readyListener);
-        prevWeb3Auth.off(ADAPTER_EVENTS.CONNECTED, connectedListener);
-        prevWeb3Auth.off(ADAPTER_EVENTS.DISCONNECTED, disconnectedListener);
-        prevWeb3Auth.off(ADAPTER_EVENTS.CONNECTING, connectingListener);
-        prevWeb3Auth.off(ADAPTER_EVENTS.ERRORED, errorListener);
+        prevWeb3Auth.off(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
+        prevWeb3Auth.off(CONNECTOR_EVENTS.READY, readyListener);
+        prevWeb3Auth.off(CONNECTOR_EVENTS.CONNECTED, connectedListener);
+        prevWeb3Auth.off(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
+        prevWeb3Auth.off(CONNECTOR_EVENTS.CONNECTING, connectingListener);
+        prevWeb3Auth.off(CONNECTOR_EVENTS.ERRORED, errorListener);
       }
       if (newWeb3Auth && newWeb3Auth !== prevWeb3Auth) {
         status.value = newWeb3Auth.status;
         // web3Auth is initialized here.
-        newWeb3Auth.on(ADAPTER_EVENTS.NOT_READY, notReadyListener);
-        newWeb3Auth.on(ADAPTER_EVENTS.READY, readyListener);
-        newWeb3Auth.on(ADAPTER_EVENTS.CONNECTED, connectedListener);
-        newWeb3Auth.on(ADAPTER_EVENTS.DISCONNECTED, disconnectedListener);
-        newWeb3Auth.on(ADAPTER_EVENTS.CONNECTING, connectingListener);
-        newWeb3Auth.on(ADAPTER_EVENTS.ERRORED, errorListener);
+        newWeb3Auth.on(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
+        newWeb3Auth.on(CONNECTOR_EVENTS.READY, readyListener);
+        newWeb3Auth.on(CONNECTOR_EVENTS.CONNECTED, connectedListener);
+        newWeb3Auth.on(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
+        newWeb3Auth.on(CONNECTOR_EVENTS.CONNECTING, connectingListener);
+        newWeb3Auth.on(CONNECTOR_EVENTS.ERRORED, errorListener);
       }
     }, {
       immediate: true
@@ -200,9 +177,6 @@ const Web3AuthProvider = defineComponent({
       enableMFA,
       manageMFA,
       logout,
-      addAndSwitchChain,
-      addChain,
-      addPlugin,
       authenticateUser,
       switchChain,
       isInitializing,

package/dist/lib.esm/vue/wallet-services-plugin/WalletServicesProvider.js

@@ -3,6 +3,7 @@ import { Web3AuthContextKey } from '../../base/composables/index.js';
 import { WalletServicesContextKey } from './context.js';
 import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 import { EVM_PLUGINS, PLUGIN_EVENTS } from '../../base/plugin/IPlugin.js';
+import { CONNECTOR_STATUS } from '../../base/connector/constants.js';
 
 const WalletServicesProvider = defineComponent({
   name: "WalletServicesProvider",
@@ -24,8 +25,11 @@ const WalletServicesProvider = defineComponent({
     });
     watch(isConnected, newIsConnected => {
       if (newIsConnected) {
+        var _walletServicesPlugin;
         const plugin = getPlugin(EVM_PLUGINS.WALLET_SERVICES);
         if (!walletServicesPlugin.value) walletServicesPlugin.value = plugin;
+        // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
+        if (((_walletServicesPlugin = walletServicesPlugin.value) === null || _walletServicesPlugin === void 0 ? void 0 : _walletServicesPlugin.status) === CONNECTOR_STATUS.CONNECTED) isPluginConnected.value = true;
       }
     });
     watch(walletServicesPlugin, (newWalletServicesPlugin, prevWalletServicesPlugin) => {