Merge pull request #69 from VentionCapstone/fix/158_fix-access-token-…

…error Fix/158 fix access token error
VentionCapstone · Feb 9, 2024 · 032fd61 · 032fd61
2 parents 5a1edc7 + baa89d1
commit 032fd61
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/common/guards/admin.guard.ts b/src/common/guards/admin.guard.ts
@@ -1,5 +1,5 @@
 import { CanActivate, ExecutionContext, Injectable, UnauthorizedException } from '@nestjs/common';
-import { JwtService, TokenExpiredError } from '@nestjs/jwt';
+import { JsonWebTokenError, JwtService, TokenExpiredError } from '@nestjs/jwt';
 import ErrorsTypes from 'src/errors/errors.enum';
 import { GlobalException } from 'src/exceptions/global.exception';
 import { User } from '../../auth/entities/auth.entity';
@@ -46,8 +46,10 @@ export class AdminGuard implements CanActivate {
     } catch (error) {
       if (error instanceof TokenExpiredError)
         throw new UnauthorizedException(ErrorsTypes.UNAUTHORIZED_AUTH_EXPIRED_ACCESS_TOKEN);
+      if (error instanceof JsonWebTokenError)
+        throw new UnauthorizedException(ErrorsTypes.AUTH_FAILED_TOKEN_VERIFY);
       if (error instanceof UnauthorizedException) throw error;
-      throw new GlobalException(ErrorsTypes.AUTH_FAILED_TOKEN_VERIFY);
+      throw new GlobalException(ErrorsTypes.AUTH_FAILED_TOKEN_VERIFY, error.message);
     }
   }
 }
diff --git a/src/common/guards/user.guard.ts b/src/common/guards/user.guard.ts
@@ -1,5 +1,5 @@
 import { CanActivate, ExecutionContext, Injectable, UnauthorizedException } from '@nestjs/common';
-import { JwtService, TokenExpiredError } from '@nestjs/jwt';
+import { JsonWebTokenError, JwtService, TokenExpiredError } from '@nestjs/jwt';
 import ErrorsTypes from 'src/errors/errors.enum';
 import { GlobalException } from 'src/exceptions/global.exception';
 import { User } from '../../auth/entities/auth.entity';
@@ -44,8 +44,10 @@ export class UserGuard implements CanActivate {
     } catch (error) {
       if (error instanceof TokenExpiredError)
         throw new UnauthorizedException(ErrorsTypes.UNAUTHORIZED_AUTH_EXPIRED_ACCESS_TOKEN);
+      if (error instanceof JsonWebTokenError)
+        throw new UnauthorizedException(ErrorsTypes.AUTH_FAILED_TOKEN_VERIFY);
       if (error instanceof UnauthorizedException) throw error;
-      throw new GlobalException(ErrorsTypes.AUTH_FAILED_TOKEN_VERIFY);
+      throw new GlobalException(ErrorsTypes.AUTH_FAILED_TOKEN_VERIFY, error.message);
     }
   }
 }