Merge branch 'dev' of https://github.com/SyncrowIOT/backend into dev

libs/common/src/auth/services/auth.service.ts

@@ -33,33 +33,34 @@ export class AuthService {
     const user = await this.userRepository.findOne({
       where: {
         email,
-        region: regionUuid
+        region: regionUuid ? { uuid: regionUuid } : undefined,
-          ? {
-              uuid: regionUuid,
-            }
-          : undefined,
       },
       relations: ['roleType'],
     });
 
+    if (!user) {
+      throw new BadRequestException('Invalid credentials');
+    }
+
     if (!user.isUserVerified) {
       throw new BadRequestException('User is not verified');
     }
     if (!user.isActive) {
       throw new BadRequestException('User is not active');
     }
-    if (user) {
+
-      const passwordMatch = this.helperHashService.bcryptCompare(
+    const passwordMatch = await this.helperHashService.bcryptCompare(
       pass,
       user.password,
     );
-      if (passwordMatch) {
+    if (!passwordMatch) {
-        const { ...result } = user;
+      throw new BadRequestException('Invalid credentials');
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { password, ...result } = user;
     return result;
   }
-    }
-    return null;
-  }
 
   async createSession(data): Promise<UserSessionEntity> {
     return await this.sessionRepository.save(data);

src/common/filters/http-exception/http-exception.filter.ts

@@ -5,34 +5,55 @@ import {
   HttpException,
   HttpStatus,
 } from '@nestjs/common';
-import { Response } from 'express';
+import { Request, Response } from 'express';
 
 @Catch()
 export class HttpExceptionFilter implements ExceptionFilter {
-  catch(exception: unknown, host: ArgumentsHost) {
+  catch(exception: unknown, host: ArgumentsHost): void {
     const ctx = host.switchToHttp();
     const response = ctx.getResponse<Response>();
     const request = ctx.getRequest<Request>();
-    const status =
-      exception instanceof HttpException
-        ? exception.getStatus()
-        : HttpStatus.INTERNAL_SERVER_ERROR;
 
-    const message =
+    const status = this.getStatus(exception);
-      exception instanceof HttpException
+    const errorMessage = this.getErrorMessage(exception);
-        ? exception.getResponse()
+    const formattedStatus = this.formatStatus(status);
-        : 'Internal server error';
 
     const errorResponse = {
       statusCode: status,
       timestamp: new Date().toISOString(),
       path: request.url,
-      error: message,
+      error:
+        typeof errorMessage === 'string'
+          ? {
+              message: errorMessage,
+              error: formattedStatus,
+              statusCode: status,
+            }
+          : errorMessage,
     };
 
-    // Optionally log the exception
+    console.error('Error occurred:', exception);
-    console.error(`Error occurred:`, exception);
-
     response.status(status).json(errorResponse);
   }
+
+  private getStatus(exception: unknown): HttpStatus {
+    return exception instanceof HttpException
+      ? exception.getStatus()
+      : HttpStatus.INTERNAL_SERVER_ERROR;
+  }
+
+  private getErrorMessage(exception: unknown): string | object {
+    return exception instanceof HttpException
+      ? exception.getResponse()
+      : 'Internal server error';
+  }
+
+  private formatStatus(status: HttpStatus): string {
+    return HttpStatus[status]
+      .toLowerCase()
+      .replace('_', ' ')
+      .split(' ')
+      .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+      .join(' ');
+  }
 }