Merge pull request #11 from Excali-Studio/EXD-62-admin-guard

[EXD-62] Added RolesGuard

src/auth/decorator/roles.decorator.ts

@@ -0,0 +1,3 @@
+import { Reflector } from '@nestjs/core';
+
+export const Roles = Reflector.createDecorator<string[]>();

src/auth/guard/roles.guard.ts

@@ -0,0 +1,43 @@
+import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
+import { Reflector } from '@nestjs/core';
+import { Roles } from '../decorator/roles.decorator';
+import { InjectRepository } from '@nestjs/typeorm';
+import { UserEntity } from '../../user/entity/user.entity';
+import { Repository } from 'typeorm';
+import { UserRoleEntity } from '../../user/entity/user-role.entity';
+
+@Injectable()
+export class RolesGuard implements CanActivate {
+  constructor(
+    private reflector: Reflector,
+    @InjectRepository(UserEntity)
+    private readonly userRepository: Repository<UserEntity>,
+  ) {}
+
+  async canActivate(context: ExecutionContext) {
+    const roles = this.reflector.get(Roles, context.getHandler());
+    if (!roles) {
+      return true;
+    }
+    const request = context.switchToHttp().getRequest();
+    const userId = request.user;
+    if (!userId) {
+      return false;
+    }
+    const user = await this.userRepository.findOne({
+      where: { id: userId },
+      relations: {
+        roles: true,
+      },
+    });
+    return this.matchRoles(roles, user.roles);
+  }
+
+  private matchRoles(roles: string[], userRoles: UserRoleEntity[]): boolean {
+    return (
+      userRoles
+        .map((userRole) => userRole.name)
+        .filter((userRole) => roles.includes(userRole)).length > 0
+    );
+  }
+}

src/canvas/canvas-tag.controller.ts

@@ -13,14 +13,17 @@ import { CanvasTagService } from './canvas-tag.service';
 import { CanvasTagCreateOrUpdateDTO, CanvasTagDTO } from './canvas.interface';
 import { AuthenticatedGuard } from '../auth/guard/authenticated.guard';
 import { Uuid } from '../common/common.interface';
-import {ListFilter, PagedResult} from '../common/pageable.utils';
+import { ListFilter, PagedResult } from '../common/pageable.utils';
+import { Roles } from '../auth/decorator/roles.decorator';
+import { RolesGuard } from '../auth/guard/roles.guard';
 
 @Controller('/canvas-tag')
 export class CanvasTagController {
   constructor(private readonly canvasTagService: CanvasTagService) {}
 
   @Post()
-  @UseGuards(AuthenticatedGuard)
+  @Roles(['ADMIN'])
+  @UseGuards(AuthenticatedGuard, RolesGuard)
   public async create(
     @Body() dto: CanvasTagCreateOrUpdateDTO,
   ): Promise<CanvasTagDTO> {
@@ -47,7 +50,8 @@ export class CanvasTagController {
   }
 
   @Put('/:id')
-  @UseGuards(AuthenticatedGuard)
+  @Roles(['ADMIN'])
+  @UseGuards(AuthenticatedGuard, RolesGuard)
   public async update(
     @Param('id') id: Uuid,
     @Body() dto: CanvasTagCreateOrUpdateDTO,
@@ -59,7 +63,8 @@ export class CanvasTagController {
   }
 
   @Delete('/:id')
-  @UseGuards(AuthenticatedGuard)
+  @Roles(['ADMIN'])
+  @UseGuards(AuthenticatedGuard, RolesGuard)
   public async delete(@Param('id') id: Uuid) {
     await this.canvasTagService.delete({ id });
   }

src/canvas/canvas.interface.ts

@@ -41,12 +41,12 @@ export interface CancelAccessCommand {
 
 export interface CanvasAddTagCommand {
   canvasId: Uuid;
-  tagIds: [Uuid];
+  tagIds: Uuid[];
 }
 
 export interface CanvasRemoveTagCommand {
   canvasId: Uuid;
-  tagIds: [Uuid];
+  tagIds: Uuid[];
 }
 
 export class CanvasMetadataUpdateDTO {
@@ -121,5 +121,5 @@ export class CanvasModifyTagDTO {
   @IsUUID('all', { each: true })
   @IsNotEmpty({ each: true })
   @IsNotEmpty()
-  tagIds: [Uuid];
+  tagIds: Uuid[];
 }

src/canvas/guard/canvas.guard.ts

@@ -14,7 +14,13 @@ export class CanvasGuard implements CanActivate {
     const request = context.switchToHttp().getRequest();
 
     const canvasId = request.params.id;
-    const userId = request.user.toString();
+    if (!canvasId) {
+      return true;
+    }
+    const userId = request.user;
+    if (!userId) {
+      return false;
+    }
 
     const canvasAccess = await this.canvasAccessRepository.findOne({
       where: { canvas: { id: canvasId }, user: { id: userId } },