From 6ef2591fc8546049a2c6f7b235f286e461bac4c9 Mon Sep 17 00:00:00 2001
From: Punarv Pawade <punarvpawade17@gmail.com>
Date: Thu, 22 Feb 2024 19:32:52 +0530
Subject: [PATCH] header: fix message sign

---
 webapp/src/components/Header.tsx | 91 ++++++++++++++++----------------
 webapp/src/index.tsx             |  2 +-
 2 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/webapp/src/components/Header.tsx b/webapp/src/components/Header.tsx
index 041548c..5d3620d 100644
--- a/webapp/src/components/Header.tsx
+++ b/webapp/src/components/Header.tsx
@@ -43,25 +43,25 @@ const Header = () => {
 
     const getSignMessage = async () => {
       if (localStorage.getItem("token") === "") {
-        console.log("clearing localstorage")
+        console.log("clearing localstorage");
         if (timeoutId !== null) {
           clearTimeout(timeoutId);
         }
-        if (account?.address){
-          const response = await getChallengeId(account?.address);
-          setMessage(response.data.eula);
-          setChallengeId(response.data.challangeId);
-          if (response.data.isAuthorized == true) {
-            authContext?.setIsAuthorized(true);
-          } else {
-            authContext?.setIsAuthorized(false);
-          }
-        }
+        // if (account?.address) {
+        //   const response = await getChallengeId(account?.address);
+        //   setMessage(response.data.eula);
+        //   setChallengeId(response.data.challangeId);
+        //   if (response.data.isAuthorized == true) {
+        //     authContext?.setIsAuthorized(true);
+        //   } else {
+        //     authContext?.setIsAuthorized(false);
+        //   }
+        // }
         timeoutId = setTimeout(() => {
           signOut();
         }, 500);
       } else {
-        wallets[0].connect()
+        wallets[0].connect();
       }
     };
 
@@ -85,7 +85,6 @@ const Header = () => {
   };
   const connectPetra = async () => {
     connect(wallets[0].name);
-
   };
 
   const disconnectPetra = () => {
@@ -93,21 +92,28 @@ const Header = () => {
   };
 
   const petraSign = async () => {
-    const payload = {
-      message: message,
-      nonce: challengeId,
-    };
     try {
+      const Challengeresponse = await getChallengeId(account?.address);
+
+      const payload = {
+        message: Challengeresponse.data.eula,
+        nonce: Challengeresponse.data.challangeId,
+      };
+
       const signres = await petraSignMesssage(payload);
       console.log("response", signres);
 
-      const response = await getToken(`0x${signres?.signature}`, challengeId, account?.publicKey);
+      const response = await getToken(
+        `0x${signres?.signature}`,
+        Challengeresponse.data.challangeId,
+        account?.publicKey
+      );
       if (response.data.token) {
         sessionStorage.setItem("token", response.data.token);
         localStorage.setItem("token", response.data.token);
         authContext?.setIsSignedIn(true);
       }
-  
+      authContext?.setIsAuthorized(true);
       authContext?.setIsSignedIn(true);
     } catch (error: any) {
       console.log("error", error);
@@ -129,13 +135,11 @@ const Header = () => {
           <ul className="menu menu-horizontal px-1">
             <div className="flex space-x-2">
               <li className="relative inline-block text-left">
-                  <div className="absolute left-0 z-10 mt-2 origin-top-right rounded-md bg-none shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
-                    <div className="-m-4" role="none">
-
-                    </div>
-                  </div>
+                <div className="absolute left-0 z-10 mt-2 origin-top-right rounded-md bg-none shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+                  <div className="-m-4" role="none"></div>
+                </div>
               </li>
-              {!(connected) && (
+              {!connected && (
                 <li>
                   <button
                     onClick={() => connectPetra()}
@@ -146,26 +150,23 @@ const Header = () => {
                   </button>
                 </li>
               )}
-              {(connected) && !(authContext?.isSignedIn) && (
-                  <li>
-                    <button
-                      onClick={petraSign}
-                      className="border text-blue-200 border-blue hover:bg-blue-300 hover:border-black hover:text-black font-bold transition focus:ring focus:ring-blue-500 focus:ring-opacity-80"
-                    >
-                      Sign In
-                    </button>
-                  </li>
-                )}
-               {connected && (
-                  <li>
-                    <div
-
-                      className="border text-blue-200 border-blue hover:bg-blue-300 hover:border-black hover:text-black font-bold transition focus:ring focus:ring-blue-500 focus:ring-opacity-80"
-                    >
-                       Account: {account?.address.slice(0,8)}...
-                    </div>
-                  </li>
-                )}
+              {connected && !authContext?.isSignedIn && (
+                <li>
+                  <button
+                    onClick={petraSign}
+                    className="border text-blue-200 border-blue hover:bg-blue-300 hover:border-black hover:text-black font-bold transition focus:ring focus:ring-blue-500 focus:ring-opacity-80"
+                  >
+                    Sign In
+                  </button>
+                </li>
+              )}
+              {connected && (
+                <li>
+                  <div className="border text-blue-200 border-blue hover:bg-blue-300 hover:border-black hover:text-black font-bold transition focus:ring focus:ring-blue-500 focus:ring-opacity-80">
+                    Account: {account?.address.slice(0, 8)}...
+                  </div>
+                </li>
+              )}
               <li>
                 <button
                   onClick={navigateDashboard}
diff --git a/webapp/src/index.tsx b/webapp/src/index.tsx
index c4c89c6..5895f7f 100644
--- a/webapp/src/index.tsx
+++ b/webapp/src/index.tsx
@@ -30,7 +30,7 @@ const { chains, provider, webSocketProvider } = configureChains(
 const { connectors } = getDefaultWallets({
   appName: "Sotreus",
   chains,
-  projectId: process.env.WALLET_CONNECT_PROJECT_ID
+  projectId: process.env.WALLET_CONNECT_PROJECT_ID,
 });
 
 const wagmiClient = createClient({