fix: 401 not 400

CS3219-AY2425S1 · Nov 14, 2024 · a60dce3 · a60dce3
1 parent bffd33a
commit a60dce3
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 31 deletions.
diff --git a/collaboration-service/src/errors/ForbiddenError.js b/collaboration-service/src/errors/ForbiddenError.js
@@ -2,9 +2,9 @@ import BaseError from './BaseError.js';
 
 class ForbiddenError extends BaseError {
   constructor(message) {
-    super(403, message);
+    super(400, message);
     this.name = 'ForbiddenError';
-    this.statusCode = 403;
+    this.statusCode = 400;
   }
 }
 

diff --git a/collaboration-service/src/errors/InvalidArgumentError.js b/collaboration-service/src/errors/InvalidArgumentError.js
@@ -4,7 +4,7 @@ class InvalidArgumentError extends BaseError {
   constructor(message) {
     super(500, message);
     this.name = 'InvalidArgumentError';
-    this.statusCode = 403;
+    this.statusCode = 400;
   }
 }
 

diff --git a/collaboration-service/src/errors/InvalidQueryParamError.js b/collaboration-service/src/errors/InvalidQueryParamError.js
@@ -2,9 +2,9 @@ import BaseError from './BaseError.js';
 
 class InvalidQueryParamError extends BaseError {
   constructor(message) {
-    super(401, message);
+    super(400, message);
     this.name = 'InvalidQueryParamError';
-    this.statusCode = 401;
+    this.statusCode = 400;
   }
 }
 

diff --git a/collaboration-service/src/errors/RoomCapacityError.js b/collaboration-service/src/errors/RoomCapacityError.js
@@ -2,9 +2,9 @@ import BaseError from './BaseError.js';
 
 class RoomCapacityError extends BaseError {
   constructor(message) {
-    super(401, message);
+    super(400, message);
     this.name = 'RoomCapacityError';
-    this.statusCode = 401;
+    this.statusCode = 400;
   }
 }
 

diff --git a/collaboration-service/src/errors/RoomNotEmptyError.js b/collaboration-service/src/errors/RoomNotEmptyError.js
@@ -2,9 +2,9 @@ import BaseError from './BaseError.js';
 
 class RoomNotEmptyError extends BaseError {
   constructor(message) {
-    super(401, message);
+    super(400, message);
     this.name = 'RoomNotEmptyError';
-    this.statusCode = 401;
+    this.statusCode = 400;
   }
 }
 

diff --git a/collaboration-service/src/errors/UserAlreadyFoundInRoomError.js b/collaboration-service/src/errors/UserAlreadyFoundInRoomError.js
@@ -2,9 +2,9 @@ import BaseError from './BaseError.js';
 
 class UserAlreadyFoundInRoomError extends BaseError {
   constructor(message) {
-    super(401, message);
+    super(400, message);
     this.name = 'UserAlreadyFoundInRoomError';
-    this.statusCode = 401;
+    this.statusCode = 400;
   }
 }
 

diff --git a/collaboration-service/src/errors/UserDeregistrationError.js b/collaboration-service/src/errors/UserDeregistrationError.js
@@ -3,9 +3,9 @@ import UserRegistrationError from './UserRegistrationError.js';
 
 class UserDeregistrationError extends UserRegistrationError {
   constructor(message) {
-    super(401, message);
+    super(400, message);
     this.name = 'UserDeregistrationError';
-    this.statusCode = 401;
+    this.statusCode = 400;
   }
 }
 

diff --git a/collaboration-service/src/errors/UserRegistrationError.js b/collaboration-service/src/errors/UserRegistrationError.js
@@ -2,9 +2,9 @@ import BaseError from './BaseError.js';
 
 class UserRegistrationError extends BaseError {
   constructor(message) {
-    super(401, message);
+    super(400, message);
     this.name = 'UserRegistrationError';
-    this.statusCode = 401;
+    this.statusCode = 400;
   }
 }
 

