This commit is contained in:
@@ -105,7 +105,7 @@ router.post('/setup', rateLimitMiddleware, async (req, res) => {
|
|||||||
|
|
||||||
// Login post
|
// Login post
|
||||||
router.post('/login', rateLimitMiddleware, async (req, res) => {
|
router.post('/login', rateLimitMiddleware, async (req, res) => {
|
||||||
const { usermail, password } = req.body;
|
const { usermail, password, remember } = req.body;
|
||||||
|
|
||||||
if (!(usermail && password)) {
|
if (!(usermail && password)) {
|
||||||
return res.json({ status: "error", msg: "login.errors.params" });
|
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) => {
|
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);
|
if (err) reject(err);
|
||||||
else resolve(token);
|
else resolve(token);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ async function SignIn() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// El token passa al servei d'usuari perquè el client el reutilitzi en connectar.
|
// 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 = '';
|
password.value = '';
|
||||||
AskForLogin();
|
AskForLogin();
|
||||||
} catch {
|
} catch {
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ let id = data.id;
|
|||||||
|
|
||||||
const username = ref("");
|
const username = ref("");
|
||||||
const password = ref("");
|
const password = ref("");
|
||||||
|
const remember = ref(true);
|
||||||
|
|
||||||
const loading = ref(false);
|
const loading = ref(false);
|
||||||
|
|
||||||
@@ -44,14 +45,14 @@ function ShowMainMenu(){
|
|||||||
|
|
||||||
function login() {
|
function login() {
|
||||||
loading.value = true;
|
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;
|
loading.value = false;
|
||||||
const data = response.data;
|
const data = response.data;
|
||||||
|
|
||||||
if(data.status == "error"){
|
if(data.status == "error"){
|
||||||
DisplayToast('red', $t(data.msg), 3000)
|
DisplayToast('red', $t(data.msg), 3000)
|
||||||
} else {
|
} else {
|
||||||
SetUser(data.token);
|
SetUser(data.token, remember.value);
|
||||||
DisplayToast('green', $t('login.success'), 3000);
|
DisplayToast('green', $t('login.success'), 3000);
|
||||||
ShowMainMenu();
|
ShowMainMenu();
|
||||||
}
|
}
|
||||||
@@ -89,6 +90,12 @@ function toRegister(){
|
|||||||
<label for="password">{{$t('login.password')}}</label>
|
<label for="password">{{$t('login.password')}}</label>
|
||||||
<input id="password-field" type="password" :placeholder="$t('login.password-placeholder')" name="password" v-model="password" autocomplete="off" >
|
<input id="password-field" type="password" :placeholder="$t('login.password-placeholder')" name="password" v-model="password" autocomplete="off" >
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-field">
|
||||||
|
<label class="remember-me-label">
|
||||||
|
<input type="checkbox" name="remember" v-model="remember">
|
||||||
|
<span>{{$t('login.remember-me')}}</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
<div class="form-field">
|
<div class="form-field">
|
||||||
<button class="btn-primary sound-click">
|
<button class="btn-primary sound-click">
|
||||||
<span v-if="loading">
|
<span v-if="loading">
|
||||||
@@ -146,6 +153,14 @@ label {
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.remember-me-label {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
import { GetToken } from './TokenStore';
|
||||||
|
|
||||||
const server = axios.create({
|
const server = axios.create({
|
||||||
baseURL: 'http://localhost:5000/api', // fallback only
|
baseURL: 'http://localhost:5000/api', // fallback only
|
||||||
@@ -12,7 +13,7 @@ export const initApi = (baseURL) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
server.interceptors.request.use((config) => {
|
server.interceptors.request.use((config) => {
|
||||||
const token = localStorage.getItem('token');
|
const token = GetToken();
|
||||||
if (token) {
|
if (token) {
|
||||||
config.headers.Authorization = `Bearer ${token}`;
|
config.headers.Authorization = `Bearer ${token}`;
|
||||||
}
|
}
|
||||||
|
|||||||
24
frontend/app/services/TokenStore.js
Normal file
24
frontend/app/services/TokenStore.js
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
// The login token lives in one of two browser stores: a "remember me" login keeps it in localStorage
|
||||||
|
// so the session survives on this device, a plain login keeps it in sessionStorage so it ends with the
|
||||||
|
// browser. Everything that reads the token (Server.js, User.js) goes through GetToken.
|
||||||
|
|
||||||
|
function GetToken() {
|
||||||
|
return sessionStorage.getItem('token') ?? localStorage.getItem('token');
|
||||||
|
}
|
||||||
|
|
||||||
|
function SetToken(token, remember) {
|
||||||
|
ClearToken();
|
||||||
|
if (remember) localStorage.setItem('token', token);
|
||||||
|
else sessionStorage.setItem('token', token);
|
||||||
|
}
|
||||||
|
|
||||||
|
function ClearToken() {
|
||||||
|
localStorage.removeItem('token');
|
||||||
|
sessionStorage.removeItem('token');
|
||||||
|
}
|
||||||
|
|
||||||
|
export {
|
||||||
|
GetToken,
|
||||||
|
SetToken,
|
||||||
|
ClearToken
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
import Server from './Server';
|
import Server from './Server';
|
||||||
|
import { GetToken, SetToken, ClearToken } from './TokenStore';
|
||||||
|
|
||||||
const UserStatus = ref(0);
|
const UserStatus = ref(0);
|
||||||
|
|
||||||
@@ -7,8 +8,8 @@ function parseJwt(token) {
|
|||||||
return JSON.parse(atob(token.split('.')[1]));
|
return JSON.parse(atob(token.split('.')[1]));
|
||||||
}
|
}
|
||||||
|
|
||||||
function SetUser(token){
|
function SetUser(token, remember){
|
||||||
localStorage.setItem('token', token);
|
SetToken(token, remember);
|
||||||
UserStatus.value = 1;
|
UserStatus.value = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,7 +34,7 @@ async function GetUserSetting(key){
|
|||||||
}
|
}
|
||||||
|
|
||||||
function GetUser(){
|
function GetUser(){
|
||||||
const token = localStorage.getItem('token');
|
const token = GetToken();
|
||||||
|
|
||||||
if(token){
|
if(token){
|
||||||
const data = parseJwt(token);
|
const data = parseJwt(token);
|
||||||
@@ -58,12 +59,11 @@ function IsAdmin(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
function LoadUser(){
|
function LoadUser(){
|
||||||
const token = localStorage.getItem('token');
|
if(GetToken()) UserStatus.value = 1;
|
||||||
if(token) UserStatus.value = 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function LogoutUser(){
|
function LogoutUser(){
|
||||||
localStorage.removeItem("token");
|
ClearToken();
|
||||||
localStorage.removeItem("selectedCampaignId");
|
localStorage.removeItem("selectedCampaignId");
|
||||||
UserStatus.value = 0;
|
UserStatus.value = 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
"username-placeholder": "Introdueix el teu usuari o correu electrònic...",
|
"username-placeholder": "Introdueix el teu usuari o correu electrònic...",
|
||||||
"password": "Contrasenya",
|
"password": "Contrasenya",
|
||||||
"password-placeholder": "Introdueix la teva contrasenya...",
|
"password-placeholder": "Introdueix la teva contrasenya...",
|
||||||
|
"remember-me": "Recorda'm en aquest dispositiu",
|
||||||
"log-in": "Inicia sessió",
|
"log-in": "Inicia sessió",
|
||||||
"no-account": "No tens un compte?",
|
"no-account": "No tens un compte?",
|
||||||
"register": "Registra't",
|
"register": "Registra't",
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
"username-placeholder": "Enter your username or email here...",
|
"username-placeholder": "Enter your username or email here...",
|
||||||
"password": "Password",
|
"password": "Password",
|
||||||
"password-placeholder": "Enter your password...",
|
"password-placeholder": "Enter your password...",
|
||||||
|
"remember-me": "Remember me on this device",
|
||||||
"log-in": "Log in",
|
"log-in": "Log in",
|
||||||
"no-account": "You don't have an account?",
|
"no-account": "You don't have an account?",
|
||||||
"register": "Register",
|
"register": "Register",
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
"username-placeholder": "Introduce tu usuario o correo electrónico...",
|
"username-placeholder": "Introduce tu usuario o correo electrónico...",
|
||||||
"password": "Contraseña",
|
"password": "Contraseña",
|
||||||
"password-placeholder": "Introduce tu contraseña...",
|
"password-placeholder": "Introduce tu contraseña...",
|
||||||
|
"remember-me": "Recordarme en este dispositivo",
|
||||||
"log-in": "Iniciar sesión",
|
"log-in": "Iniciar sesión",
|
||||||
"no-account": "¿No tienes una cuenta?",
|
"no-account": "¿No tienes una cuenta?",
|
||||||
"register": "Registrarse",
|
"register": "Registrarse",
|
||||||
|
|||||||
136
tests/remember-me.test.js
Normal file
136
tests/remember-me.test.js
Normal file
@@ -0,0 +1,136 @@
|
|||||||
|
// Tests for the "remember me" checkbox of Syndria98/dragonroll#48: the login form lets the user keep
|
||||||
|
// the session on the device, and a login without it ends when the browser does.
|
||||||
|
//
|
||||||
|
// `frontend/app/services/TokenStore.js` is dependency-free ESM, so it is imported for real against
|
||||||
|
// stubbed browser storages; the flow around it is checked in the sources the same way
|
||||||
|
// `tests/sidebar-entity-entry.test.js` reads its component.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
const { pathToFileURL } = require("node:url");
|
||||||
|
|
||||||
|
function readSource(...parts) {
|
||||||
|
return fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
}
|
||||||
|
|
||||||
|
const loginWindow = readSource("frontend", "app", "components", "windows", "LoginWindow.vue");
|
||||||
|
const serviceLink = readSource("frontend", "app", "components", "views", "ServiceLinkAuthorize.vue");
|
||||||
|
const user = readSource("frontend", "app", "services", "User.js");
|
||||||
|
const server = readSource("frontend", "app", "services", "Server.js");
|
||||||
|
const backendUser = readSource("backend", "src", "routes", "user.js");
|
||||||
|
|
||||||
|
// -- the token store, for real ------------------------------------------------
|
||||||
|
|
||||||
|
function fakeStorage() {
|
||||||
|
const entries = new Map();
|
||||||
|
return {
|
||||||
|
getItem: (key) => (entries.has(key) ? entries.get(key) : null),
|
||||||
|
setItem: (key, value) => entries.set(key, String(value)),
|
||||||
|
removeItem: (key) => entries.delete(key),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadTokenStore() {
|
||||||
|
const store = await import(
|
||||||
|
pathToFileURL(path.join(__dirname, "..", "frontend", "app", "services", "TokenStore.js")).href
|
||||||
|
);
|
||||||
|
// The module only touches the storages inside its functions, so fresh stubs per test are enough.
|
||||||
|
globalThis.localStorage = fakeStorage();
|
||||||
|
globalThis.sessionStorage = fakeStorage();
|
||||||
|
return store;
|
||||||
|
}
|
||||||
|
|
||||||
|
test("a remembered login keeps the token in localStorage", async () => {
|
||||||
|
const { GetToken, SetToken } = await loadTokenStore();
|
||||||
|
|
||||||
|
SetToken("tok", true);
|
||||||
|
assert.equal(GetToken(), "tok");
|
||||||
|
assert.equal(globalThis.localStorage.getItem("token"), "tok");
|
||||||
|
assert.equal(globalThis.sessionStorage.getItem("token"), null);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a login without remember keeps the token only for the browser session", async () => {
|
||||||
|
const { GetToken, SetToken } = await loadTokenStore();
|
||||||
|
|
||||||
|
SetToken("tok", false);
|
||||||
|
assert.equal(GetToken(), "tok");
|
||||||
|
assert.equal(globalThis.sessionStorage.getItem("token"), "tok");
|
||||||
|
// Closing the browser clears sessionStorage, so the session ends with it.
|
||||||
|
assert.equal(globalThis.localStorage.getItem("token"), null);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a new login replaces the token instead of leaving it in the other store", async () => {
|
||||||
|
const { GetToken, SetToken, ClearToken } = await loadTokenStore();
|
||||||
|
|
||||||
|
SetToken("remembered", true);
|
||||||
|
SetToken("session", false);
|
||||||
|
assert.equal(globalThis.localStorage.getItem("token"), null);
|
||||||
|
assert.equal(GetToken(), "session");
|
||||||
|
|
||||||
|
ClearToken();
|
||||||
|
SetToken("remembered", true);
|
||||||
|
SetToken("session", false);
|
||||||
|
SetToken("remembered-again", true);
|
||||||
|
assert.equal(globalThis.sessionStorage.getItem("token"), null);
|
||||||
|
assert.equal(GetToken(), "remembered-again");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("clearing the token empties both stores", async () => {
|
||||||
|
const { GetToken, ClearToken } = await loadTokenStore();
|
||||||
|
|
||||||
|
globalThis.localStorage.setItem("token", "leftover-remembered");
|
||||||
|
globalThis.sessionStorage.setItem("token", "leftover-session");
|
||||||
|
ClearToken();
|
||||||
|
assert.equal(globalThis.localStorage.getItem("token"), null);
|
||||||
|
assert.equal(globalThis.sessionStorage.getItem("token"), null);
|
||||||
|
assert.equal(GetToken(), null);
|
||||||
|
});
|
||||||
|
|
||||||
|
// -- the login form ------------------------------------------------------------
|
||||||
|
|
||||||
|
test("the login form has a remember-me checkbox wired to the login", () => {
|
||||||
|
assert.match(loginWindow, /type="checkbox"[^>]*v-model="remember"/, "expected a checkbox bound to `remember`");
|
||||||
|
assert.match(loginWindow, /\$t\('login\.remember-me'\)/, "the checkbox label must be translated");
|
||||||
|
assert.match(loginWindow, /post\('\/user\/login',\s*\{[^}]*remember:\s*remember\.value/, "the login request must carry the flag");
|
||||||
|
assert.match(loginWindow, /SetUser\(\s*data\.token,\s*remember\.value\s*\)/, "the token must be stored per the flag");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every place that reads the token goes through the token store", () => {
|
||||||
|
for (const [name, source] of [["User.js", user], ["Server.js", server]]) {
|
||||||
|
assert.doesNotMatch(source, /Storage\.getItem\(\s*['"]token['"]/, `${name} must not pick a store on its own`);
|
||||||
|
assert.match(source, /from ['"]\.\/TokenStore['"]/, `${name} must import the token store`);
|
||||||
|
assert.match(source, /GetToken\(\)/, `${name} must read the token through GetToken`);
|
||||||
|
}
|
||||||
|
const logout = /function LogoutUser\(\)\s*\{([\s\S]*?)\n\}/.exec(user)?.[1];
|
||||||
|
assert.ok(logout, "expected a LogoutUser function");
|
||||||
|
assert.match(logout, /ClearToken\(\)/, "logging out must clear the token from both stores");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the service link sign-in keeps its persistent session", () => {
|
||||||
|
// That flow has no checkbox; passing remember explicitly keeps the token in localStorage as before.
|
||||||
|
assert.match(serviceLink, /SetUser\(\s*response\.data\.token,\s*true\s*\)/);
|
||||||
|
});
|
||||||
|
|
||||||
|
// -- the backend lifetime ------------------------------------------------------
|
||||||
|
|
||||||
|
test("a remembered login signs a longer-lived token", () => {
|
||||||
|
assert.match(backendUser, /const\s*\{[^}]*remember[^}]*\}\s*=\s*req\.body/, "the login must read the flag");
|
||||||
|
const expiresIn = /expiresIn:\s*([^,})]+)/.exec(backendUser)?.[1];
|
||||||
|
assert.ok(expiresIn, "expected jwt.sign to set an expiresIn");
|
||||||
|
const [long, short] = expiresIn.match(/\d+/g).map(Number);
|
||||||
|
assert.ok(long > short, `a remembered session (${long}s) must outlive a plain one (${short}s)`);
|
||||||
|
assert.equal(short, 172800, "a plain login keeps the 48 h lifetime");
|
||||||
|
});
|
||||||
|
|
||||||
|
// -- i18n ----------------------------------------------------------------------
|
||||||
|
|
||||||
|
test("the remember-me label exists in every locale", () => {
|
||||||
|
for (const lang of ["en", "es", "ca"]) {
|
||||||
|
const strings = JSON.parse(readSource("frontend", "i18n", "locales", lang, "login.json"));
|
||||||
|
assert.ok(strings["remember-me"]?.trim(), `locales/${lang}/login.json needs a remember-me string`);
|
||||||
|
}
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user