refactor user-service

server/src/controllers/authController.ts

@@ -192,7 +192,8 @@ class AuthController {
 	editUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const roles = req?.user?.role;
-			if (!roles.includes("superadmin")) {
+
+			if (!roles || !roles.includes("superadmin")) {
 				throw new AppError({ message: "Unauthorized", status: 403 });
 			}
 
@@ -201,7 +202,7 @@ class AuthController {
 
 			await editUserByIdParamValidation.validateAsync(req.params);
 			// If this is superadmin self edit, allow "superadmin" role
-			if (userId === req.user._id) {
+			if (userId === req.user?.id) {
 				await editSuperadminUserByIdBodyValidation.validateAsync(req.body);
 			} else {
 				await editUserByIdBodyValidation.validateAsync(req.body);
@@ -217,7 +218,7 @@ class AuthController {
 	editUserPasswordById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const roles = req?.user?.role;
-			if (!roles.includes("superadmin")) {
+			if (!roles || !roles.includes("superadmin")) {
 				throw new AppError({ message: "Unauthorized", status: 403 });
 			}