@web3auth/modal 10.0.0-beta.0 → 10.0.0-beta.11

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

@@ -1,13 +1,19 @@
 import { createElement } from 'react';
-import { Web3AuthInnerProvider } from './context/Web3AuthInnerContext.js';
+import { WalletServicesContextProvider } from './context/WalletServicesInnerContext.js';
+import { Web3AuthInnerProvider, Web3AuthInnerContext } from './context/Web3AuthInnerContext.js';
 
 function Web3AuthProvider({
   config,
+  initialState,
   children
 }) {
-  return /*#__PURE__*/createElement(Web3AuthInnerProvider, {
-    config
+  const pluginChild = /*#__PURE__*/createElement(WalletServicesContextProvider, {
+    context: Web3AuthInnerContext
   }, children);
+  return /*#__PURE__*/createElement(Web3AuthInnerProvider, {
+    config,
+    initialState
+  }, pluginChild);
 }
 
 export { Web3AuthProvider };

package/dist/lib.esm/packages/modal/src/react/context/WalletServicesInnerContext.js

@@ -0,0 +1,69 @@
+import { EVM_PLUGINS, CONNECTOR_STATUS, PLUGIN_EVENTS } from '@web3auth/no-modal';
+import { createContext, useContext, useState, useEffect, useMemo, createElement } from 'react';
+
+const WalletServicesContext = /*#__PURE__*/createContext(null);
+function WalletServicesContextProvider({
+  children,
+  context
+}) {
+  const web3AuthContext = useContext(context);
+  const {
+    getPlugin,
+    isInitialized,
+    isConnected
+  } = web3AuthContext;
+  const [ready, setReady] = useState(false);
+  const [connecting, setConnecting] = useState(false);
+  const [walletServicesPlugin, setWalletServicesPlugin] = useState(null);
+  useEffect(() => {
+    if (isInitialized) {
+      const plugin = getPlugin(EVM_PLUGINS.WALLET_SERVICES);
+      setWalletServicesPlugin(plugin);
+    }
+  }, [isInitialized, getPlugin]);
+  useEffect(() => {
+    if (isConnected) {
+      const plugin = getPlugin(EVM_PLUGINS.WALLET_SERVICES);
+      setWalletServicesPlugin(plugin);
+      // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
+      if ((plugin === null || plugin === void 0 ? void 0 : plugin.status) === CONNECTOR_STATUS.CONNECTED) setReady(true);
+    }
+  }, [isConnected, getPlugin, walletServicesPlugin]);
+  useEffect(() => {
+    const connectedListener = () => {
+      setReady(true);
+      setConnecting(false);
+    };
+    const disconnectedListener = () => {
+      setReady(false);
+      setConnecting(false);
+    };
+    const connectingListener = () => {
+      setConnecting(true);
+    };
+    if (walletServicesPlugin) {
+      walletServicesPlugin.on(PLUGIN_EVENTS.CONNECTED, connectedListener);
+      walletServicesPlugin.on(PLUGIN_EVENTS.DISCONNECTED, disconnectedListener);
+      walletServicesPlugin.on(PLUGIN_EVENTS.CONNECTING, connectingListener);
+    }
+    return () => {
+      if (walletServicesPlugin) {
+        walletServicesPlugin.off(PLUGIN_EVENTS.CONNECTED, connectedListener);
+        walletServicesPlugin.off(PLUGIN_EVENTS.DISCONNECTED, disconnectedListener);
+        walletServicesPlugin.off(PLUGIN_EVENTS.CONNECTING, connectingListener);
+      }
+    };
+  }, [walletServicesPlugin]);
+  const value = useMemo(() => {
+    return {
+      plugin: walletServicesPlugin,
+      ready,
+      connecting
+    };
+  }, [walletServicesPlugin, ready, connecting]);
+  return /*#__PURE__*/createElement(WalletServicesContext.Provider, {
+    value
+  }, children);
+}
+
+export { WalletServicesContext, WalletServicesContextProvider };

package/dist/lib.esm/packages/modal/src/react/context/Web3AuthInnerContext.js

@@ -1,91 +1,41 @@
-import { WalletInitializationError, WalletLoginError, CONNECTOR_EVENTS, CONNECTOR_STATUS } from '@web3auth/no-modal';
-import { createContext, useState, useCallback, useEffect, useMemo, createElement } from 'react';
+import { CONNECTOR_STATUS, WalletInitializationError, CONNECTOR_EVENTS } from '@web3auth/no-modal';
+import { createContext, useState, useMemo, useCallback, useEffect, createElement } from 'react';
 import { Web3Auth } from '../../modalManager.js';
 
 const Web3AuthInnerContext = /*#__PURE__*/createContext(null);
 function Web3AuthInnerProvider(params) {
   const {
     children,
-    config
+    config,
+    initialState
   } = params;
-  const [web3Auth, setWeb3Auth] = useState(null);
-  const [isConnecting, setIsConnecting] = useState(false);
+  const {
+    web3AuthOptions
+  } = config;
   const [isInitializing, setIsInitializing] = useState(false);
   const [initError, setInitError] = useState(null);
-  const [connectError, setConnectError] = useState(null);
-  const [isConnected, setIsConnected] = useState(false);
   const [provider, setProvider] = useState(null);
-  const [userInfo, setUserInfo] = useState(null);
-  const [isMFAEnabled, setIsMFAEnabled] = useState(false);
   const [isInitialized, setIsInitialized] = useState(false);
-  const [status, setStatus] = useState(null);
+  const [isMFAEnabled, setIsMFAEnabled] = useState(false);
+  const web3Auth = useMemo(() => {
+    setProvider(null);
+    return new Web3Auth(web3AuthOptions, initialState);
+  }, [web3AuthOptions, initialState]);
+  const [isConnected, setIsConnected] = useState(web3Auth.status === CONNECTOR_STATUS.CONNECTED);
+  const [status, setStatus] = useState(web3Auth.status);
   const getPlugin = useCallback(name => {
     if (!web3Auth) throw WalletInitializationError.notReady();
     return web3Auth.getPlugin(name);
   }, [web3Auth]);
-  const enableMFA = useCallback(async loginParams => {
-    if (!web3Auth) throw WalletInitializationError.notReady();
-    if (!isConnected) throw WalletLoginError.notConnectedError();
-    await web3Auth.enableMFA(loginParams);
-    const localUserInfo = await web3Auth.getUserInfo();
-    setUserInfo(localUserInfo);
-    setIsMFAEnabled(localUserInfo.isMfaEnabled || false);
-  }, [web3Auth, isConnected]);
-  const manageMFA = useCallback(async loginParams => {
-    if (!web3Auth) throw WalletInitializationError.notReady();
-    if (!isConnected) throw WalletLoginError.notConnectedError();
-    await web3Auth.manageMFA(loginParams);
-  }, [web3Auth, isConnected]);
-  const logout = useCallback(async (logoutParams = {
-    cleanup: false
-  }) => {
-    if (!web3Auth) throw WalletInitializationError.notReady();
-    if (!isConnected) throw WalletLoginError.notConnectedError();
-    await web3Auth.logout(logoutParams);
-  }, [web3Auth, isConnected]);
-  const connect = useCallback(async () => {
-    if (!web3Auth) throw WalletInitializationError.notReady();
-    try {
-      setConnectError(null);
-      setIsConnecting(true);
-      const localProvider = await web3Auth.connect();
-      return localProvider;
-    } catch (error) {
-      setConnectError(error);
-      throw error;
-    } finally {
-      setIsConnecting(false);
-    }
-  }, [web3Auth]);
-  const authenticateUser = useCallback(async () => {
-    if (!web3Auth) throw WalletInitializationError.notReady();
-    return web3Auth.authenticateUser();
-  }, [web3Auth]);
-  const switchChain = useCallback(chainParams => {
-    if (!web3Auth) throw WalletInitializationError.notReady();
-    return web3Auth.switchChain(chainParams);
-  }, [web3Auth]);
-  useEffect(() => {
-    const resetHookState = () => {
-      setProvider(null);
-      setUserInfo(null);
-      setIsMFAEnabled(false);
-      setIsConnected(false);
-      setStatus(null);
-    };
-    resetHookState();
-    const {
-      web3AuthOptions
-    } = config;
-    const web3AuthInstance = new Web3Auth(web3AuthOptions);
-    setWeb3Auth(web3AuthInstance);
-  }, [config]);
   useEffect(() => {
+    const controller = new AbortController();
     async function init() {
       try {
         setInitError(null);
         setIsInitializing(true);
-        await web3Auth.initModal();
+        await web3Auth.init({
+          signal: controller.signal
+        });
       } catch (error) {
         setInitError(error);
       } finally {
@@ -93,46 +43,43 @@ function Web3AuthInnerProvider(params) {
       }
     }
     if (web3Auth) init();
-  }, [web3Auth, config]);
-  useEffect(() => {
-    const addState = async () => {
-      setProvider(web3Auth.provider);
-      const userState = await web3Auth.getUserInfo();
-      setUserInfo(userState);
-      setIsMFAEnabled((userState === null || userState === void 0 ? void 0 : userState.isMfaEnabled) || false);
-    };
-    const resetState = () => {
-      setProvider(null);
-      setUserInfo(null);
-      setIsMFAEnabled(false);
+    return () => {
+      controller.abort();
     };
-    if (web3Auth) {
-      if (isConnected) addState();else resetState();
-    }
-  }, [web3Auth, isConnected]);
+  }, [web3Auth, config]);
   useEffect(() => {
     const notReadyListener = () => setStatus(web3Auth.status);
     const readyListener = () => {
       setStatus(web3Auth.status);
       setIsInitialized(true);
     };
-    const connectedListener = () => {
+    const connectedListener = data => {
       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 === CONNECTOR_STATUS.CONNECTED) {
         setIsInitialized(true);
         setIsConnected(true);
+        setProvider(data.provider);
       }
     };
     const disconnectedListener = () => {
       setStatus(web3Auth.status);
       setIsConnected(false);
+      setProvider(null);
     };
     const connectingListener = () => {
       setStatus(web3Auth.status);
     };
     const errorListener = () => {
-      setStatus(CONNECTOR_STATUS.ERRORED);
+      setStatus(web3Auth.status);
+    };
+    const rehydrationErrorListener = () => {
+      setStatus(web3Auth.status);
+      setIsConnected(false);
+      setProvider(null);
+    };
+    const mfaEnabledListener = isMFAEnabled => {
+      if (typeof isMFAEnabled === "boolean") setIsMFAEnabled(isMFAEnabled);
     };
     if (web3Auth) {
       // web3Auth is initialized here.
@@ -143,6 +90,8 @@ function Web3AuthInnerProvider(params) {
       web3Auth.on(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
       web3Auth.on(CONNECTOR_EVENTS.CONNECTING, connectingListener);
       web3Auth.on(CONNECTOR_EVENTS.ERRORED, errorListener);
+      web3Auth.on(CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
+      web3Auth.on(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
     }
     return () => {
       if (web3Auth) {
@@ -152,6 +101,9 @@ function Web3AuthInnerProvider(params) {
         web3Auth.off(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
         web3Auth.off(CONNECTOR_EVENTS.CONNECTING, connectingListener);
         web3Auth.off(CONNECTOR_EVENTS.ERRORED, errorListener);
+        web3Auth.off(CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
+        web3Auth.off(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
+        web3Auth.cleanup();
       }
     };
   }, [web3Auth]);
@@ -161,22 +113,14 @@ function Web3AuthInnerProvider(params) {
       isConnected,
       isInitialized,
       provider,
-      userInfo,
-      isMFAEnabled,
       status,
-      connect,
-      enableMFA,
-      manageMFA,
-      logout,
-      authenticateUser,
-      switchChain,
-      getPlugin,
       isInitializing,
-      isConnecting,
       initError,
-      connectError
+      isMFAEnabled,
+      getPlugin,
+      setIsMFAEnabled
     };
-  }, [web3Auth, isConnected, isInitialized, provider, userInfo, isMFAEnabled, status, getPlugin, connect, enableMFA, manageMFA, logout, authenticateUser, switchChain, isInitializing, isConnecting, initError, connectError]);
+  }, [web3Auth, isConnected, isMFAEnabled, setIsMFAEnabled, isInitialized, provider, status, getPlugin, isInitializing, initError]);
   return /*#__PURE__*/createElement(Web3AuthInnerContext.Provider, {
     value
   }, children);

package/dist/lib.esm/packages/modal/src/react/hooks/useCheckout.js

@@ -0,0 +1,32 @@
+import { WalletServicesPluginError } from '@web3auth/no-modal';
+import { useState, useCallback } from 'react';
+import { useWalletServicesPlugin } from './useWalletServicesPlugin.js';
+
+const useCheckout = () => {
+  const {
+    plugin,
+    ready
+  } = useWalletServicesPlugin();
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const showCheckout = useCallback(async showCheckoutParams => {
+    setLoading(true);
+    setError(null);
+    try {
+      if (!plugin) throw WalletServicesPluginError.notInitialized();
+      if (!ready) throw WalletServicesPluginError.walletPluginNotConnected();
+      await plugin.showCheckout(showCheckoutParams);
+    } catch (error) {
+      setError(error);
+    } finally {
+      setLoading(false);
+    }
+  }, [plugin, ready]);
+  return {
+    loading,
+    error,
+    showCheckout
+  };
+};
+
+export { useCheckout };

package/dist/lib.esm/packages/modal/src/react/hooks/useEnableMFA.js

@@ -0,0 +1,28 @@
+import { useState, useCallback } from 'react';
+import { useWeb3AuthInner } from './useWeb3AuthInner.js';
+
+const useEnableMFA = () => {
+  const {
+    web3Auth
+  } = useWeb3AuthInner();
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const enableMFA = useCallback(async params => {
+    setLoading(true);
+    setError(null);
+    try {
+      await web3Auth.enableMFA(params);
+    } catch (error) {
+      setError(error);
+    } finally {
+      setLoading(false);
+    }
+  }, [web3Auth]);
+  return {
+    loading,
+    error,
+    enableMFA
+  };
+};
+
+export { useEnableMFA };

package/dist/lib.esm/packages/modal/src/react/hooks/useIdentityToken.js

@@ -0,0 +1,40 @@
+import { useState, useCallback, useEffect } from 'react';
+import { useWeb3AuthInner } from './useWeb3AuthInner.js';
+
+const useIdentityToken = () => {
+  const {
+    web3Auth,
+    isConnected
+  } = useWeb3AuthInner();
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const [token, setToken] = useState(null);
+  const authenticateUser = useCallback(async () => {
+    setLoading(true);
+    setError(null);
+    try {
+      const userAuthInfo = await web3Auth.authenticateUser();
+      if (userAuthInfo !== null && userAuthInfo !== void 0 && userAuthInfo.idToken) {
+        setToken(userAuthInfo.idToken);
+      }
+      return userAuthInfo === null || userAuthInfo === void 0 ? void 0 : userAuthInfo.idToken;
+    } catch (error) {
+      setError(error);
+    } finally {
+      setLoading(false);
+    }
+  }, [web3Auth]);
+  useEffect(() => {
+    if (!isConnected && token) {
+      setToken(null);
+    }
+  }, [isConnected, token]);
+  return {
+    loading,
+    error,
+    token,
+    authenticateUser
+  };
+};
+
+export { useIdentityToken };

package/dist/lib.esm/packages/modal/src/react/hooks/useManageMFA.js

@@ -0,0 +1,28 @@
+import { useState, useCallback } from 'react';
+import { useWeb3AuthInner } from './useWeb3AuthInner.js';
+
+const useManageMFA = () => {
+  const {
+    web3Auth
+  } = useWeb3AuthInner();
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const manageMFA = useCallback(async params => {
+    setLoading(true);
+    setError(null);
+    try {
+      await web3Auth.manageMFA(params);
+    } catch (error) {
+      setError(error);
+    } finally {
+      setLoading(false);
+    }
+  }, [web3Auth]);
+  return {
+    loading,
+    error,
+    manageMFA
+  };
+};
+
+export { useManageMFA };

package/dist/lib.esm/packages/modal/src/react/hooks/useSwap.js

@@ -0,0 +1,32 @@
+import { WalletServicesPluginError } from '@web3auth/no-modal';
+import { useState, useCallback } from 'react';
+import { useWalletServicesPlugin } from './useWalletServicesPlugin.js';
+
+const useSwap = () => {
+  const {
+    plugin,
+    ready
+  } = useWalletServicesPlugin();
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const showSwap = useCallback(async showSwapParams => {
+    setLoading(true);
+    setError(null);
+    try {
+      if (!plugin) throw WalletServicesPluginError.notInitialized();
+      if (!ready) throw WalletServicesPluginError.walletPluginNotConnected();
+      await plugin.showSwap(showSwapParams);
+    } catch (error) {
+      setError(error);
+    } finally {
+      setLoading(false);
+    }
+  }, [plugin, ready]);
+  return {
+    loading,
+    error,
+    showSwap
+  };
+};
+
+export { useSwap };

package/dist/lib.esm/packages/modal/src/react/hooks/useSwitchChain.js

@@ -0,0 +1,30 @@
+import { useState, useCallback } from 'react';
+import { useWeb3AuthInner } from './useWeb3AuthInner.js';
+
+const useSwitchChain = () => {
+  const {
+    web3Auth
+  } = useWeb3AuthInner();
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const switchChain = useCallback(async chainId => {
+    setLoading(true);
+    setError(null);
+    try {
+      await web3Auth.switchChain({
+        chainId
+      });
+    } catch (error) {
+      setError(error);
+    } finally {
+      setLoading(false);
+    }
+  }, [web3Auth]);
+  return {
+    loading,
+    error,
+    switchChain
+  };
+};
+
+export { useSwitchChain };

package/dist/lib.esm/packages/modal/src/react/hooks/useWalletConnectScanner.js

@@ -0,0 +1,32 @@
+import { WalletServicesPluginError } from '@web3auth/no-modal';
+import { useState, useCallback } from 'react';
+import { useWalletServicesPlugin } from './useWalletServicesPlugin.js';
+
+const useWalletConnectScanner = () => {
+  const {
+    plugin,
+    ready
+  } = useWalletServicesPlugin();
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const showWalletConnectScanner = useCallback(async showWalletConnectScannerParams => {
+    setLoading(true);
+    setError(null);
+    try {
+      if (!plugin) throw WalletServicesPluginError.notInitialized();
+      if (!ready) throw WalletServicesPluginError.walletPluginNotConnected();
+      await plugin.showWalletConnectScanner(showWalletConnectScannerParams);
+    } catch (error) {
+      setError(error);
+    } finally {
+      setLoading(false);
+    }
+  }, [plugin, ready]);
+  return {
+    loading,
+    error,
+    showWalletConnectScanner
+  };
+};
+
+export { useWalletConnectScanner };

package/dist/lib.esm/packages/modal/src/react/hooks/useWalletServicesPlugin.js

@@ -0,0 +1,11 @@
+import { WalletInitializationError } from '@web3auth/no-modal';
+import { useContext } from 'react';
+import { WalletServicesContext } from '../context/WalletServicesInnerContext.js';
+
+const useWalletServicesPlugin = () => {
+  const context = useContext(WalletServicesContext);
+  if (!context) throw WalletInitializationError.fromCode(1000, "usage of useWalletServicesPlugin not wrapped in `WalletServicesContextProvider`.");
+  return context;
+};
+
+export { useWalletServicesPlugin };

package/dist/lib.esm/packages/modal/src/react/hooks/useWalletUI.js

@@ -0,0 +1,32 @@
+import { WalletServicesPluginError } from '@web3auth/no-modal';
+import { useState, useCallback } from 'react';
+import { useWalletServicesPlugin } from './useWalletServicesPlugin.js';
+
+const useWalletUI = () => {
+  const {
+    plugin,
+    ready
+  } = useWalletServicesPlugin();
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const showWalletUI = useCallback(async showWalletUiParams => {
+    setLoading(true);
+    setError(null);
+    try {
+      if (!plugin) throw WalletServicesPluginError.notInitialized();
+      if (!ready) throw WalletServicesPluginError.walletPluginNotConnected();
+      await plugin.showWalletUi(showWalletUiParams);
+    } catch (error) {
+      setError(error);
+    } finally {
+      setLoading(false);
+    }
+  }, [plugin, ready]);
+  return {
+    loading,
+    error,
+    showWalletUI
+  };
+};
+
+export { useWalletUI };

package/dist/lib.esm/packages/modal/src/react/hooks/useWeb3Auth.js

@@ -1,13 +1,26 @@
-import { WalletInitializationError } from '@web3auth/no-modal';
-import { useContext } from 'react';
-import { Web3AuthInnerContext } from '../context/Web3AuthInnerContext.js';
+import { useWeb3AuthInner } from './useWeb3AuthInner.js';
 
 const useWeb3Auth = () => {
-  const context = useContext(Web3AuthInnerContext);
-  if (!context) {
-    throw WalletInitializationError.fromCode(1000, "usage of useWeb3Auth not wrapped in `Web3AuthContextProvider`.");
-  }
-  return context;
+  const {
+    initError,
+    isConnected,
+    isInitialized,
+    isInitializing,
+    provider,
+    status,
+    web3Auth,
+    getPlugin
+  } = useWeb3AuthInner();
+  return {
+    initError,
+    isConnected,
+    isInitialized,
+    isInitializing,
+    provider,
+    status,
+    web3Auth,
+    getPlugin
+  };
 };
 
 export { useWeb3Auth };

package/dist/lib.esm/packages/modal/src/react/hooks/useWeb3AuthConnect.js

@@ -0,0 +1,61 @@
+import { useState, useEffect, useCallback } from 'react';
+import { useWeb3AuthInner } from './useWeb3AuthInner.js';
+
+const useWeb3AuthConnect = () => {
+  const {
+    web3Auth,
+    isConnected
+  } = useWeb3AuthInner();
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const [connectorName, setConnectorName] = useState(null);
+  useEffect(() => {
+    if (!web3Auth) return;
+    if (!isConnected && connectorName) {
+      setConnectorName(null);
+    }
+    if (isConnected && !connectorName) {
+      setConnectorName(web3Auth.connectedConnectorName);
+    }
+  }, [isConnected, connectorName, web3Auth]);
+  const connect = useCallback(async () => {
+    setLoading(true);
+    setError(null);
+    try {
+      const provider = await web3Auth.connect();
+      if (provider) {
+        setConnectorName(web3Auth.connectedConnectorName);
+      }
+      return provider;
+    } catch (error) {
+      setError(error);
+    } finally {
+      setLoading(false);
+    }
+  }, [web3Auth]);
+  const connectTo = useCallback(async (connector, params) => {
+    setLoading(true);
+    setError(null);
+    try {
+      const provider = await web3Auth.connectTo(connector, params);
+      if (provider) {
+        setConnectorName(web3Auth.connectedConnectorName);
+      }
+      return provider;
+    } catch (error) {
+      setError(error);
+    } finally {
+      setLoading(false);
+    }
+  }, [web3Auth]);
+  return {
+    isConnected,
+    loading,
+    error,
+    connectorName,
+    connect,
+    connectTo
+  };
+};
+
+export { useWeb3AuthConnect };