fix: redundant authentication code

This commit is contained in:
Sérgio Salgado 2021-04-19 15:46:16 +01:00 committed by Josh Harvey
parent 771a60a4ad
commit 19138c2d46
3 changed files with 100 additions and 95 deletions

View file

@ -54,14 +54,14 @@ function getUsers () {
function verifyAndUpdateUser (id, ua, ip) {
const sql = `SELECT id, username, role, enabled FROM users WHERE id=$1 limit 1`
return db.oneOrNone(sql, [id]).then(user => {
if (!user) return null
return db.oneOrNone(sql, [id])
.then(user => {
if (!user) return null
const sql2 = `UPDATE users SET last_accessed=now(), last_accessed_from=$1, last_accessed_address=$2 WHERE id=$3 RETURNING id, role, enabled`
return db.one(sql2, [ua, ip, id]).then(user => {
return user
const sql2 = `UPDATE users SET last_accessed=now(), last_accessed_from=$1, last_accessed_address=$2 WHERE id=$3 RETURNING id, role, enabled`
return db.one(sql2, [ua, ip, id])
})
})
.then(user => user)
}
function save2FASecret (id, secret) {