diff --git a/src/controllers/authorization/loginController.js b/src/controllers/authorization/loginController.js index 16c4596..c4444cc 100644 --- a/src/controllers/authorization/loginController.js +++ b/src/controllers/authorization/loginController.js @@ -2,8 +2,8 @@ import { getUserListModel } from "../../models/authorization/userModel.js"; import { noResults } from "../../validators/result-validators.js"; import mysql from "../../adapters/mysql.js"; import bcrypt from "bcrypt"; -import { error404, errorHandler } from "../../utils/errors.js"; -import { sendResponseNotFound, sendResponseUnauthorized } from "../../utils/responses.js"; +import { errorHandler } from "../../utils/errors.js"; +import { sendResponseUnauthorized } from "../../utils/responses.js"; import { getRolesHasPermissionsModel } from "../../models/authorization/roles_has_permissionsModel.js"; const postLoginController = (req, res, next, config) => { @@ -46,7 +46,6 @@ const postLoginController = (req, res, next, config) => { role_permissions: rolePermissions }, }; - next(result); }); }); @@ -60,25 +59,18 @@ const postLoginController = (req, res, next, config) => { }); } -const _getRolePermissions = (config, roleUuid, conn) => { - - return getRolesHasPermissionsModel({ uuid_role: roleUuid, conn }) +const _getRolePermissions = (config, roleName, conn) => { + return getRolesHasPermissionsModel({ roleName: roleName, conn }) .then((response) => { if (noResults(response)) { - const err = error404(); - const error = errorHandler(err, config.environment); - return sendResponseNotFound(res, error); + return [] //if user has no role assigned/no permissions assigned to role, return empty array to allow log in } - return response.map(({ permission }) => permission); + return response }) .catch((err) => { - const error = errorHandler(err, config.environment); - res.status(error.code).json(error); + return errorHandler(err, config.environment); }) - .finally(() => { - mysql.end(conn); - }); } export { diff --git a/src/controllers/authorization/permissionsController.js b/src/controllers/authorization/permissionsController.js index 43ef144..ce15282 100644 --- a/src/controllers/authorization/permissionsController.js +++ b/src/controllers/authorization/permissionsController.js @@ -57,7 +57,7 @@ const getPermissionByUuidController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - res.status(error.code).json(error) + return res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) @@ -79,7 +79,7 @@ const postPermissionController = (req, res, next, config) => { }) .catch((err) => { const error = errorHandler(err, config.environment) - res.status(error.code).json(error) + return res.status(error.code).json(error) }) .finally(() => { mysql.end(conn) diff --git a/src/models/authorization/endpointsModel.js b/src/models/authorization/endpointsModel.js index bf8fc76..9da8666 100644 --- a/src/models/authorization/endpointsModel.js +++ b/src/models/authorization/endpointsModel.js @@ -5,7 +5,7 @@ import { countEndpointsQuery, getEndpointsQuery, insertEndpointsQuery, - modifyEndpointsQuery, + updateEndpointsQuery, deleteEndpointsQuery, softDeleteEndpointsQuery } from '../../repositories/authorization/endpointsRepository.js' @@ -16,7 +16,7 @@ const getEndpointsModel = ({conn, ...rest}) => { return mysql .execute(getEndpointsQuery(paramsToSearch), conn, paramsToSearch) - .then(queryResult => queryResult.map(({id, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered)) + .then(queryResult => queryResult.map(({created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered)) } const countEndpointsModel = ({conn, ...rest}) => { @@ -42,7 +42,7 @@ const insertEndpointsModel = ({conn, ...params}) => { const modifyEndpointsModel = ({conn, ...params}) => { return mysql - .execute(modifyEndpointsQuery(params), conn, params) + .execute(updateEndpointsQuery(params), conn, params) .then(queryResult => queryResult[1].map(({id, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered)) } diff --git a/src/models/authorization/roles_has_permissionsModel.js b/src/models/authorization/roles_has_permissionsModel.js index 909e8eb..5f37f2f 100644 --- a/src/models/authorization/roles_has_permissionsModel.js +++ b/src/models/authorization/roles_has_permissionsModel.js @@ -36,7 +36,7 @@ const insertRolesHasPermissionsModel = ({conn, ...rest}) => { .then(results => results[1].map(({id, uuid, fk_role, fk_permission, created, deleted, createdBy, deletedBy, ...rest}) => ({...rest}))) } -const softDeleteRolesHasPermissionsModel = ({conn, ...rest}) => { +const softDeleteRolesHasPermissionsModel = ({conn, deleted, deletedBy, ...rest}) => { const deletedData = deleted ? dayjs.utc(deleted).format('YYYY-MM-DD HH:mm:ss') : dayjs.utc().format('YYYY-MM-DD HH:mm:ss') const params = { ...rest, deleted: deletedData }