From 2f8b01d23459b319c066aadcad4cac698cc94cae Mon Sep 17 00:00:00 2001 From: leca Date: Fri, 14 Jun 2024 02:06:47 +0300 Subject: [PATCH] no need to store salt --- db.psql | 3 +-- schema.drawio | 45 +++++++++++++++++++++------------------------ src/index.js | 6 +++--- 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/db.psql b/db.psql index 3acbda3..196d7ad 100644 --- a/db.psql +++ b/db.psql @@ -3,8 +3,7 @@ CREATE TABLE IF NOT EXISTS Users ( lastname VARCHAR(32), firstname VARCHAR(32), middlename VARCHAR(32), - password_hash CHAR(60), --nodejs bcrypt. - salt CHAR(29), -- nodejs bcrypt. + salty_password CHAR(60), --nodejs bcrypt. chats INT[] -- to table Chats, column ID. ); diff --git a/schema.drawio b/schema.drawio index db4ee51..b3ee035 100644 --- a/schema.drawio +++ b/schema.drawio @@ -1,11 +1,11 @@ - + - + - + @@ -13,70 +13,67 @@ - + - + - + - + - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/index.js b/src/index.js index 26e6989..0d7f947 100644 --- a/src/index.js +++ b/src/index.js @@ -196,8 +196,8 @@ app.post('/api/register', requireToBeNotLoggedIn, async (req, res) => { } let id = (await client.query( - "INSERT INTO Users (lastname, firstname, middlename, password_hash, salt) VALUES ($1, $2, $3, $4, $5) RETURNING ID;", - [lastname, firstname, middlename, hash, salt] + "INSERT INTO Users (lastname, firstname, middlename, salty_password) VALUES ($1, $2, $3, $4) RETURNING ID;", + [lastname, firstname, middlename, hash] )).rows[0].id; req.session.token = generateRandomString(); sessions[req.session.token] = id; @@ -222,7 +222,7 @@ app.post('/api/login', requireToBeNotLoggedIn, async (req, res) => { return res.status(400).send("No such user.").end(); } - let stored_password = (await client.query("SELECT password_hash FROM Users WHERE ID = $1;", [ID])).rows[0].password_hash; + let stored_password = (await client.query("SELECT salty_password FROM Users WHERE ID = $1;", [ID])).rows[0].salty_password; if (bcrypt.compareSync(password, stored_password)) { req.session.token = generateRandomString()