From 2c28dde0bf1db3e90c5c6d37ceb9650651886d72 Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Tue, 16 Oct 2018 08:16:17 -0700 Subject: [PATCH] Fix login via DB; user wasn't being passed down promise chain --- server/routes/users.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server/routes/users.js b/server/routes/users.js index c239d9f..2147ed9 100755 --- a/server/routes/users.js +++ b/server/routes/users.js @@ -212,7 +212,6 @@ const getSessionUser = function(req) { let query = "SELECT " + "uid AS username,displayName,mailVerified,authenticated,memberSince AS name,mail " + "FROM users WHERE id=:id"; - return userDB.sequelize.query(query, { replacements: { id: req.session.userId @@ -224,14 +223,17 @@ const getSessionUser = function(req) { throw "Invalid account."; } - req.user = results[0]; - if (!req.user.authenticated) { + let user = results[0]; + req.user = user; + if (!user.authenticated) { throw "Accout not authenticated."; } - if (!req.user.mailVerified) { + if (!user.mailVerified) { throw "Account mail not verified."; } + + return user; }); }).then(function(user) { if (!config.has("restrictions")) {