feat: eip-4361

close #56
golemfactory · May 14, 2024 · e463638 · e463638
1 parent 85c5ee2
commit e463638
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 59 deletions.
diff --git a/frontend/src/components/providers/blockchainProvider.tsx b/frontend/src/components/providers/blockchainProvider.tsx
@@ -26,8 +26,6 @@ const wagmiConfig = defaultWagmiConfig({
 });
 
 function createMessage({ nonce, address, chainId }: any) {
-  console.log("createMessage", nonce, address, chainId);
-  console.log("goubg to call constructor");
   const message = new SiweMessage({
     version: "1",
     domain: window.location.host,
@@ -38,9 +36,6 @@ function createMessage({ nonce, address, chainId }: any) {
     statement: "Sign in with ethereum",
   });
 
-  console.log("after constructor");
-
-  console.log("message", message);
   return message.prepareMessage();
 }
 
@@ -63,7 +58,6 @@ const siweConfig = createSIWEConfig({
     }
     const responseData = await response.json();
 
-    console.log("nonce response", responseData.nonce.toString());
     return responseData.nonce.toString();
   },
   getSession: async () => {
@@ -73,6 +67,23 @@ const siweConfig = createSIWEConfig({
     };
   },
   verifyMessage: async ({ message, signature }) => {
+    const res = await fetch(`${import.meta.env.VITE_BACKEND_URL}/login`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({ message, signature }),
+    });
+
+    if (!res.ok) {
+      throw new Error(`Error logging in: ${res.statusText}`);
+    }
+
+    const data = await res.json();
+
+    localStorage.setItem("accessToken", data.accessToken);
+    localStorage.setItem("refreshToken", data.refreshToken);
+
     return true;
   },
   signOut: async () => {

diff --git a/frontend/src/components/register.tsx b/frontend/src/components/register.tsx
@@ -28,11 +28,6 @@ export const Register = () => {
       variants={variants}
       transition={{ duration: 0.5 }}
     >
-      {user.isConnected() && address && (
-        <RegisterButton
-          isVisible={!user.isRegistered() && user.isConnected()}
-        />
-      )}
       {user.isRegistered() && (
         <RegisterSummary isVisible={user.isRegistered()} />
       )}

diff --git a/loginWithCrypto/src/fastify/routes/login.ts b/loginWithCrypto/src/fastify/routes/login.ts
@@ -1,76 +1,57 @@
 import { RouteOptions } from "fastify";
-import { verifyMessage } from "../../utils/verifyMessage.js";
 import config from "../../utils/ensureEnv.js";
-
+import { recoverMessageAddress } from "viem";
 export const login: RouteOptions = {
   method: "POST",
   url: "/login",
   schema: {
     body: {
       type: "object",
       properties: {
-        walletAddress: {
-          type: "string",
-          pattern: "^0x[a-fA-F0-9]{40}$",
-        },
-        messageSignature: {
+        signature: {
           type: "string",
         },
         message: {
           type: "string",
         },
       },
-      required: ["walletAddress", "messageSignature", "message"],
+      required: ["signature", "message"],
     },
   },
   handler: async (req, res) => {
     //@ts-ignore
-    const { walletAddress, messageSignature, message } = req.body;
+    const { signature, message } = req.body;
     // @ts-ignore temporary
     const { userService } = req.routeOptions.config;
-    const isOk = await verifyMessage({
-      address: walletAddress,
-      signature: messageSignature,
-      message: message,
+    const walletAddress = await recoverMessageAddress({
+      message,
+      signature,
     });
 
-    console.log("is ok", isOk);
-    if (isOk) {
-      const user = await userService.findByWalletAddress(walletAddress);
-      if (!user) {
-        res.status(401).send({ message: "Invalid signature" });
-        return;
-      }
-      userService.regenerateNonce(user.id);
-
-      console.log("user", user);
+    console.log("walletAddress", walletAddress);
+    const user = await userService.findByWalletAddress(walletAddress);
 
-      console.log(
-        "config",
-        config.JWT_SECRET,
-        config.JWT_TOKEN_EXPIRATION,
-        config.JWT_REFRESH_TOKEN_EXPIRATION
-      );
-
-      const tokens = {
-        accessToken: await res.jwtSign(
-          { _id: user._id },
-          {
-            expiresIn: config.JWT_TOKEN_EXPIRATION,
-          }
-        ),
-        refreshToken: await res.jwtSign(
-          { _id: user._id },
-          {
-            expiresIn: config.JWT_REFRESH_TOKEN_EXPIRATION,
-          }
-        ),
-      };
-      console.log("tokens", tokens);
-
-      res.send(tokens);
-    } else {
+    if (!user) {
       res.status(401).send({ message: "Invalid signature" });
+      return;
     }
+
+    userService.regenerateNonce(user.id);
+
+    const tokens = {
+      accessToken: await res.jwtSign(
+        { _id: user._id },
+        {
+          expiresIn: config.JWT_TOKEN_EXPIRATION,
+        }
+      ),
+      refreshToken: await res.jwtSign(
+        { _id: user._id },
+        {
+          expiresIn: config.JWT_REFRESH_TOKEN_EXPIRATION,
+        }
+      ),
+    };
+    res.send(tokens);
   },
 };