BETTERZON-84: Adding service method to check if a session is valid (#37)

This commit is contained in:
Patrick 2021-05-03 16:29:25 +02:00 committed by GitHub
parent a42c7da9a5
commit 816036dbdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 111 additions and 4 deletions

View File

@ -3,7 +3,6 @@ export interface User {
username: string; username: string;
email: string; email: string;
password_hash: string; password_hash: string;
hashing_salt: string;
registration_date: Date; registration_date: Date;
last_login_date: Date; last_login_date: Date;
} }

View File

@ -81,3 +81,32 @@ usersRouter.post('/login', async (req: Request, res: Response) => {
res.status(404).send(e.message); res.status(404).send(e.message);
} }
}); });
// POST users/checkSessionValid
usersRouter.post('/checkSessionValid', async (req: Request, res: Response) => {
try {
const sessionId: string = req.body.sessionId;
const sessionKey: string = req.body.sessionKey;
const ip: string = req.connection.remoteAddress ?? '';
if (!sessionId || !sessionKey) {
// Missing
res.status(400).send(JSON.stringify({message: 'Missing parameters'}));
return;
}
// Update the user entry and create a session
const user: User = await UserService.checkSession(sessionId, sessionKey, ip);
if(!user.user_id) {
// Error logging in, probably wrong username / password
res.status(401).send(JSON.stringify({messages: ["Invalid session"], codes: [5]}));
return;
}
// Send the session details back to the user
res.status(201).send(user);
} catch (e) {
res.status(404).send(e.message);
}
});

View File

@ -92,7 +92,7 @@ export const login = async (username: string, password: string, ip: string): Pro
try { try {
// Get saved password hash // Get saved password hash
conn = await pool.getConnection(); conn = await pool.getConnection();
const query = "SELECT user_id, bcrypt_password_hash FROM users WHERE username = ?" const query = 'SELECT user_id, bcrypt_password_hash FROM users WHERE username = ?';
const userRows = await conn.query(query, username); const userRows = await conn.query(query, username);
let savedHash = ''; let savedHash = '';
let userId = -1; let userId = -1;
@ -150,13 +150,92 @@ export const login = async (username: string, password: string, ip: string): Pro
return {} as Session; return {} as Session;
}; };
/**
* Checks if the given session information are valid and returns the user information if they are
*/
export const checkSession = async (sessionId: string, sessionKey: string, ip: string): Promise<User> => {
let conn;
try {
// Get saved session key hash
conn = await pool.getConnection();
const query = 'SELECT user_id, session_key_hash, validUntil FROM sessions WHERE session_id = ?';
const sessionRows = await conn.query(query, sessionId);
let savedHash = '';
let userId = -1;
let validUntil = new Date();
for (const row in sessionRows) {
if (row !== 'meta' && sessionRows[row].user_id != null) {
savedHash = sessionRows[row].session_key_hash;
userId = sessionRows[row].user_id;
validUntil = sessionRows[row].validUntil;
}
}
// Check for correct key
if (!bcrypt.compareSync(sessionKey, savedHash)) {
// Wrong key, return invalid
return {} as User;
}
// Key is valid, continue
// Check if the session is still valid
if(validUntil <= new Date()) {
// Session expired, return invalid
return {} as User;
}
// Session still valid, continue
// Update session entry in SQL
const updateSessionsQuery = 'UPDATE sessions SET lastLogin = NOW(), last_IP = ? WHERE session_id = ?';
const updateUsersQuery = 'UPDATE users SET last_login_date = NOW() WHERE user_id = ?';
const userIdRes = await conn.query(updateSessionsQuery, [ip, sessionId]);
await conn.query(updateUsersQuery, userId);
await conn.commit();
// Get the other required user information and update the user
const userQuery = "SELECT user_id, username, email, registration_date, last_login_date FROM users WHERE user_id = ?";
const userRows = await conn.query(userQuery, userId);
let username = '';
let email = '';
let registrationDate = new Date();
let lastLoginDate = new Date();
for (const row in userRows) {
if (row !== 'meta' && userRows[row].user_id != null) {
username = userRows[row].username;
email = userRows[row].email;
registrationDate = userRows[row].registration_date;
lastLoginDate = userRows[row].last_login_date;
}
}
// Everything is fine, return user information
return {
user_id: userId,
username: username,
email: email,
password_hash: '',
registration_date: registrationDate,
last_login_date: lastLoginDate
};
} catch (err) {
throw err;
} finally {
if (conn) {
conn.end();
}
}
return {} as User;
};
/** /**
* Used in the checkUsernameAndEmail method as return value * Used in the checkUsernameAndEmail method as return value
*/ */
export interface Status { export interface Status {
hasProblems: boolean; hasProblems: boolean;
messages: string[]; messages: string[];
codes: number[]; // 0 = all good, 1 = wrong username, 2 = wrong email, 3 = server error, 4 = wrong password codes: number[]; // 0 = all good, 1 = wrong username, 2 = wrong email, 3 = server error, 4 = wrong password, 5 = wrong session
} }
/** /**