diff --git a/controllers/metamask.controller.js b/controllers/metamask.controller.js index 568d47049ea90d38812bebb9275a5e1f186c5ba0..993e08cd071c41d1057baa1f246768c692e9ead0 100644 --- a/controllers/metamask.controller.js +++ b/controllers/metamask.controller.js @@ -21,7 +21,7 @@ async function extractIdFromJWT(token) { } // Issues a JWT token for a user if the metamask signature is valid -async function metamaskOneTimeLogin(requestBody) { +async function metamaskOneClickLogin(requestBody) { if (!requestBody.signature || !requestBody.fingerprint || !requestBody.timestamp) { throw new Error("The request data was invalid"); } @@ -50,8 +50,9 @@ async function metamaskOneTimeLogin(requestBody) { "metamask": true, } + // The token for the metamask users is valid for 1 day return { - jwt_token: jwt.sign({ tempUser }, JWT_SECRET, { expiresIn: "1h" }), + jwt_token: jwt.sign({ tempUser }, JWT_SECRET, { expiresIn: "24h" }), user: tempUser, }; } catch (error) { @@ -62,6 +63,6 @@ async function metamaskOneTimeLogin(requestBody) { } module.exports = { - metamaskOneTimeLogin, + metamaskOneClickLogin, extractIdFromJWT, }; diff --git a/routes/authentication.router.js b/routes/authentication.router.js index 6fddc5195c32a7355b92b780b0925e2699782f5d..5660f467be5bf689cf2470f5359cfa5442154366 100644 --- a/routes/authentication.router.js +++ b/routes/authentication.router.js @@ -142,7 +142,7 @@ router.post("/generateJWT", async (req, res) => { secure: false, //TODO: CHANGE SECURE TO TRUE AND IMPLEMENT HTTPS OR A KEY sameSite: "strict", path: "/", - maxAge: 60 * 60 * 1000 * 24 * 3, + maxAge: 60 * 60 * 1000, }); res.status(200).send("Set cookie"); } catch (err) { @@ -189,7 +189,7 @@ router.post("/set-cookie", async (req, res) => { secure: false, sameSite: "strict", path: "/", - maxAge: 60 * 60 * 1000 * 24 * 3, + maxAge: 60 * 60 * 1000, }); res.status(200).send("Set cookie"); }); diff --git a/routes/metamask.router.js b/routes/metamask.router.js index de890fec0466102a7d4735b2d6369de6f10ad88f..bea7f1bf5eb0d34649bd9aca7d65f235fd8a2836 100644 --- a/routes/metamask.router.js +++ b/routes/metamask.router.js @@ -37,7 +37,7 @@ router.post("/auth", async (req, res) => { } console.log("SIGN:") console.log(signature); - const data = await metamaskController.metamaskOneTimeLogin({ signature, fingerprint, timestamp }); + const data = await metamaskController.metamaskOneClickLogin({ signature, fingerprint, timestamp }); const jwt = data.jwt_token; const extractedID = await metamaskController.extractIdFromJWT(jwt); @@ -49,7 +49,7 @@ router.post("/auth", async (req, res) => { secure: false, //TODO: Change to true when HTTPS is enabled sameSite: "strict", path: "/", - maxAge: 60 * 60 * 1000 * 24 * 3, + maxAge: 60 * 60 * 1000 * 24, }); @@ -83,6 +83,7 @@ router.get("/address", async (req, res) => { res.status(200).send(response); } catch (err) { + logger.error("error NOW", err.message) return res.status(500).send(err.message); } });