Merge pull request #185 from Pixilib/read-all-label-for-content-permi…

…ssion

Read all label for content permission

GaelO-Flow/src/autorouting/autorouting.handler.ts

@@ -145,7 +145,7 @@ export class AutoroutingHandler {
         break;
       case DestinationType.TMTVJOB:
         if (level !== LevelType.STUDIES) {
-          console.error('TMTVJob can only be sent to series');
+          console.error('TMTV Jobs can only be sent to series');
           return;
         }
 
@@ -175,7 +175,7 @@ export class AutoroutingHandler {
 
         const jobId = await this.processingQueueService.addJob(null, {
           JobType: ProcessingJobType.TMTV,
-          TmtvJob: {
+          Payload: {
             PtOrthancSeriesId: ptSeriesID,
             CtOrthancSeriesId: ctSeriesID,
             SendMaskToOrthancAs: [ProcessingMask.RTSS, ProcessingMask.SEG],

GaelO-Flow/src/labels/labels.controller.spec.ts

@@ -2,6 +2,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { LabelsService } from './labels.service';
 import { LabelsController } from './labels.controller';
 import { LabelDto } from './labels.dto';
+import { AdminGuard, ReadAllGuard } from '../guards/roles.guard';
 
 describe('LabelsController', () => {
   let labelsController: LabelsController;
@@ -31,15 +32,17 @@ describe('LabelsController', () => {
   });
 
   describe('findAll', () => {
-    it('check if findAll has adminGuard', async () => {
+    it('check if findAll labels has OrGuard admin or Readall', async () => {
+
       const guards = Reflect.getMetadata(
         '__guards__',
         LabelsController.prototype.findAll,
       );
-      const guardNames = guards.map((guard: any) => guard.name);
 
-      expect(guardNames.length).toBe(1);
-      expect(guardNames).toContain('AdminGuard');
+      const orGuards = new guards[0]().__getGuards();
+      expect(orGuards.length).toBe(2);
+      expect(orGuards[0]).toBe(AdminGuard);
+      expect(orGuards[1]).toBe(ReadAllGuard);
     });
 
     it('checks if findAll of the controller calls findAll of the service', async () => {

GaelO-Flow/src/labels/labels.controller.ts

@@ -11,8 +11,9 @@ import {
 import { ApiBearerAuth, ApiResponse, ApiTags } from '@nestjs/swagger';
 
 import { LabelsService } from './labels.service';
-import { AdminGuard } from '../guards/roles.guard';
+import { AdminGuard, ReadAllGuard } from '../guards/roles.guard';
 import { LabelDto } from './labels.dto';
+import { OrGuard } from '../guards/or.guard';
 
 /**
  * Controller for the labels related APIs.
@@ -25,7 +26,7 @@ export class LabelsController {
   @ApiBearerAuth('access-token')
   @ApiResponse({ status: 200, description: 'Get all labels', type: [String] })
   @ApiResponse({ status: 401, description: 'Unauthorized' })
-  @UseGuards(AdminGuard)
+  @UseGuards(OrGuard([AdminGuard, ReadAllGuard]))
   @Get()
   async findAll(): Promise<string[]> {
     const allLabels = await this.LabelsService.findAll();

GaelO-Flow/src/processing/processing-job.dto.ts

@@ -27,5 +27,5 @@ export class ProcessingJobDto {
 
   @ApiProperty({ required: false })
   @IsObject()
-  TmtvJob: TmtvJobDto;
+  Payload: TmtvJobDto;
 }

GaelO-Flow/src/processing/processing.controller.spec.ts

@@ -219,7 +219,7 @@ describe('ProcessingController', () => {
       const request = { user: { userId: 1 } };
       const processingJobDto: ProcessingJobDto = {
         JobType: ProcessingJobType.TMTV,
-        TmtvJob: {
+        Payload: {
           CtOrthancSeriesId: 'CtOrthancSeriesId',
           PtOrthancSeriesId: 'PtOrthancSeriesId',
           SendMaskToOrthancAs: [ProcessingMask.SEG],

GaelO-Flow/src/processing/processing.worker.ts

@@ -18,7 +18,7 @@ async function tmtvJob(
   orthancClient: OrthancClient,
   processingClient: ProcessingClient,
 ) {
-  const jobData: TmtvJobDto = job.data.TmtvJob;
+  const jobData: TmtvJobDto = job.data.Payload;
 
   const tmtvService = new TmtvService(orthancClient, processingClient);
   const ctOrthancSeriesId: string = jobData.CtOrthancSeriesId;

GaelO-Flow/test/label.e2e-spec.ts

@@ -3,7 +3,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import * as request from 'supertest';
 
 import { AppModule } from '../src/app.module';
-import { loginAsAdmin, loginAsUser } from './login';
+import { createCustomJwt, loginAsAdmin, loginAsUser } from './login';
 
 describe('Labels (e2e)', () => {
   let app: INestApplication;
@@ -89,9 +89,19 @@ describe('Labels (e2e)', () => {
     });
 
     it('/labels (GET)', async () => {
+      const readAllToken = await createCustomJwt(app, { ReadAll: true });
       const response = await request(server)
         .get('/labels')
-        .set('Authorization', `Bearer ${userToken}`);
+        .set('Authorization', `Bearer ${readAllToken}`);
+
+      expect(response.status).toBe(200);
+    });
+
+    it('/labels (GET)', async () => {
+      const importToken = await createCustomJwt(app, { Import: true });
+      const response = await request(server)
+        .get('/labels')
+        .set('Authorization', `Bearer ${importToken}`);
 
       expect(response.status).toBe(403);
     });

GaelO-Flow/test/processing.e2e-spec.ts

@@ -79,7 +79,7 @@ describe('Processing (e2e)', () => {
         .set('Authorization', `Bearer ${adminToken}`)
         .send({
           JobType: 'tmtv',
-          TmtvJob: {
+          Payload: {
             CtOrthancSeriesId: '123',
             PtOrthancSeriesId: '456',
             SendMaskToOrthancAs: ['MASK'],
@@ -136,7 +136,7 @@ describe('Processing (e2e)', () => {
         .set('Authorization', `Bearer ${token}`)
         .send({
           JobType: 'tmtv',
-          TmtvJob: {
+          Payload: {
             CtOrthancSeriesId: '123',
             PtOrthancSeriesId: '456',
             SendMaskToOrthancAs: ['MASK'],