Merge pull request #28 from StreetSupport/feature/3011-build-user-management-interface

3011 - Fixed bugs

Author: o-seliuchenko

src/controllers/userController.ts

@@ -46,7 +46,7 @@ const getUsers = asyncHandler(async (req: Request, res: Response) => {
   }
 
   // Exclude VolunteerAdmin users from results if requesting user is not a SuperAdmin or VolunteerAdmin
-  if (!requestingUserAuthClaims.includes(ROLES.SUPER_ADMIN) && !requestingUserAuthClaims.includes(ROLES.VOLUNTEER_ADMIN)) {
+  if (!requestingUserAuthClaims.includes(ROLES.SUPER_ADMIN)) {
     conditions.push({ AuthClaims: { $ne: ROLES.VOLUNTEER_ADMIN } });
   }
 

src/middleware/authMiddleware.ts

@@ -203,6 +203,11 @@ export const authenticate = asyncHandler(async (req: Request, res: Response, nex
     return sendUnauthorized(res, 'User not found');
   }
 
+  // Check if user is active (not blocked/deactivated)
+  if (user.IsActive === false) {
+    return sendUnauthorized(res, 'User account is deactivated');
+  }
+
   req.user = user;
   next();
 });