Merge branch 'master' of https://github.com/Web3Auth/single-factor-au…

…th-web into feat/passkeys-login
Web3Auth · Apr 15, 2024 · 4bc4234 · 4bc4234
2 parents 81a57a3 + 2b9692a
commit 4bc4234
Show file tree

Hide file tree

Showing 9 changed files with 2,035 additions and 14,738 deletions.
diff --git a/example/react-app/package-lock.json b/example/react-app/package-lock.json
diff --git a/example/react-app/src/App.tsx b/example/react-app/src/App.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 
 // Import Single Factor Auth SDK for no redirect flow
-import { Web3Auth, ADAPTER_EVENTS } from "@web3auth/single-factor-auth";
+import { Web3Auth, ADAPTER_EVENTS, decodeToken } from "@web3auth/single-factor-auth";
 import { CHAIN_NAMESPACES } from "@web3auth/base";
 import { EthereumPrivateKeyProvider } from "@web3auth/ethereum-provider";
 
@@ -43,7 +43,6 @@ const firebaseConfig = {
 
 function App() {
   const [web3authSFAuth, setWeb3authSFAuth] = useState<Web3Auth | null>(null);
-  const [usesSfaSDK, setUsesSfaSDK] = useState(false);
   const [provider, setProvider] = useState<IProvider | null>(null);
   // const [idToken, setIdToken] = useState<string | null>(null);
   const [isLoggingIn, setIsLoggingIn] = useState(false);
@@ -62,7 +61,6 @@ function App() {
           console.log("sfa:connected", data);
           console.log("sfa:state", web3authSfa?.state);
           setProvider(web3authSfa.provider);
-          setUsesSfaSDK(true);
         });
         web3authSfa.on(ADAPTER_EVENTS.DISCONNECTED, () => {
           console.log("sfa:disconnected");
@@ -92,17 +90,6 @@ function App() {
     }
   };
 
-  const parseToken = (token: any) => {
-    try {
-      const base64Url = token.split(".")[1];
-      const base64 = base64Url.replace("-", "+").replace("_", "/");
-      return JSON.parse(window.atob(base64 || ""));
-    } catch (err) {
-      console.error(err);
-      return null;
-    }
-  };
-
   const login = async () => {
     setIsLoggingIn(true);
     // login with firebase
@@ -118,19 +105,18 @@ function App() {
         return;
       }
       // get sub value from firebase id token
-      const { sub } = parseToken(token);
+      const { payload } = decodeToken(token);
 
       const web3authSfaprovider = await web3authSFAuth.connect({
         verifier,
-        verifierId: sub,
+        verifierId: payload.sub,
         idToken: token,
       });
       if (web3authSfaprovider) {
         setProvider(web3authSfaprovider);
         const privKey = await web3authSfaprovider?.request({ method: "eth_private_key" });
         console.log(privKey);
       }
-      setUsesSfaSDK(true);
       setIsLoggingIn(false);
     } catch (err) {
       // Single Factor Auth SDK throws an error if the user has already enabled MFA
@@ -185,18 +171,13 @@ function App() {
   };
 
   const logout = async () => {
-    if (usesSfaSDK) {
-      if (!web3authSFAuth) {
-        throw new Error("web3auth sfa auth not initialized.");
-      }
-      console.log(
-        "You are directly using Single Factor Auth SDK to login the user, hence the Web3Auth logout function won't work for you. You can logout the user directly from your login provider, or just clear the provider object."
-      );
-      await web3authSFAuth.logout();
-      const provider = new EthereumPrivateKeyProvider({ config: { chainConfig } });
-      await web3authSFAuth.init(provider);
-      return;
+    if (!web3authSFAuth) {
+      throw new Error("web3auth sfa auth not initialized.");
     }
+    await web3authSFAuth.logout();
+    const provider = new EthereumPrivateKeyProvider({ config: { chainConfig } });
+    await web3authSFAuth.init(provider);
+    return;
   };
 
   const getAccounts = async () => {