SimCompanies/dashboard
2
1
Fork 0
Code Issues 17 Pull Requests Releases Activity

bugfix backend feedback for password changes
All checks were successful
SimcoDash/simcompanies-dashboard/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Oliver Boehlk
2020-05-17 10:36:39 +02:00
parent 28b3e426d1
commit 78735b7fb7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/index.js
View File

@@ -296,7 +296,7 @@ app.get('/API/resourcelist', function (req, res) {
app.post("/API/user/setname", async function (req, res) { app.post("/API/user/setname", async function (req, res) {
let { email, password } = req.body; let { email, password } = req.body;
if (email && password) { if (email && password) {
if (DEBUG) return res.status(status.OK).send(); if (DEBUG) return res.status(status.OK).send("username changed");
try { try {
if (!await validatePassword(req.user.email, password)) if (!await validatePassword(req.user.email, password))
return res.status(status.UNAUTHORIZED).send("wrong password supplied"); return res.status(status.UNAUTHORIZED).send("wrong password supplied");
@@ -317,7 +317,7 @@ app.post("/API/user/setname", async function (req, res) {
app.post("/API/user/setpassword", async function (req, res) { app.post("/API/user/setpassword", async function (req, res) {
let { oldpassword, newpassword } = req.body; let { oldpassword, newpassword } = req.body;
if (oldpassword && newpassword) { if (oldpassword && newpassword) {
if (DEBUG) return res.status(status.OK).send(); if (DEBUG) return res.status(status.OK).send("password changed");
try { try {
if (!await validatePassword(req.user.email, oldpassword)) if (!await validatePassword(req.user.email, oldpassword))
return res.status(status.UNAUTHORIZED).send("wrong password supplied"); return res.status(status.UNAUTHORIZED).send("wrong password supplied");
@@ -326,8 +326,8 @@ app.post("/API/user/setpassword", async function (req, res) {
} }
connection.query(`UPDATE user SET password = ${mysql.escape(bcrypt.hashSync(newpassword, saltRounds))} WHERE email = ${mysql.escape(req.user.email)}`, function (err, rows) { connection.query(`UPDATE user SET password = ${mysql.escape(bcrypt.hashSync(newpassword, saltRounds))} WHERE email = ${mysql.escape(req.user.email)}`, function (err, rows) {
if (err) if (err)
return res.status(status.INTERNAL_SERVER_ERROR).send("the username seems invalid or already taken - if you think this is an error contact the sys admin"); return res.status(status.INTERNAL_SERVER_ERROR).send("the password could not be set - if you think this is an error contact the sys admin");
return res.status(status.OK).send("username changed"); return res.status(status.OK).send("password changed");
}); });
} else { } else {
return res.status(status.BAD_REQUEST).send("invalid data supplied"); return res.status(status.BAD_REQUEST).send("invalid data supplied");