reverted the authcontroler changes

This commit is contained in:
abhayjoshi201 committed 2024-10-20 12:54:46 +05:30
1 parent dc1cc072dd
commit 8d906913c6
1 file changed
+6 -12
+6 -12
View File
@@ -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));