Merge pull request #50 from VMihalov/feature/many-roles

Update auth guard arg types and update the check of role array is empty

Author: v-checha

generators/auth/templates/mongodb/jwt/src/decorators/auth.decorator.ts

@@ -1,9 +1,9 @@
 import { applyDecorators, SetMetadata, UseGuards } from '@nestjs/common';
 import JwtAccessGuard from '@guards/jwt-access.guard';
 import RolesGuard from '@guards/roles.guard';
-import { RolesAuthType } from '@decorators/roles.decorator';
+import { RolesEnum } from '@decorators/roles.decorator';
 
-export default function Auth(roles: RolesAuthType) {
+export default function Auth(...roles: RolesEnum[]) {
   return applyDecorators(
     SetMetadata('roles', roles),
     UseGuards(JwtAccessGuard, RolesGuard),

generators/auth/templates/mongodb/jwt/src/decorators/roles.decorator.ts

@@ -5,6 +5,4 @@ export enum RolesEnum {
   USER = 'user'
 }
 
-export type RolesAuthType = RolesEnum[] | RolesEnum | void;
-
 export const Roles = (...roles: RolesEnum[]) => SetMetadata('roles', roles);

generators/auth/templates/mongodb/jwt/src/guards/roles.guard.ts

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { Request } from 'express';
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
@@ -14,7 +15,7 @@ export default class RolesGuard implements CanActivate {
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const roles = this.reflector.get<RolesEnum[]>('roles', context.getHandler());
 
-    if (!roles) {
+    if (_.isEmpty(roles)) {
       return true;
     }
 

generators/auth/templates/mongodb/oauth2/src/guards/roles.guard.ts

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {
   CanActivate,
   ExecutionContext,
@@ -6,17 +7,21 @@ import {
 } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 
+import { RolesEnum } from '@decorators/roles.decorator';
+
 @Injectable()
 export default class RolesGuard implements CanActivate {
   constructor(
     private reflector: Reflector,
   ) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
-    const roles = this.reflector.get<string[]>('roles', context.getHandler());
-    if (!roles) {
+    const roles = this.reflector.get<RolesEnum[]>('roles', context.getHandler());
+
+    if (_.isEmpty(roles)) {
       return true;
     }
+
     const req = context.switchToHttp().getRequest();
     if (req.isUnauthenticated()) {
       throw new UnauthorizedException('Login please');

generators/auth/templates/mongodb/passportLocal/src/guards/roles.guard.ts

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import {RolesEnum} from "@decorators/roles.decorator";
@@ -10,7 +11,8 @@ export default class RolesGuard implements CanActivate {
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const roles = this.reflector.get<RolesEnum[]>('roles', context.getHandler());
-    if (!roles) {
+
+    if (_.isEmpty(roles)) {
       return true;
     }
 

generators/auth/templates/mysql/oauth2/src/guards/roles.guard.ts

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {
   CanActivate,
   ExecutionContext,
@@ -17,7 +18,7 @@ export default class RolesGuard implements CanActivate {
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const roles = this.reflector.get<RolesEnum[]>('roles', context.getHandler());
 
-    if (!roles) {
+    if (_.isEmpty(roles)) {
       return true;
     }