diff --git a/backend/src/routes/user.js b/backend/src/routes/user.js index 5b04b5de..8fd8db66 100644 --- a/backend/src/routes/user.js +++ b/backend/src/routes/user.js @@ -105,7 +105,7 @@ router.post('/setup', rateLimitMiddleware, async (req, res) => { // Login post router.post('/login', rateLimitMiddleware, async (req, res) => { - const { usermail, password } = req.body; + const { usermail, password, remember } = req.body; if (!(usermail && password)) { return res.json({ status: "error", msg: "login.errors.params" }); @@ -132,7 +132,8 @@ router.post('/login', rateLimitMiddleware, async (req, res) => { }; const token = await new Promise((resolve, reject) => { - jwt.sign(payload, secret, { expiresIn: 172800 }, (err, token) => { + // "Remember me" keeps the session alive on the device for 30 days, a plain login lasts 48 h + jwt.sign(payload, secret, { expiresIn: remember ? 2592000 : 172800 }, (err, token) => { if (err) reject(err); else resolve(token); }); diff --git a/frontend/app/components/views/ServiceLinkAuthorize.vue b/frontend/app/components/views/ServiceLinkAuthorize.vue index c15191a3..4f9e5c0b 100644 --- a/frontend/app/components/views/ServiceLinkAuthorize.vue +++ b/frontend/app/components/views/ServiceLinkAuthorize.vue @@ -115,7 +115,7 @@ async function SignIn() { } // El token passa al servei d'usuari perquè el client el reutilitzi en connectar. - SetUser(response.data.token); + SetUser(response.data.token, true); password.value = ''; AskForLogin(); } catch { diff --git a/frontend/app/components/windows/LoginWindow.vue b/frontend/app/components/windows/LoginWindow.vue index 4b7656b1..2f1bde2a 100644 --- a/frontend/app/components/windows/LoginWindow.vue +++ b/frontend/app/components/windows/LoginWindow.vue @@ -26,6 +26,7 @@ let id = data.id; const username = ref(""); const password = ref(""); +const remember = ref(true); const loading = ref(false); @@ -44,14 +45,14 @@ function ShowMainMenu(){ function login() { loading.value = true; - Server().post('/user/login', { usermail: username.value, password: password.value }).then((response) => { + Server().post('/user/login', { usermail: username.value, password: password.value, remember: remember.value }).then((response) => { loading.value = false; const data = response.data; if(data.status == "error"){ DisplayToast('red', $t(data.msg), 3000) } else { - SetUser(data.token); + SetUser(data.token, remember.value); DisplayToast('green', $t('login.success'), 3000); ShowMainMenu(); } @@ -89,6 +90,12 @@ function toRegister(){ +
+ +