From d0f098f09861aeeee7c3e5f2bf1aea5cc50e226e Mon Sep 17 00:00:00 2001 From: "theis.gaedigk" Date: Mon, 30 Jun 2025 22:07:51 +0200 Subject: [PATCH] feat: refactor user retrieval logic to use allUsers function in login and user management routes --- backend/server.js | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/backend/server.js b/backend/server.js index 6dab1e9..529fed1 100644 --- a/backend/server.js +++ b/backend/server.js @@ -60,6 +60,7 @@ function allUsers() { // Route to handle user login app.post("/login", (req, res) => { + allUsers(); // Attempt to log in the user with provided credentials @@ -100,13 +101,8 @@ app.post(["/createUser", "/updateUser", "/deleteUser"], (req, res) => { } else { let response; - getAllUsers().then((resultFromFunc) => { - if (resultFromFunc.success) { - response = resultFromFunc.result; - } else { - response = resultFromFunc.result; - } - }); + allUsers(); + // Render dashboard with alert if trying to delete logged-in user res.status(400).render("dashboard.ejs", { sqlResult: latestUser, @@ -133,13 +129,8 @@ app.post(["/createUser", "/updateUser", "/deleteUser"], (req, res) => { if (result.success === true) { let response; - getAllUsers().then((resultFromFunc) => { - if (resultFromFunc.success) { - response = resultFromFunc.result; - } else { - response = resultFromFunc.result; - } - }); + allUsers(); + // On success, render dashboard with success message res.status(201).render("dashboard.ejs", { sqlResult: latestUser, @@ -151,13 +142,7 @@ app.post(["/createUser", "/updateUser", "/deleteUser"], (req, res) => { } else { let response; - getAllUsers().then((resultFromFunc) => { - if (resultFromFunc.success) { - response = resultFromFunc.result; - } else { - response = resultFromFunc.result; - } - }); + allUsers(); // On failure, render dashboard with alert res.status(400).render("dashboard.ejs", {