From 8d906913c675926fd2f7f605fbb22e34879e7733 Mon Sep 17 00:00:00 2001 From: abhayjoshi201 Date: Sun, 20 Oct 2024 12:54:46 +0530 Subject: [PATCH] reverted the authcontroler changes --- Server/controllers/authController.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index a01b4e78d..4ce5a0e2b 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -85,7 +85,9 @@ const registerUser = async (req, res, next) => { userId: newUser._id, }); - const { password, avatarImage, ...userWithoutPassword } = user._doc; + const userForToken = { ...newUser._doc }; + delete userForToken.profileImage; + delete userForToken.avatarImage; const appSettings = await req.settingsService.getSettings(); @@ -206,7 +208,6 @@ const editUser = async (req, res, next) => { try { // Change Password check - const { email } = jwt.verify(token, (await req.settingsService.getSettings()).jwtSecret); if (req.body.password && req.body.newPassword) { // Get token from headers const token = getTokenFromHeaders(req.headers); @@ -214,17 +215,7 @@ const editUser = async (req, res, next) => { const { jwtSecret } = req.settingsService.getSettings(); const { email } = jwt.verify(token, jwtSecret); // Add user email to body for DB operation - const monitors = teamMonitors?.monitors ?? []; - await Promise.all( - monitors.map(async (monitor) => { - await req.jobQueue.deleteJob(monitor); - await req.db.deleteChecks(monitor._id); - await req.db.deletePageSpeedChecksByMonitorId(monitor._id); - await req.db.deleteNotificationsByMonitorId(monitor._id); - }) - ); req.body.email = email; - // Get user const user = await req.db.getUserByEmail(email); // Compare passwords @@ -406,6 +397,9 @@ const deleteUser = async (req, res, next) => { try { const token = getTokenFromHeaders(req.headers); const decodedToken = jwt.decode(token); + const { email } = decodedToken; + + // Check if the user exists const user = await req.db.getUserByEmail(email); if (!user) { next(new Error(errorMessages.DB_USER_NOT_FOUND));