feature: update roles enum and update auth guard

Author: VMihalov

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

@@ -1,13 +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';
 
-enum RolesEnum {
-  admin = 'admin',
-  user = 'user',
-}
-
-export default function Auth(...roles: RolesEnum[]) {
+export default function Auth(roles: RolesAuthType) {
   return applyDecorators(
     SetMetadata('roles', roles),
     UseGuards(JwtAccessGuard, RolesGuard),

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

@@ -1,8 +1,10 @@
 import { SetMetadata } from '@nestjs/common';
 
 export enum RolesEnum {
-  admin = 'admin',
-  user = 'user'
+  ADMIN = 'admin',
+  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

@@ -18,6 +18,6 @@ export default class RolesGuard implements CanActivate {
     const request: Request = context.switchToHttp().getRequest();
     const user = request.user as UserDocument;
 
-    return user.role === RolesEnum.admin || roles.includes(user.role);
+    return user.role === RolesEnum.ADMIN || roles.includes(user.role);
   }
 }

generators/auth/templates/mongodb/jwt/src/modules/v1/auth/auth.controller.ts

@@ -249,7 +249,7 @@ export default class AuthController {
   })
   @ApiBearerAuth()
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Auth(RolesEnum.admin)
+  @Auth(RolesEnum.ADMIN)
   @Put('verify')
   async verifyUser(@Body() verifyUserDto: VerifyUserDto): Promise<User | null> {
     const foundUser = await this.usersService.getUnverifiedUserByEmail(
@@ -325,7 +325,7 @@ export default class AuthController {
   })
   @ApiBearerAuth()
   @Delete('logout-all')
-  @Auth(RolesEnum.admin)
+  @Auth(RolesEnum.ADMIN)
   @HttpCode(HttpStatus.NO_CONTENT)
   async logoutAll(): Promise<{}> {
     return this.authService.deleteAllTokens();

generators/auth/templates/mongodb/jwt/src/modules/v1/users/dto/user-response.dto.ts

@@ -7,7 +7,7 @@ export class UserResponseDto {
   @Transform(({ value }) => value.toString(), { toPlainOnly: true })
   _id: ObjectId = new ObjectId();
 
-  role: RolesEnum = RolesEnum.user;
+  role: RolesEnum = RolesEnum.USER;
 
   verified: boolean = false;
 

generators/auth/templates/mongodb/jwt/src/modules/v1/users/schemas/users.schema.ts

@@ -27,9 +27,9 @@ export class User {
   @Prop({
     type: String,
     required: false,
-    default: RolesEnum.user,
+    default: RolesEnum.USER,
   })
-  role: RolesEnum = RolesEnum.user;
+  role: RolesEnum = RolesEnum.USER;
 }
 
 export type UserDocument = User & Document;

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

@@ -1,8 +1,8 @@
 import { SetMetadata } from '@nestjs/common';
 
 export enum RolesEnum {
-  admin = 'admin',
-  user = 'user'
+  ADMIN = 'admin',
+  USER = 'user'
 }
 
 export const Roles = (...roles: RolesEnum[]) => SetMetadata('roles', roles);

generators/auth/templates/mongodb/oauth2/src/modules/v1/users/dto/user-response.dto.ts

@@ -16,7 +16,7 @@ export class UserResponseDto {
 
   lastName: string = '';
 
-  role: RolesEnum = RolesEnum.user;
+  role: RolesEnum = RolesEnum.USER;
 
   email: string = '';
 

generators/auth/templates/mongodb/oauth2/src/modules/v1/users/schemas/users.schema.ts

@@ -38,9 +38,9 @@ export class User {
   @Prop({
     type: String,
     required: false,
-    default: RolesEnum.user,
+    default: RolesEnum.USER,
   })
-  role: RolesEnum = RolesEnum.user;
+  role: RolesEnum = RolesEnum.USER;
 }
 
 export type UserDocument = User & Document;

generators/auth/templates/mongodb/oauth2/src/modules/v1/users/users.controller.ts

@@ -37,7 +37,7 @@ export default class UsersController {
   @Get()
   @UseGuards(RolesGuard)
   @Serialize(UsersResponseDto)
-  @Roles(RolesEnum.admin)
+  @Roles(RolesEnum.ADMIN)
   async getAllVerified(): Promise<UserDocument[]> {
     return this.usersService.getAllVerified();
   }