allUsers

Author: walker-sean

src/backend/src/controllers/reimbursement-requests.controllers.ts

@@ -274,13 +274,11 @@ export default class ReimbursementRequestsController {
   }
 
   static async getAllReimbursementRequests(req: Request, res: Response, next: NextFunction) {
-    console.log('here');
     try {
       const reimbursementRequests: ReimbursementRequest[] = await ReimbursementRequestService.getAllReimbursementRequests(
         req.currentUser,
         req.organization
       );
-      console.log(reimbursementRequests);
       res.status(200).json(reimbursementRequests);
     } catch (error: unknown) {
       console.error(error);

src/backend/src/controllers/users.controllers.ts

@@ -3,19 +3,25 @@ import UsersService from '../services/users.services';
 import { AccessDeniedException } from '../utils/errors.utils';
 import { Task } from 'shared';
 export default class UsersController {
-  static async getAllUsers(req: Request, res: Response, next: NextFunction) {
+  static async getAllUsers(_req: Request, res: Response, next: NextFunction) {
     try {
-      const allOrgs = req.query.allOrgs === 'true';
-      const users = allOrgs
-        ? await UsersService.getAllUsers()
-        : await UsersService.getAllUsers(req.organization.organizationId);
+      const users = await UsersService.getAllUsers();
       res.status(200).json(users);
     } catch (error: unknown) {
       console.error(error);
       next(error);
     }
   }
 
+  static async getAllOrgUsers(req: Request, res: Response, next: NextFunction) {
+    try {
+      const users = await UsersService.getAllOrgUsers(req.organization);
+      res.status(200).json(users);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async getCurrentUser(req: Request, res: Response, next: NextFunction) {
     try {
       const user = await UsersService.getCurrentUser(req.currentUser);

src/backend/src/routes/users.routes.ts

@@ -1,12 +1,13 @@
 import { Theme } from '@prisma/client';
 import express from 'express';
-import { body, query } from 'express-validator';
+import { body } from 'express-validator';
 import UsersController from '../controllers/users.controllers';
 import { isRole, nonEmptyString, intMinZero, validateInputs, isDate } from '../utils/validation.utils';
 
 const userRouter = express.Router();
 
-userRouter.get('/all', query('allOrgs').isBoolean().optional(), validateInputs, UsersController.getAllUsers);
+userRouter.get('/', UsersController.getAllUsers);
+userRouter.get('/organization', UsersController.getAllOrgUsers);
 userRouter.post(
   '/scheduleSettings',
   body('userIds').isArray(),

src/backend/src/services/reimbursement-requests.services.ts

@@ -896,7 +896,6 @@ export default class ReimbursementRequestService {
    * @returns an array of the prisma version of the reimbursement requests transformed to the shared version
    */
   static async getAllReimbursementRequests(user: User, organization: Organization): Promise<ReimbursementRequest[]> {
-    console.log(organization.organizationId);
     await isUserHeadOrOnFinance(user, organization.organizationId);
 
     const reimbursementRequests = await prisma.reimbursement_Request.findMany({

src/backend/src/services/users.services.ts

@@ -33,23 +33,33 @@ import { validateUserIsPartOfFinanceTeamOrHead } from '../utils/reimbursement-re
 export default class UsersService {
   /**
    * Gets all of the users from the database
-   * @param organizationId the id of the organization to get the users for
    * @returns a list of all the users
    */
-  static async getAllUsers(organizationId?: string): Promise<User[]> {
+  static async getAllUsers(): Promise<User[]> {
     const users = await prisma.user.findMany({
-      ...(organizationId ? { where: { organizations: { some: { organizationId } } } } : {}),
-      ...(organizationId
-        ? getUserQueryArgs(organizationId)
-        : {
-            select: {
-              roles: true,
-              userId: true,
-              firstName: true,
-              lastName: true,
-              email: true
-            }
-          })
+      select: {
+        roles: true,
+        userId: true,
+        firstName: true,
+        lastName: true,
+        email: true
+      }
+    });
+
+    users.sort((a, b) => a.firstName.localeCompare(b.firstName));
+
+    return users.map(userTransformer);
+  }
+
+  /**
+   * Gets all of the users in the current organization
+   * @param organization the organization to get the users from
+   * @returns a list of all the users in the current organization
+   */
+  static async getAllOrgUsers(organization: Organization): Promise<User[]> {
+    const users = await prisma.user.findMany({
+      where: { organizations: { some: { organizationId: organization.organizationId } } },
+      ...getUserQueryArgs(organization.organizationId)
     });
 
     users.sort((a, b) => a.firstName.localeCompare(b.firstName));

src/backend/src/utils/auth.utils.ts

@@ -64,7 +64,7 @@ export const requireJwtDev = (req: Request, res: Response, next: NextFunction) =
     req.path === '/users/auth/login/dev' || // logins dont have cookies yet
     req.path === '/' || // base route is available so aws can listen and check the health
     req.method === 'OPTIONS' || // this is a pre-flight request and those don't send cookies
-    req.path === '/users/all' || // dev login needs the list of users to log in
+    req.path === '/users' || // dev login needs the list of users to log in
     req.path === '/slack' // slack http endpoint is only used from slack api
   ) {
     next();
@@ -184,7 +184,7 @@ export const getUserAndOrganization = async (req: Request, res: Response, next:
     req.path === '/users/auth/login/dev' ||
     req.path === '/' || // base route is available so aws can listen and check the health
     req.method === 'OPTIONS' || // this is a pre-flight request and those don't send cookies
-    req.path === '/users/all?allOrgs=true' || // dev login needs the list of users to log in
+    req.path === '/users' || // dev login needs the list of users to log in
     req.path === '/slack' || // slack http endpoint is only used from slack api
     req.path.startsWith('/notifications') // Notifications route has its own auth, only called from gh
   ) {

src/backend/src/utils/slack.utils.ts

@@ -550,14 +550,14 @@ export const blockToString = async (block: SlackRichTextBlock) => {
  */
 export const blockToMentionedUsers = async (
   block: SlackRichTextBlock,
-  organizationId: string,
+  _organizationId: string,
   channelId: string
 ): Promise<string[]> => {
   switch (block.type) {
     case 'broadcast':
       switch (block.range) {
         case 'everyone':
-          const usersInOrg = await UsersService.getAllUsers(organizationId);
+          const usersInOrg = await UsersService.getAllUsers();
           return usersInOrg.map((user) => user.userId);
         case 'channel':
         case 'here':

src/frontend/src/apis/users.api.ts

@@ -28,8 +28,18 @@ import { taskTransformer } from './transformers/tasks.transformers';
 /**
  * Fetches all users.
  */
-export const getAllUsers = (allOrgs?: boolean) => {
-  return axios.get<UserWithRole[]>(apiUrls.allUsers(allOrgs), {
+export const getAllUsers = () => {
+  return axios.get<UserWithRole[]>(apiUrls.users(), {
+    transformResponse: (data) => JSON.parse(data).map(userTransformer)
+  });
+};
+
+/**
+ * All users in the current organization with their roles.
+ * @returns the users in the current organization with their roles
+ */
+export const getAllOrgUsers = () => {
+  return axios.get<UserWithRole[]>(apiUrls.orgUsers(), {
     transformResponse: (data) => JSON.parse(data).map(userTransformer)
   });
 };

src/frontend/src/hooks/users.hooks.ts

@@ -51,11 +51,22 @@ export const useCurrentUser = (): AuthenticatedUser => {
 };
 
 /**
- * Custom React Hook to supply all users.
+ * Custom React Hook to supply all users. (only users in the current org)
  */
-export const useAllUsers = (allOrgs?: boolean) => {
-  return useQuery<UserWithRole[], Error>(['users', allOrgs], async () => {
-    const { data } = await getAllUsers(allOrgs);
+export const useAllUsers = () => {
+  return useQuery<UserWithRole[], Error>(['users'], async () => {
+    const { data } = await getAllUsers();
+    return data;
+  });
+};
+
+/**
+ * Custom React Hook to supply all users for login (no org filtering).
+ * @returns all users regardless of org
+ */
+export const useAllLoginUsers = () => {
+  return useQuery<UserWithRole[], Error>(['users', 'login'], async () => {
+    const { data } = await getAllUsers();
     return data;
   });
 };

src/frontend/src/pages/LoginPage/LoginDev.tsx

@@ -10,7 +10,7 @@ import InputLabel from '@mui/material/InputLabel';
 import LoginIcon from '@mui/icons-material/Login';
 import FormControl from '@mui/material/FormControl';
 import LoadingIndicator from '../../components/LoadingIndicator';
-import { useAllUsers } from '../../hooks/users.hooks';
+import { useAllLoginUsers } from '../../hooks/users.hooks';
 import { fullNamePipe } from '../../utils/pipes';
 import { rankUserRole } from 'shared';
 import { FormEvent } from 'react';
@@ -28,7 +28,7 @@ const LoginDev: React.FC<LoginDevProps> = ({ devSetUser, devFormSubmit }) => {
   if (import.meta.env.MODE !== 'development') return <></>;
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const { isLoading, data: usersList } = useAllUsers(true);
+  const { isLoading, data: usersList } = useAllLoginUsers();
 
   if (!usersList || isLoading) return <LoadingIndicator />;