From 44e62f611906c9b3366d45a00827c883d38df678 Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Thu, 12 Jan 2023 15:38:39 -0800 Subject: [PATCH] Remove use of spread Signed-off-by: James Ketrenos --- server/routes/users.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/server/routes/users.js b/server/routes/users.js index 4af0552..9fc3e8b 100755 --- a/server/routes/users.js +++ b/server/routes/users.js @@ -155,7 +155,7 @@ router.put("/password", function(req, res) { }); }); -router.post("/create", function(req, res) { +router.post("/create", async (req, res) => { console.log("/users/create"); const user = { @@ -186,23 +186,23 @@ router.post("/create", function(req, res) { console.log("Invalid email address: " + user.mail); throw "Invalid email address."; } - }).then(function() { - return userDB.sequelize.query("INSERT INTO users " + + }).then(async () => { + const results = await userDB.sequelize.query("INSERT INTO users " + "(uid,displayName,password,mail,memberSince,authenticated,notes) " + "VALUES(:uid,:displayName,:password,:mail,CURRENT_TIMESTAMP,0,:notes)", { replacements: user - }).spread(function(results, metadata) { - req.session.userId = metadata.lastID; - }).then(function() { - return getSessionUser(req).then(function(user) { - res.status(200).send(user); - user.id = req.session.userId; - return sendVerifyMail(userDB, req, user); - }); - }).catch(function(error) { - console.log("Error creating account: ", error); - return res.status(401).send(error); }); + + req.session.userId = results[1].lastID; + + const user = await getSessionUser(req); + + res.status(200).send(user); + user.id = req.session.userId; + return sendVerifyMail(userDB, req, user); + }).catch(function(error) { + console.log("Error creating account: ", error); + return res.status(401).send(error); }); });