Fix linting

CS3219-AY2425S1 · Nov 12, 2024 · 2cdd900 · 2cdd900
1 parent 2b6c943
commit 2cdd900
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 24 deletions.
diff --git a/services/user/src/controller/user-controller.ts b/services/user/src/controller/user-controller.ts
@@ -13,8 +13,20 @@ import {
 } from '../model/repository';
 import { Request, Response } from 'express';
 import { User } from '../model/user-model';
-import { handleBadRequest, handleConflict, handleInternalError, handleNotFound, handleSuccess, handleUnauthorized } from '../utils/helper';
-import { registrationSchema, updatePasswordSchema, updateUsernameAndEmailSchema, UserValidationErrors } from '../types/custom';
+import {
+    handleBadRequest,
+    handleConflict,
+    handleInternalError,
+    handleNotFound,
+    handleSuccess,
+    handleUnauthorized,
+} from '../utils/helper';
+import {
+    registrationSchema,
+    updatePasswordSchema,
+    updateUsernameAndEmailSchema,
+    UserValidationErrors,
+} from '../types/custom';
 
 export async function createUser(req: Request, res: Response) {
     try {
@@ -106,7 +118,7 @@ export async function updateUsernameAndEmail(req: Request, res: Response) {
                 handleNotFound(res, `User ${userId} not found`);
                 return;
             }
-            const match = await bcrypt.compare(password, userById.password); 
+            const match = await bcrypt.compare(password, userById.password);
             if (!match) {
                 handleUnauthorized(res, 'Wrong password');
                 return;
@@ -115,7 +127,7 @@ export async function updateUsernameAndEmail(req: Request, res: Response) {
             const updatedUser = (await _updateUserById(userId, username, email, userById.password)) as User;
             handleSuccess(res, 200, `Updated data for user ${userId}`, formatUserResponse(updatedUser));
         } else {
-            console.log(parseResult.error.errors)
+            console.log(parseResult.error.errors);
             const required_errors = parseResult.error.errors.filter(
                 err => err.message == UserValidationErrors.REQUIRED,
             );
@@ -126,6 +138,7 @@ export async function updateUsernameAndEmail(req: Request, res: Response) {
             handleBadRequest(res, 'invalid username and/or email');
         }
     } catch (err) {
+        console.error(err);
         handleInternalError(res, 'Unknown error when updating user!');
         return;
     }
@@ -147,7 +160,7 @@ export async function updatePassword(req: Request, res: Response) {
                 handleNotFound(res, `User ${userId} not found`);
                 return;
             }
-            const match = await bcrypt.compare(oldPassword, userById.password); 
+            const match = await bcrypt.compare(oldPassword, userById.password);
             if (!match) {
                 handleUnauthorized(res, 'Wrong password');
                 return;
@@ -156,7 +169,12 @@ export async function updatePassword(req: Request, res: Response) {
             const salt = bcrypt.genSaltSync(10);
             const hashedPassword = bcrypt.hashSync(newPassword, salt);
 
-            const updatedUser = (await _updateUserById(userId, userById.username, userById.email, hashedPassword)) as User;
+            const updatedUser = (await _updateUserById(
+                userId,
+                userById.username,
+                userById.email,
+                hashedPassword,
+            )) as User;
             handleSuccess(res, 200, `Updated data for user ${userId}`, formatUserResponse(updatedUser));
         } else {
             const required_errors = parseResult.error.errors.filter(

diff --git a/services/user/src/types/custom.ts b/services/user/src/types/custom.ts
@@ -14,28 +14,28 @@ export interface RequestUser {
 }
 
 export const usernameSchema = z
-  .string({
-    invalid_type_error: UserValidationErrors.INVALID,
-    required_error: UserValidationErrors.REQUIRED,
-  })
-  .regex(/^[a-zA-Z0-9._-]+$/, UserValidationErrors.INVALID);
+    .string({
+        invalid_type_error: UserValidationErrors.INVALID,
+        required_error: UserValidationErrors.REQUIRED,
+    })
+    .regex(/^[a-zA-Z0-9._-]+$/, UserValidationErrors.INVALID);
 
 export const emailSchema = z
-  .string({
-    invalid_type_error: UserValidationErrors.INVALID,
-    required_error: UserValidationErrors.REQUIRED,
-  })
-  .email(UserValidationErrors.INVALID);
+    .string({
+        invalid_type_error: UserValidationErrors.INVALID,
+        required_error: UserValidationErrors.REQUIRED,
+    })
+    .email(UserValidationErrors.INVALID);
 
 export const passwordSchema = z
-  .string({
-    invalid_type_error: UserValidationErrors.INVALID,
-    required_error: UserValidationErrors.REQUIRED,
-  })
-  .regex(
-    /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.{8,})(?=.*[!"#$%&'()*+,-.:;<=>?@\\/\\[\]^_`{|}~])/,
-    UserValidationErrors.INVALID,
-  );
+    .string({
+        invalid_type_error: UserValidationErrors.INVALID,
+        required_error: UserValidationErrors.REQUIRED,
+    })
+    .regex(
+        /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.{8,})(?=.*[!"#$%&'()*+,-.:;<=>?@\\/\\[\]^_`{|}~])/,
+        UserValidationErrors.INVALID,
+    );
 
 export const registrationSchema = z.object({
     username: usernameSchema,