From 5a1aaf5132b20d857a9f5d4ca5307fb847850090 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 30 Jul 2024 13:54:30 -0700 Subject: [PATCH 1/4] AuthController error handling, cleanup --- Server/controllers/alertController.js | 18 +++-- Server/controllers/authController.js | 112 ++++++++++++++++++++------ 2 files changed, 98 insertions(+), 32 deletions(-) diff --git a/Server/controllers/alertController.js b/Server/controllers/alertController.js index cd2fa01ac..93d165469 100644 --- a/Server/controllers/alertController.js +++ b/Server/controllers/alertController.js @@ -27,7 +27,8 @@ const createAlert = async (req, res, next) => { await createAlertBodyValidation.validateAsync(req.body); } catch (error) { error.status = 422; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; error.service = SERVICE_NAME; next(error); return; @@ -58,7 +59,8 @@ const getAlertsByUserId = async (req, res, next) => { await getAlertsByUserIdParamValidation.validateAsync(req.params); } catch (error) { error.status = 422; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; error.service = SERVICE_NAME; next(error); return; @@ -82,7 +84,8 @@ const getAlertsByMonitorId = async (req, res, next) => { await getAlertsByMonitorIdParamValidation.validateAsync(req.params); } catch (error) { error.status = 422; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; error.service = SERVICE_NAME; next(error); return; @@ -106,7 +109,8 @@ const getAlertById = async (req, res, next) => { await getAlertByIdParamValidation.validateAsync(req.params); } catch (error) { error.status = 422; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; error.service = SERVICE_NAME; next(error); return; @@ -132,7 +136,8 @@ const editAlert = async (req, res, next) => { } catch (error) { console.log(error); error.status = 422; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; error.service = SERVICE_NAME; next(error); return; @@ -156,7 +161,8 @@ const deleteAlert = async (req, res, next) => { await deleteAlertParamValidation.validateAsync(req.params); } catch (error) { error.status = 422; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; error.service = SERVICE_NAME; next(error); return; diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index 88a7c7f71..6d3e757a5 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -54,7 +54,8 @@ const registerController = async (req, res, next) => { } catch (error) { error.status = 422; error.service = SERVICE_NAME; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; next(error); return; } @@ -115,14 +116,20 @@ const registerController = async (req, res, next) => { */ const loginController = async (req, res, next) => { try { - // Validate input await loginValidation.validateAsync(req.body); - + } catch (error) { + error.status = 422; + error.service = SERVICE_NAME; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; + next(error); + return; + } + try { // Check if user exists const user = await req.db.getUserByEmail(req, res); // Compare password - const match = await user.comparePassword(req.body.password); if (match !== true) { throw new Error(errorMessages.AUTH_INCORRECT_PASSWORD); @@ -157,7 +164,8 @@ const userEditController = async (req, res, next) => { } catch (error) { error.status = 422; error.service = SERVICE_NAME; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; next(error); return; } @@ -216,8 +224,18 @@ const inviteController = async (req, res, next) => { // Only admins can invite const token = getTokenFromHeaders(req.headers); const { role, firstname } = jwt.decode(token); - await inviteRoleValidation.validateAsync({ roles: role }); - await inviteBodyValidation.validateAsync(req.body); + try { + await inviteRoleValidation.validateAsync({ roles: role }); + await inviteBodyValidation.validateAsync(req.body); + } catch (error) { + error.status = 422; + error.service = SERVICE_NAME; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; + next(error); + return; + } + const inviteToken = await req.db.requestInviteToken(req, res); req.emailService.buildAndSendEmail( "employeeActivationTemplate", @@ -242,6 +260,16 @@ const inviteController = async (req, res, next) => { const inviteVerifyController = async (req, res, next) => { try { await inviteVerifciationBodyValidation.validateAsync(req.body); + } catch (error) { + error.status = 422; + error.service = SERVICE_NAME; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; + next(error); + return; + } + + try { const invite = await req.db.getInviteToken(req, res); res @@ -289,6 +317,16 @@ const checkAdminController = async (req, res) => { const recoveryRequestController = async (req, res, next) => { try { await recoveryValidation.validateAsync(req.body); + } catch (error) { + error.status = 422; + error.service = SERVICE_NAME; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; + next(error); + return; + } + + try { const user = await req.db.getUserByEmail(req, res); if (user) { const recoveryToken = await req.db.requestRecoveryToken(req, res); @@ -328,6 +366,16 @@ const recoveryRequestController = async (req, res, next) => { const validateRecoveryTokenController = async (req, res, next) => { try { await recoveryTokenValidation.validateAsync(req.body); + } catch (error) { + error.status = 422; + error.service = SERVICE_NAME; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; + next(error); + return; + } + + try { await req.db.validateRecoveryToken(req, res); // TODO Redirect user to reset password after validating token return res.status(200).json({ @@ -354,6 +402,15 @@ const validateRecoveryTokenController = async (req, res, next) => { const resetPasswordController = async (req, res, next) => { try { await newPasswordValidation.validateAsync(req.body); + } catch (error) { + error.status = 422; + error.service = SERVICE_NAME; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; + next(error); + return; + } + try { const user = await req.db.resetPassword(req, res); const token = issueToken(user._doc); res.status(200).json({ @@ -392,9 +449,18 @@ const deleteUserController = async (req, res, next) => { }; // Validate user - await deleteUserParamValidation.validateAsync( - decodedTokenCastedAsRequest.body - ); + try { + await deleteUserParamValidation.validateAsync( + decodedTokenCastedAsRequest.body + ); + } catch (error) { + error.status = 422; + error.service = SERVICE_NAME; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; + next(error); + return; + } // Check if the user exists const user = await req.db.getUserByEmail(decodedTokenCastedAsRequest); @@ -408,25 +474,19 @@ const deleteUserController = async (req, res, next) => { ); if (monitors) { - // 2. Delete jobs associated with each monitor - for (const monitor of monitors) { - await req.jobQueue.deleteJob(monitor); - } + //2. Remove all jobs, delete checks and alerts + await Promise.all( + monitors.map(async (monitor) => { + await req.jobQueue.deleteJob(monitor); + await req.db.deleteChecks(monitor._id); + await req.db.deleteAlertByMonitorId(monitor._id); + }) + ); - // 3. Delete all checks associated with each monitor - for (const monitor of monitors) { - await req.db.deleteChecks(monitor._id); - } - - // 4. Delete all alerts associated with each monitor - for (const monitor of monitors) { - await req.db.deleteAlertByMonitorId(monitor._id); - } - - // 5. Delete each monitor + // 3. Delete each monitor await req.db.deleteMonitorsByUserId(user._id); - // 6. Delete the user by id + // 4. Delete the user by id await req.db.deleteUser(decodedTokenCastedAsRequest); return res.status(200).json({ From abf0b5856b7c11f5fdc1ef467f0a3c60bb3957f8 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 30 Jul 2024 13:55:22 -0700 Subject: [PATCH 2/4] CheckController error handling --- Server/controllers/checkController.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Server/controllers/checkController.js b/Server/controllers/checkController.js index 391ae2700..3379f5d17 100644 --- a/Server/controllers/checkController.js +++ b/Server/controllers/checkController.js @@ -14,9 +14,9 @@ const createCheck = async (req, res, next) => { } catch (error) { error.status = 422; error.service = SERVICE_NAME; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; next(error); - return; } try { @@ -37,9 +37,9 @@ const getChecks = async (req, res, next) => { } catch (error) { error.status = 422; error.service = SERVICE_NAME; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; next(error); - return; } try { @@ -59,20 +59,18 @@ const deleteChecks = async (req, res, next) => { } catch (error) { error.status = 422; error.service = SERVICE_NAME; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; next(error); - return; } try { const deletedCount = await req.db.deleteChecks(req.params.monitorId); - return res - .status(200) - .json({ - success: true, - msg: successMessages.CHECK_DELETE, - data: { deletedCount }, - }); + return res.status(200).json({ + success: true, + msg: successMessages.CHECK_DELETE, + data: { deletedCount }, + }); } catch (error) { error.service = SERVICE_NAME; next(error); From c478298631083bf5c1f8cea96dbd7ec42a7dd0a8 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 30 Jul 2024 13:56:38 -0700 Subject: [PATCH 3/4] MaintenanceWindowController error handling --- .../maintenanceWindowController.js | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Server/controllers/maintenanceWindowController.js b/Server/controllers/maintenanceWindowController.js index d94746fe3..41b160fe2 100644 --- a/Server/controllers/maintenanceWindowController.js +++ b/Server/controllers/maintenanceWindowController.js @@ -15,9 +15,9 @@ const createMaintenanceWindow = async (req, res, next) => { } catch (error) { error.status = 422; error.service = SERVICE_NAME; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; next(error); - return; } try { @@ -48,7 +48,14 @@ const getMaintenanceWindowsByUserId = async (req, res, next) => { await getMaintenanceWindowsByUserIdParamValidation.validateAsync( req.params ); - + } catch (error) { + error.status = 422; + error.service = SERVICE_NAME; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; + next(error); + } + try { const maintenanceWindows = await req.db.getMaintenanceWindowsByUserId( req.params.userId ); @@ -69,7 +76,15 @@ const getMaintenanceWindowsByMonitorId = async (req, res, next) => { await getMaintenanceWindowsByMonitorIdParamValidation.validateAsync( req.params ); + } catch (error) { + error.status = 422; + error.service = SERVICE_NAME; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; + next(error); + } + try { const maintenanceWindows = await req.db.getMaintenanceWindowsByMonitorId( req.params.monitorId ); From aaa63a81cdb492f3f4600cb3ada55726c242eda3 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 30 Jul 2024 14:00:19 -0700 Subject: [PATCH 4/4] MaintenanceWindowController error handling --- Server/controllers/checkController.js | 3 ++ .../maintenanceWindowController.js | 3 ++ .../controllers/pageSpeedCheckController.js | 42 ++++++++++++------- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Server/controllers/checkController.js b/Server/controllers/checkController.js index 3379f5d17..f3c85352f 100644 --- a/Server/controllers/checkController.js +++ b/Server/controllers/checkController.js @@ -17,6 +17,7 @@ const createCheck = async (req, res, next) => { error.message = error.details?.[0]?.message || error.message || "Validation Error"; next(error); + return; } try { @@ -40,6 +41,7 @@ const getChecks = async (req, res, next) => { error.message = error.details?.[0]?.message || error.message || "Validation Error"; next(error); + return; } try { @@ -62,6 +64,7 @@ const deleteChecks = async (req, res, next) => { error.message = error.details?.[0]?.message || error.message || "Validation Error"; next(error); + return; } try { diff --git a/Server/controllers/maintenanceWindowController.js b/Server/controllers/maintenanceWindowController.js index 41b160fe2..5fe8ab7db 100644 --- a/Server/controllers/maintenanceWindowController.js +++ b/Server/controllers/maintenanceWindowController.js @@ -18,6 +18,7 @@ const createMaintenanceWindow = async (req, res, next) => { error.message = error.details?.[0]?.message || error.message || "Validation Error"; next(error); + return; } try { @@ -54,6 +55,7 @@ const getMaintenanceWindowsByUserId = async (req, res, next) => { error.message = error.details?.[0]?.message || error.message || "Validation Error"; next(error); + return; } try { const maintenanceWindows = await req.db.getMaintenanceWindowsByUserId( @@ -82,6 +84,7 @@ const getMaintenanceWindowsByMonitorId = async (req, res, next) => { error.message = error.details?.[0]?.message || error.message || "Validation Error"; next(error); + return; } try { diff --git a/Server/controllers/pageSpeedCheckController.js b/Server/controllers/pageSpeedCheckController.js index 7cc8696fc..eb290ad6e 100644 --- a/Server/controllers/pageSpeedCheckController.js +++ b/Server/controllers/pageSpeedCheckController.js @@ -1,4 +1,3 @@ -const PageSpeedCheck = require("../models/PageSpeedCheck"); const PageSpeedService = require("../service/pageSpeedService"); const { successMessages } = require("../utils/messages"); const pageSpeedService = new PageSpeedService(); @@ -22,12 +21,19 @@ const getPageSpeedChecks = async (req, res, next) => { try { // Validate monitorId parameter await getPageSpeedCheckParamValidation.validateAsync(req.params); + } catch (error) { + error.status = 422; + error.service = SERVICE_NAME; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; + next(error); + return; + } + try { return res.status(200).json({ msg: "Hit getPageSpeedChecks" }); } catch (error) { - if (error.isJoi) { - return res.status(400).json({ error: error.details[0].message }); - } + error.service = SERVICE_NAME; next(error); } }; @@ -42,12 +48,18 @@ const getPageSpeedChecks = async (req, res, next) => { */ const createPageSpeedCheck = async (req, res, next) => { try { - // Validate monitorId parameter await createPageSpeedCheckParamValidation.validateAsync(req.params); - - // Validate request body await createPageSpeedCheckBodyValidation.validateAsync(req.body); + } catch (error) { + error.status = 422; + error.service = SERVICE_NAME; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; + next(error); + return; + } + try { const { monitorId } = req.params; const { url } = req.body; @@ -74,9 +86,6 @@ const createPageSpeedCheck = async (req, res, next) => { data: newPageSpeedCheck, }); } catch (error) { - if (error.isJoi) { - return res.status(400).json({ error: error.details[0].message }); - } error.service = SERVICE_NAME; next(error); } @@ -94,12 +103,17 @@ const deletePageSpeedCheck = async (req, res, next) => { try { // Validate monitorId parameter await deletePageSpeedCheckParamValidation.validateAsync(req.params); - + } catch (error) { + error.status = 422; + error.service = SERVICE_NAME; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; + next(error); + return; + } + try { return res.status(200).json({ msg: "Hit deletePageSpeedCheck" }); } catch (error) { - if (error.isJoi) { - return res.status(400).json({ error: error.details[0].message }); - } error.service = SERVICE_NAME; next(error); }