Merge PR: Restrict user data access

Author: hussein-m-kandil

src/api/v1/users/users.router.ts

@@ -1,4 +1,4 @@
-import { Request, Router } from 'express';
+import { NextFunction, Request, Router } from 'express';
 import {
   createJwtForUser,
   findFilteredPosts,
@@ -12,6 +12,7 @@ import { AuthResponse, NewUserInput } from '../../../types';
 import { Prisma } from '../../../../prisma/generated/client';
 import {
   authValidator,
+  adminValidator,
   optionalAuthValidator,
   createAdminOrOwnerValidator,
 } from '../../../middlewares/validators';
@@ -25,23 +26,28 @@ import usersService from './users.service';
 
 export const usersRouter = Router();
 
-/*
- * NOTE: There are no restriction on any GET method,
- * because the API responding on a limited set of origins.
- * See the CORS settings in the app's entry point.
- */
-
-usersRouter.get('/', async (req, res) => {
+usersRouter.get('/', authValidator, adminValidator, async (req, res) => {
   const users = await usersService.getAllUsers();
   res.json(users);
 });
 
-usersRouter.get('/:idOrUsername', async (req, res) => {
-  const user = await usersService.findUserByIdOrByUsernameOrThrow(
-    req.params.idOrUsername
-  );
-  res.json(user);
-});
+usersRouter.get(
+  '/:idOrUsername',
+  optionalAuthValidator,
+  async (req, res, next) => {
+    const param = req.params.idOrUsername;
+    const user = await usersService.findUserByIdOrByUsernameOrThrow(param);
+    if (param === user.id) {
+      res.json(user);
+    } else {
+      const nextWrapper: NextFunction = (x: unknown) => {
+        if (x) next(x);
+        else res.json(user);
+      };
+      await createAdminOrOwnerValidator(() => user.id)(req, res, nextWrapper);
+    }
+  }
+);
 
 usersRouter.get('/:id/posts', optionalAuthValidator, async (req, res) => {
   const authorId = req.params.id;

src/tests/api/v1/users.int.test.ts

@@ -143,6 +143,18 @@ describe('Users endpoint', async () => {
   });
 
   describe(`GET ${USERS_URL}`, () => {
+    it('should respond with 401 on request without JWT', async () => {
+      const res = await api.get(USERS_URL);
+      assertUnauthorizedErrorRes(res);
+    });
+
+    it('should respond with 401 on request with non-admin JWT', async () => {
+      await createUser(userData);
+      const { authorizedApi } = await prepForAuthorizedTest(userData);
+      const res = await authorizedApi.get(USERS_URL);
+      assertUnauthorizedErrorRes(res);
+    });
+
     it('should respond with users list, on request with admin JWT', async () => {
       await createUser(adminData);
       const dbUser = await createUser(userData);
@@ -173,14 +185,35 @@ describe('Users endpoint', async () => {
       assertNotFoundErrorRes(res);
     });
 
-    it('should respond with the found user on request with id or username', async () => {
-      await createUser(adminData);
+    it('should respond with 401 on non-owner request with username', async () => {
+      await createUser(xUserData);
+      const dbUser = await createUser(userData);
+      const { authorizedApi } = await prepForAuthorizedTest(xUserData);
+      const res = await authorizedApi.get(`${USERS_URL}/${dbUser.username}`);
+      assertUnauthorizedErrorRes(res);
+    });
+
+    it('should respond with the found user on request with id for anyone', async () => {
       const dbUser = await createUser(userData);
+      const res = await api.get(`${USERS_URL}/${dbUser.id}`);
+      const resUser = res.body as User;
+      expect(res.statusCode).toBe(200);
+      expect(res.type).toMatch(/json/);
+      expect(resUser.id).toBe(dbUser.id);
+      expect(resUser.isAdmin).toStrictEqual(false);
+      expect(resUser.username).toBe(dbUser.username);
+      expect(resUser.fullname).toBe(dbUser.fullname);
+      expect(resUser.password).toBeUndefined();
+    });
+
+    it('should respond with the found user on owner request with id or username', async () => {
+      const dbUser = await createUser(userData);
+      const { authorizedApi } = await prepForAuthorizedTest(userData);
       for (const param of [dbUser.id, dbUser.username]) {
-        const res = await api.get(`${USERS_URL}/${param}`);
+        const res = await authorizedApi.get(`${USERS_URL}/${param}`);
         const resUser = res.body as User;
-        expect(res.type).toMatch(/json/);
         expect(res.statusCode).toBe(200);
+        expect(res.type).toMatch(/json/);
         expect(resUser.id).toBe(dbUser.id);
         expect(resUser.isAdmin).toStrictEqual(false);
         expect(resUser.username).toBe(dbUser.username);