diff --git a/src/controllers/AuthController.ts b/src/controllers/AuthController.ts index edb50f7..10ec0e4 100644 --- a/src/controllers/AuthController.ts +++ b/src/controllers/AuthController.ts @@ -163,7 +163,7 @@ async function getAllUsers(req: Request, res: Response) { .status(404) .json({ error: 'You dont exist anymore' }); } - if (!sourceUser.isAdmin) { + if (!sourceUser.is_admin) { return res .type('application/json') .status(403) @@ -207,7 +207,7 @@ async function getUser(req: Request, res: Response) { .status(404) .json({ error: 'You dont exist anymore' }); } - if (!sourceUser.isAdmin) { + if (!sourceUser.is_admin) { return res .type('application/json') .status(403) @@ -271,11 +271,11 @@ async function editUser(req: Request, res: Response) { .status(404) .json({ error: 'You dont exist anymore' }); } - if (sourceUser.isAdmin || sourceUser.id === payload.sub) { - if (sourceUser.isAdmin) { - logger.info(`EDIT :> Source user is an admin (${sourceUser.displayName})`) + if (sourceUser.is_admin || sourceUser.id === payload.sub) { + if (sourceUser.is_admin) { + logger.info(`EDIT :> Source user is an admin (${sourceUser.firstname} ${sourceUser.lastname})`) } else { - logger.info(`EDIT :> Source user modify itself (${sourceUser.displayName})`) + logger.info(`EDIT :> Source user modify itself (${sourceUser.firstname} ${sourceUser.lastname})`) } //TODO Interface @@ -349,7 +349,7 @@ async function deleteUser(req: Request, res: Response): Promise { .status(404) .json({ error: 'You dont exist anymore' }); } - if (sourceUser.isAdmin || sourceUser.id === payload.sub) { + if (sourceUser.is_admin || sourceUser.id === payload.sub) { const deleteUserServiceResult = await UserService.delete(`${targetUserId}`); if (!deleteUserServiceResult) { logger.error(`Error occurred during user delete (${req.ip})`); @@ -445,10 +445,9 @@ async function getSelf(req: Request, res: Response) { .json({ id: dbUser.id, username: dbUser.username, - displayName: dbUser.displayName, - firstName: dbUser.firstName, - lastName: dbUser.lastName, - isAdmin: dbUser.isAdmin + firstName: dbUser.firstname, + lastName: dbUser.firstname, + isAdmin: dbUser.firstname }); }