From 082f7a70027e9d2761292dd80a8c7e5997851671 Mon Sep 17 00:00:00 2001 From: Pau Date: Tue, 15 Apr 2025 16:02:00 +0200 Subject: [PATCH] fix error handling --- .../authorization/endpointsController.js | 20 ++++++------------- .../authorization/loginController.js | 2 +- .../authorization/permissionsController.js | 16 ++++----------- .../authorization/refreshTokenController.js | 2 +- .../authorization/registerController.js | 6 +----- .../authorization/rolesController.js | 18 +++++------------ .../roles_has_permissionsController.js | 10 +++++----- .../authorization/userController.js | 18 +++++------------ .../resource_types/coordinatesController.js | 16 ++++----------- .../resource_types/placesController.js | 8 ++++---- .../resource_types/reportTypesController.js | 4 ++-- .../usersHasPlacesController.js | 12 +++++------ src/middlewares/auth.js | 2 +- 13 files changed, 45 insertions(+), 89 deletions(-) diff --git a/src/controllers/authorization/endpointsController.js b/src/controllers/authorization/endpointsController.js index 37447b5..4d455bb 100644 --- a/src/controllers/authorization/endpointsController.js +++ b/src/controllers/authorization/endpointsController.js @@ -30,7 +30,7 @@ const getEndpointsController = (req, res, next, config) => { ) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -58,7 +58,7 @@ const getEndpointsByUuidController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -78,7 +78,7 @@ const postEndpointsController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -102,16 +102,8 @@ const putEndpointsController = (req, res, next, config) => { next(result) }) .catch((err) => { - if (err.code === 'ER_DUP_ENTRY') { - const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) - } - if (err.code === 'ER_BAD_NULL_ERROR') { - const error = error404() - return res.status(error.code).json(error) - } const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -130,7 +122,7 @@ const softDeleteEndpointsController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -148,7 +140,7 @@ const deleteEndpointsController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) diff --git a/src/controllers/authorization/loginController.js b/src/controllers/authorization/loginController.js index 7b7e254..d52f9cd 100644 --- a/src/controllers/authorization/loginController.js +++ b/src/controllers/authorization/loginController.js @@ -52,7 +52,7 @@ const postLoginController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment); - return res.status(error.code).json(error); + res.status(error.code).json(error); }) .finally(() => { mysql.end(conn); diff --git a/src/controllers/authorization/permissionsController.js b/src/controllers/authorization/permissionsController.js index e0a9a62..b1f4274 100644 --- a/src/controllers/authorization/permissionsController.js +++ b/src/controllers/authorization/permissionsController.js @@ -29,7 +29,7 @@ const getPermissionController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -78,16 +78,8 @@ const postPermissionController = (req, res, next, config) => { next(result) }) .catch((err) => { - if (err.code === 'ER_DUP_ENTRY') { - const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) - } - if (err.code === 'ER_BAD_NULL_ERROR') { - const error = error404() - return res.status(error.code).json(error) - } const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -115,7 +107,7 @@ const putPermissionController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -134,7 +126,7 @@ const softDeletePermissionController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) diff --git a/src/controllers/authorization/refreshTokenController.js b/src/controllers/authorization/refreshTokenController.js index f800875..d3b38f6 100644 --- a/src/controllers/authorization/refreshTokenController.js +++ b/src/controllers/authorization/refreshTokenController.js @@ -42,7 +42,7 @@ const postRefreshTokenController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) diff --git a/src/controllers/authorization/registerController.js b/src/controllers/authorization/registerController.js index 9a2840c..57b5f0f 100644 --- a/src/controllers/authorization/registerController.js +++ b/src/controllers/authorization/registerController.js @@ -39,12 +39,8 @@ const postRegisterController = (req, res, next, config) => { next(result) }) .catch((err) => { - if (err.code === 'ER_DUP_ENTRY') { - const error = error409(); - return sendResponseConflict(res, error); - } const error = errorHandler(err, config.environment); - return res.status(err).json(error); + res.status(error.code).json(error); }) .finally(() => { mysql.end(conn); diff --git a/src/controllers/authorization/rolesController.js b/src/controllers/authorization/rolesController.js index dac3f15..1653643 100644 --- a/src/controllers/authorization/rolesController.js +++ b/src/controllers/authorization/rolesController.js @@ -44,7 +44,7 @@ const getRoleController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -72,7 +72,7 @@ const getRoleInfoController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -92,16 +92,8 @@ const postRoleController = (req, res, next, config) => { next(result) }) .catch((err) => { - if (err.code === 'ER_DUP_ENTRY') { - const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) - } - if (err.code === 'ER_BAD_NULL_ERROR') { - const error = error404() - return res.status(error.code).json(error) - } const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -129,7 +121,7 @@ const putRoleController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -148,7 +140,7 @@ const deleteRoleController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) diff --git a/src/controllers/authorization/roles_has_permissionsController.js b/src/controllers/authorization/roles_has_permissionsController.js index 67795aa..472ba1a 100644 --- a/src/controllers/authorization/roles_has_permissionsController.js +++ b/src/controllers/authorization/roles_has_permissionsController.js @@ -30,7 +30,7 @@ const getRolesHasPermissionsController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -57,7 +57,7 @@ const getRolesHasPermissionsByUuidController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -77,7 +77,7 @@ const postRolesHasPermissionsController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -102,7 +102,7 @@ const putRolesHasPermissionsController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -122,7 +122,7 @@ const softDeleteRolesHasPermissionsController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) diff --git a/src/controllers/authorization/userController.js b/src/controllers/authorization/userController.js index d077d2d..7ea81d7 100644 --- a/src/controllers/authorization/userController.js +++ b/src/controllers/authorization/userController.js @@ -34,7 +34,7 @@ const getUserListController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -65,7 +65,7 @@ const getUserInfoController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -96,16 +96,8 @@ const postUserController = (req, res, next, config) => { next(result) }) .catch((err) => { - if (err.code === 'ER_DUP_ENTRY') { - const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) - } - if (err.code === 'ER_BAD_NULL_ERROR') { - const error = error404() - return res.status(error.code).json(error) - } const error = errorHandler(err, config.environment) - return res.status(error).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -147,7 +139,7 @@ const putUserController = async (req, res, next, config) => { } catch (err) { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) } finally { mysql.end(conn) } @@ -165,7 +157,7 @@ const softDeleteUserController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) diff --git a/src/controllers/resource_types/coordinatesController.js b/src/controllers/resource_types/coordinatesController.js index 9746c88..81ff486 100644 --- a/src/controllers/resource_types/coordinatesController.js +++ b/src/controllers/resource_types/coordinatesController.js @@ -30,7 +30,7 @@ const getCoordinatesListController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -78,16 +78,8 @@ const postCoordinatesController = (req, res, next, config) => { next(result) }) .catch((err) => { - if (err.code === 'ER_DUP_ENTRY') { - const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) - } - if (err.code === 'ER_BAD_NULL_ERROR') { - const error = error404() - return res.status(error.code).json(error) - } const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -114,7 +106,7 @@ const putCoordinatesController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -143,7 +135,7 @@ const deleteCoordinatesController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) diff --git a/src/controllers/resource_types/placesController.js b/src/controllers/resource_types/placesController.js index 17973bc..6f9d69f 100644 --- a/src/controllers/resource_types/placesController.js +++ b/src/controllers/resource_types/placesController.js @@ -30,7 +30,7 @@ const getPlaceListController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -164,7 +164,7 @@ const insertPlaceController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -185,7 +185,7 @@ const modifyPlaceController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -206,7 +206,7 @@ const deletePlaceController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) diff --git a/src/controllers/resource_types/reportTypesController.js b/src/controllers/resource_types/reportTypesController.js index 4eaa61b..bd6a8ad 100644 --- a/src/controllers/resource_types/reportTypesController.js +++ b/src/controllers/resource_types/reportTypesController.js @@ -102,7 +102,7 @@ const putReportTypesController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment); - return res.status(error.code).json(error); + res.status(error.code).json(error); }) .finally(() => { mysql.end(conn); @@ -121,7 +121,7 @@ const softDeleteReportTypesController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment); - return res.status(error.code).json(error); + res.status(error.code).json(error); }) .finally(() => { mysql.end(conn); diff --git a/src/controllers/resource_types/usersHasPlacesController.js b/src/controllers/resource_types/usersHasPlacesController.js index a4b7afd..9cbbef4 100644 --- a/src/controllers/resource_types/usersHasPlacesController.js +++ b/src/controllers/resource_types/usersHasPlacesController.js @@ -114,7 +114,7 @@ const getUserHasPlacesByPlaceUuidController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -135,7 +135,7 @@ const postUserHasPlacesController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -156,7 +156,7 @@ const putUserHasPlacesController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -174,7 +174,7 @@ const deleteUserHasPlacesController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -192,7 +192,7 @@ const deleteUserHasPlacesByUserUuidController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -210,7 +210,7 @@ const deleteUserHasPlacesByPlaceUuidController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - return res.status(error.code).json(error) + res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) diff --git a/src/middlewares/auth.js b/src/middlewares/auth.js index 5403b7a..fb2485e 100644 --- a/src/middlewares/auth.js +++ b/src/middlewares/auth.js @@ -84,7 +84,7 @@ const _getRolePermissionsByName = (roleName, config) => { if (noResults(response)) { const err = error404() const error = errorHandler(err, config.environment) - return sendResponseNotFound(res, error) + return sendResponseNotFound(response, error) } return response.map(({ permission_action, permission_endpoint }) => ({ permission_action,