diff --git a/collaboration-service/src/session/api.js b/collaboration-service/src/session/api.js
@@ -23,8 +23,8 @@ const createRoom = async (request, response, next) => {
       question === null ||
       question === undefined
     ) {
-      return response.status(401).json({
-        statusCode: 401,
+      return response.status(400).json({
+        statusCode: 400,
         message: 'Unable to create room as no users or questions are defined',
       });
     }
@@ -85,8 +85,8 @@ const getRoomDetails = async (request, response, next) => {
     console.log('users:', users);
 
     if (users === null) {
-      return response.status(401).json({
-        statusCode: 401,
+      return response.status(400).json({
+        statusCode: 400,
         message: 'Room cannot be found',
       });
     }
@@ -175,8 +175,8 @@ const getUserDetails = async (request, response, next) => {
     const roomDetails = LocalClient.getDocByUser(userId);
 
     if (roomDetails === null) {
-      return response.status(401).json({
-        statusCode: 401,
+      return response.status(400).json({
+        statusCode: 400,
         message: 'User ID is invalid',
       });
     }
@@ -211,8 +211,8 @@ const registerUser = async (request, response, next) => {
       userId === undefined ||
       userId === null
     ) {
-      return response.status(401).json({
-        statusCode: 401,
+      return response.status(400).json({
+        statusCode: 400,
         message: 'Cannot register user as userId or roomId is missing',
       });
     }
@@ -251,8 +251,8 @@ const deregisterUser = async (request, response, next) => {
       userId === undefined ||
       userId === null
     ) {
-      return response.status(401).json({
-        statusCode: 401,
+      return response.status(400).json({
+        statusCode: 400,
         message: 'Cannot register user as userId or roomId is missing',
       });
     }

diff --git a/collaboration-service/test/test-api.js b/collaboration-service/test/test-api.js
@@ -45,7 +45,7 @@ describe('Collaboration Service API', () => {
         .post('/api/collaboration-service/create-room')
         .set({ Cookie: `accessToken=${token}` })
         .send({ question: 'question' })
-        .expect(401)
+        .expect(400)
         .expect('Content-Type', /json/);
 
       assert.equal(
@@ -59,7 +59,7 @@ describe('Collaboration Service API', () => {
         .post('/api/collaboration-service/create-room')
         .set({ Cookie: `accessToken=${token}` })
         .send({ users: ['user1', 'user2'] })
-        .expect(401)
+        .expect(400)
         .expect('Content-Type', /json/);
 
       assert.equal(
@@ -87,7 +87,7 @@ describe('Collaboration Service API', () => {
         .post('/api/collaboration-service/create-room')
         .set({ Cookie: `accessToken=${token}` })
         .send({ question: 'question 2', users: ['userabc', 'userkmn'] })
-        .expect(401)
+        .expect(400)
         .expect('Content-Type', /json/);
 
       assert.equal(test.body.message, 'Users belong in seperate rooms');
@@ -163,7 +163,7 @@ describe('Collaboration Service API', () => {
       const result = await request(app)
         .get('/api/collaboration-service/rooms/asdnasdsa')
         .set({ Cookie: `accessToken=${token}` })
-        .expect(401)
+        .expect(400)
         .expect('Content-Type', /json/);
 
       assert.equal(result.body.message, 'Room cannot be found');
@@ -242,7 +242,7 @@ describe('Collaboration Service API', () => {
       const result = await request(app)
         .get('/api/collaboration-service/users')
         .set({ Cookie: `accessToken=${token}` })
-        .expect(401)
+        .expect(400)
         .expect('Content-Type', /json/);
 
       assert.equal(result.body.message, 'User ID is invalid');
@@ -252,7 +252,7 @@ describe('Collaboration Service API', () => {
       const result = await request(app)
         .get('/api/collaboration-service/users?userId=asdnasdsa')
         .set({ Cookie: `accessToken=${token}` })
-        .expect(401)
+        .expect(400)
         .expect('Content-Type', /json/);
 
       assert.equal(result.body.message, 'User ID is invalid');