User permissions search

backend/controllers/project.controller.js

@@ -13,15 +13,15 @@ ProjectController.project_list = async function (req, res) {
   }
 };
 
-ProjectController.pm_filtered_projects = async function(req, res) {
+ProjectController.pm_filtered_projects = async function (req, res) {
   try {
-    const projectList = await Project.find({})
-    const projects = projectList.filter(proj => req.body.includes(proj._id.toString()))
-    return res.status(200).send(projects)
-  } catch(e) {
-    return res.sendStatus(400)
+    const projectList = await Project.find({});
+    const projects = projectList.filter((proj) => req.body.includes(proj._id.toString()));
+    return res.status(200).send(projects);
+  } catch (e) {
+    return res.sendStatus(400);
   }
-}
+};
 
 ProjectController.create = async function (req, res) {
   const { body } = req;
@@ -48,7 +48,7 @@ ProjectController.project_by_id = async function (req, res) {
 ProjectController.update = async function (req, res) {
   const { ProjectId } = req.params;
   try {
-    const project = await Project.findOneAndUpdate({_id: ProjectId}, req.body, {new: true});
+    const project = await Project.findOneAndUpdate({ _id: ProjectId }, req.body, { new: true });
     return res.status(200).send(project);
   } catch (err) {
     return res.sendStatus(400);
@@ -66,5 +66,4 @@ ProjectController.destroy = async function (req, res) {
   }
 };
 
-
 module.exports = ProjectController;

backend/controllers/user.controller.js

@@ -3,7 +3,7 @@ const jwt = require('jsonwebtoken');
 const EmailController = require('./email.controller');
 const { CONFIG_AUTH } = require('../config');
 
-const { User } = require('../models');
+const { User, Project } = require('../models');
 
 const expectedHeader = process.env.CUSTOM_REQUEST_HEADER;
 
@@ -26,6 +26,63 @@ UserController.user_list = async function (req, res) {
   }
 };
 
+// Get list of Users with accessLevel 'admin' or 'superadmin' with GET
+UserController.admin_list = async function (req, res) {
+  const { headers } = req;
+
+  if (headers['x-customrequired-header'] !== expectedHeader) {
+    return res.sendStatus(403);
+  }
+
+  try {
+    const admins = await User.find({ accessLevel: { $in: ['admin', 'superadmin'] } });
+    return res.status(200).send(admins);
+  } catch (err) {
+    return res.sendStatus(400);
+  }
+};
+
+// Get list of Users with accessLevel 'admin' or 'superadmin' and also managed projects with GET
+UserController.projectLead_list = async function (req, res) {
+  const { headers } = req;
+
+  if (headers['x-customrequired-header'] !== expectedHeader) {
+    return res.sendStatus(403);
+  }
+
+  try {
+    const projectManagers = await User.find({
+      $and: [
+        { accessLevel: { $in: ['admin', 'superadmin'] } },
+        { managedProjects: { $exists: true, $type: 'array', $ne: [] } },
+      ],
+    });
+
+    const updatedProjectManagers = [];
+
+    for (const projectManager of projectManagers) {
+      const projectManagerObj = projectManager.toObject();
+      projectManagerObj.isProjectLead = true;
+      const projectNames = [];
+
+      for (const projectId of projectManagerObj.managedProjects) {
+        const projectDetail = await Project.findById(projectId);
+        if (projectDetail && projectDetail.name) {
+          projectNames.push(projectDetail.name);
+        } else {
+          console.warn('Project detail is null, cannot access name');
+        }
+      }
+      projectManagerObj.managedProjectNames = projectNames;
+
+      updatedProjectManagers.push(projectManagerObj);
+    }
+    return res.status(200).send(updatedProjectManagers);
+  } catch (err) {
+    return res.sendStatus(400);
+  }
+};
+
 // Get User by id with GET
 UserController.user_by_id = async function (req, res) {
   const { headers } = req;
@@ -51,12 +108,11 @@ UserController.create = async function (req, res) {
     return res.sendStatus(403);
   }
 
-
   try {
-  const newUser = {
-    ...req.body,
-    email: req.body.email.toLowerCase()
-  }
+    const newUser = {
+      ...req.body,
+      email: req.body.email.toLowerCase(),
+    };
     const user = await User.create(newUser);
     return res.status(201).send(user);
   } catch (error) {
@@ -80,7 +136,7 @@ UserController.update = async function (req, res) {
   }
 
   try {
-    const user = await User.findOneAndUpdate({_id: UserId}, req.body, { new: true });
+    const user = await User.findOneAndUpdate({ _id: UserId }, req.body, { new: true });
     return res.status(200).send(user);
   } catch (err) {
     return res.sendStatus(400);
@@ -192,10 +248,7 @@ UserController.verifyMe = async function (req, res) {
 };
 
 UserController.logout = async function (req, res) {
-  return res
-    .clearCookie('token')
-    .status(200)
-    .send('Successfully logged out.');
-}
+  return res.clearCookie('token').status(200).send('Successfully logged out.');
+};
 
 module.exports = UserController;

backend/routers/projects.router.js

@@ -1,8 +1,8 @@
-const express = require("express");
+const express = require('express');
 const router = express.Router();
 
 const { ProjectController } = require('../controllers');
-const { AuthUtil } = require("../middleware");
+const { AuthUtil } = require('../middleware');
 
 // The base is /api/projects
 router.get('/', ProjectController.project_list);
@@ -18,5 +18,4 @@ router.put('/:ProjectId', AuthUtil.verifyCookie, ProjectController.update);
 
 router.patch('/:ProjectId', AuthUtil.verifyCookie, ProjectController.update);
 
-
 module.exports = router;

backend/routers/users.router.js

@@ -6,6 +6,10 @@ const { UserController } = require('../controllers');
 // The base is /api/users
 router.get('/', UserController.user_list);
 
+router.get('/admins', UserController.admin_list);
+
+router.get('/projectManagers', UserController.projectLead_list);
+
 router.post('/', UserController.create);
 
 router.get('/:UserId', UserController.user_by_id);

client/src/App.jsx

@@ -18,13 +18,17 @@ import HandleAuth from './components/auth/HandleAuth';
 import EmailSent from './pages/EmailSent';
 import Events from './pages/Events';
 import ProjectLeaderDashboard from './pages/ProjectLeaderDashboard';
+import Users from './pages/Users';
 import UserAdmin from './pages/UserAdmin';
 import ProjectList from './pages/ProjectList';
 import ManageProjects from './pages/ManageProjects';
 import addProject from './components/manageProjects/addProject';
 import HealthCheck from './pages/HealthCheck';
 import SecretPassword from './pages/SecretPassword';
 import UserWelcome from './pages/UserWelcome';
+// Added User Permission Search component
+import UserPermissionSearch from './pages/UserPermissionSearch';
+import UserPermission from './pages/UserPermission';
 
 import { ThemeProvider } from '@mui/material';
 import theme from './theme';
@@ -46,9 +50,16 @@ const routes = [
   { path: '/handleauth', name: 'handleauth', Component: HandleAuth },
   { path: '/emailsent', name: 'emailsent', Component: EmailSent },
   { path: '/events', name: 'events', Component: Events },
-  { path: '/useradmin', name: 'useradmin', Component: UserAdmin },
+  { path: '/users', name: 'users', Component: Users },
+
+  { path: '/users/user-search', name: 'useradmin', Component: UserAdmin },
+  {
+    path: '/users/permission-search',
+    name: 'useradmin',
+    Component: UserPermission,
+  },
   { path: '/projects', name: 'projects', Component: ProjectList },
-  { path: '/projects/create', name: 'projectform', Component:  addProject},
+  { path: '/projects/create', name: 'projectform', Component: addProject },
   {
     path: '/projects/:projectId',
     name: 'project',

client/src/api/ProjectApiService.js

@@ -53,9 +53,9 @@ class ProjectApiService {
     console.log('THIS BASEPROJECT URL', this.baseProjectUrl);
 
     try {
-      const proj =  await fetch(this.baseProjectUrl, requestOptions);
-      const projectDetails = await proj.json()
-      return projectDetails._id
+      const proj = await fetch(this.baseProjectUrl, requestOptions);
+      const projectDetails = await proj.json();
+      return projectDetails._id;
     } catch (error) {
       console.error(`Add project error: `, error);
       alert('Server not responding.  Please try again.');
@@ -87,13 +87,13 @@ class ProjectApiService {
   async fetchPMProjects(projects) {
     const requestOptions = {
       headers: this.headers,
-      method: "PUT",
-      body: JSON.stringify(projects)
-    }
+      method: 'PUT',
+      body: JSON.stringify(projects),
+    };
     try {
-        const res = await fetch(this.baseProjectUrl, requestOptions);
-        return await res.json();
-    } catch(e) {
+      const res = await fetch(this.baseProjectUrl, requestOptions);
+      return await res.json();
+    } catch (e) {
       console.error(e);
       return undefined;
     }

client/src/api/UserApiService.js

@@ -22,6 +22,34 @@ class UserApiService {
     return [];
   }
 
+  async fetchAdmins() {
+    try {
+      const route = this.baseUserUrl + '/admins';
+      const res = await fetch(route, {
+        headers: this.headers,
+      });
+      return await res.json();
+    } catch (error) {
+      console.error(`fetchAdmins error: ${error}`);
+      alert('Server not responding.  Please refresh the page.');
+    }
+    return [];
+  }
+
+  async fetchProjectsManagers() {
+    try {
+      const route = this.baseUserUrl + '/projectManagers';
+      const res = await fetch(route, {
+        headers: this.headers,
+      });
+      return await res.json();
+    } catch (error) {
+      console.error(`fetchProjectsManagers error: ${error}`);
+      alert('Server not responding. Please refresh the page.');
+    }
+    return [];
+  }
+
   // Updates user projects in db
   async updateUserDbProjects(userToEdit, managedProjects) {
     // eslint-disable-next-line no-underscore-dangle

client/src/components/Navbar.jsx

@@ -61,7 +61,7 @@ const Navbar = (props) => {
           {/* Admin auth -> Displays 2 links -> 'Users' and 'Projects'. */}
           {auth?.user?.accessLevel === 'admin' && (
             <>
-              <StyledButton component={NavLink} to="/useradmin">
+              <StyledButton component={NavLink} to="/users">
                 USERS
               </StyledButton>
               <StyledButton component={NavLink} to="/projects">