@lenne.tech/nest-server 9.2.4 → 9.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "9.2.4",
+  "version": "9.2.5",
   "description": "Modern, fast, powerful Node.js web framework in TypeScript based on Nest with a GraphQL API and a connection to MongoDB (or other databases).",
   "keywords": [
     "node",

package/src/core/modules/auth/guards/auth.guard.ts

@@ -1,9 +1,8 @@
-import { CanActivate, ExecutionContext, Logger, mixin, Optional, UnauthorizedException } from '@nestjs/common';
+import { CanActivate, ExecutionContext, Logger, mixin, Optional } from '@nestjs/common';
 import { GqlExecutionContext } from '@nestjs/graphql';
 import { AuthModuleOptions, Type } from '@nestjs/passport';
 import { defaultOptions } from '@nestjs/passport/dist/options';
 import { memoize } from '@nestjs/passport/dist/utils/memoize.util';
-import * as jwt from 'jsonwebtoken';
 import * as passport from 'passport';
 import { AuthGuardStrategy } from '../auth-guard-strategy.enum';
 import { ExpiredRefreshTokenException } from '../exceptions/expired-refresh-token.exception';

package/src/core/modules/auth/guards/roles.guard.ts

@@ -3,6 +3,8 @@ import { Reflector } from '@nestjs/core';
 import { GqlExecutionContext } from '@nestjs/graphql';
 import { RoleEnum } from '../../../common/enums/role.enum';
 import { AuthGuardStrategy } from '../auth-guard-strategy.enum';
+import { ExpiredTokenException } from '../exceptions/expired-token.exception';
+import { InvalidTokenException } from '../exceptions/invalid-token.exception';
 import { AuthGuard } from './auth.guard';
 
 /**
@@ -45,14 +47,22 @@ export class RolesGuard extends AuthGuard(AuthGuardStrategy.JWT) {
 
     // Check user and user roles
     if (!user?.hasRole?.(roles)) {
-      // Get args
-      const args: any = GqlExecutionContext.create(context).getArgs();
-
       // Check special user roles (user is logged in or access is free for any)
       if ((user && roles.includes(RoleEnum.S_USER)) || roles.includes(RoleEnum.S_EVERYONE)) {
         return user;
       }
 
+      // If user is missing throw token exception
+      if (!user) {
+        if (err) {
+          throw new InvalidTokenException();
+        }
+        if (info?.name === 'TokenExpiredError') {
+          throw new ExpiredTokenException();
+        }
+        throw new UnauthorizedException('Unauthorized');
+      }
+
       // Requester is not authorized
       throw new UnauthorizedException('Missing role');
     }