Merge pull request #496 from chaynHQ/develop

Merge Develop onto Main
chaynHQ · Jun 25, 2024 · 2546082 · 2546082
2 parents d7d0a0f + 06bf40a
commit 2546082
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/firebase/firebase-auth.guard.ts b/src/firebase/firebase-auth.guard.ts
@@ -7,6 +7,7 @@ import {
   UnauthorizedException,
 } from '@nestjs/common';
 import { Request } from 'express';
+import { FIREBASE_ERRORS } from 'src/utils/errors';
 import { AuthService } from '../auth/auth.service';
 import { UserService } from '../user/user.service';
 import { IFirebaseUser } from './firebase-user.interface';
@@ -32,7 +33,7 @@ export class FirebaseAuthGuard implements CanActivate {
       user = await this.authService.parseAuth(authorization);
     } catch (error) {
       if (error.code === 'auth/id-token-expired') {
-        throw new HttpException(`FirebaseAuthGuard - ${error}`, HttpStatus.UNAUTHORIZED);
+        throw new HttpException(FIREBASE_ERRORS.ID_TOKEN_EXPIRED, HttpStatus.UNAUTHORIZED);
       }
 
       throw new HttpException(

diff --git a/src/partner-admin/partner-admin-auth.guard.ts b/src/partner-admin/partner-admin-auth.guard.ts
@@ -8,6 +8,7 @@ import {
 import { InjectRepository } from '@nestjs/typeorm';
 import { Request } from 'express';
 import { UserEntity } from 'src/entities/user.entity';
+import { FIREBASE_ERRORS } from 'src/utils/errors';
 import { Repository } from 'typeorm';
 import { AuthService } from '../auth/auth.service';
 
@@ -31,7 +32,7 @@ export class PartnerAdminAuthGuard implements CanActivate {
       userUid = uid;
     } catch (error) {
       if (error.code === 'auth/id-token-expired') {
-        throw new HttpException(`PartnerAdminAuthGuard - ${error}`, HttpStatus.UNAUTHORIZED);
+        throw new HttpException(FIREBASE_ERRORS.ID_TOKEN_EXPIRED, HttpStatus.UNAUTHORIZED);
       }
 
       throw new HttpException(

diff --git a/src/partner-admin/super-admin-auth.guard.ts b/src/partner-admin/super-admin-auth.guard.ts
@@ -8,6 +8,7 @@ import {
 import { InjectRepository } from '@nestjs/typeorm';
 import { Request } from 'express';
 import { UserEntity } from 'src/entities/user.entity';
+import { FIREBASE_ERRORS } from 'src/utils/errors';
 import { Repository } from 'typeorm';
 import { AuthService } from '../auth/auth.service';
 
@@ -35,7 +36,7 @@ export class SuperAdminAuthGuard implements CanActivate {
       userUid = uid;
     } catch (error) {
       if (error.code === 'auth/id-token-expired') {
-        throw new HttpException(`SuperAdminAuthGuard - ${error}`, HttpStatus.UNAUTHORIZED);
+        throw new HttpException(FIREBASE_ERRORS.ID_TOKEN_EXPIRED, HttpStatus.UNAUTHORIZED);
       }
 
       throw new HttpException(

diff --git a/src/utils/errors.ts b/src/utils/errors.ts
@@ -6,4 +6,5 @@ export enum FIREBASE_ERRORS {
   CREATE_USER_INVALID_EMAIL = 'CREATE_USER_INVALID_EMAIL',
   CREATE_USER_WEAK_PASSWORD = 'CREATE_USER_WEAK_PASSWORD',
   CREATE_USER_ALREADY_EXISTS = 'CREATE_USER_ALREADY_EXISTS',
+  ID_TOKEN_EXPIRED = 'ID_TOKEN_EXPIRED',
 }