fix linting

SciCatProject · Aug 26, 2024 · 303c146 · 303c146
1 parent 9fe14c3
commit 303c146
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 38 deletions.
diff --git a/src/casl/action.enum.ts b/src/casl/action.enum.ts
@@ -211,4 +211,4 @@ export enum Action {
   InstrumentUpdate = "instrument_update",
   InstrumentCreate = "instrument_create",
   InstrumentDelete = "instrument_delete",
-}
+}
diff --git a/src/casl/casl-ability.factory.ts b/src/casl/casl-ability.factory.ts
@@ -348,7 +348,7 @@ export class CaslAbilityFactory {
     const { can, cannot, build } = new AbilityBuilder(
       createMongoAbility<PossibleAbilities, Conditions>,
     );
-   
+
     if (!user) {
       /**
        * unauthenticated users
@@ -390,7 +390,6 @@ export class CaslAbilityFactory {
         can(Action.JobCreate, JobClass);
         can(Action.JobStatusUpdate, JobClass);
         cannot(Action.JobDelete, JobClass);
-
       } else if (
         user.currentGroups.some((g) =>
           configuration().deleteJobGroups.includes(g),
@@ -447,7 +446,6 @@ export class CaslAbilityFactory {
           )
         ) {
           can(Action.JobStatusUpdate, JobClass);
-
         } else {
           if (
             configuration().jobConfiguration.some(
@@ -1360,28 +1358,28 @@ export class CaslAbilityFactory {
     });
   }
 
-  jobsInstanceAccess(user: JWTUser, jobConfiguration: JobConfig ) {
+  jobsInstanceAccess(user: JWTUser, jobConfiguration: JobConfig) {
     const { can, build } = new AbilityBuilder(
       createMongoAbility<PossibleAbilities, Conditions>,
     );
-  
+
     if (!user) {
       /**
        * unauthenticated users
        */
-      if (jobConfiguration.create.auth === CreateJobAuth.All){
+      if (jobConfiguration.create.auth === CreateJobAuth.All) {
         can(Action.JobCreateConfiguration, JobClass);
-      };
-      if (jobConfiguration.create.auth === CreateJobAuth.DatasetPublic){
+      }
+      if (jobConfiguration.create.auth === CreateJobAuth.DatasetPublic) {
         can(Action.JobCreateConfiguration, JobClass, {
           datasetsValidation: true,
         });
-      };
-      if (jobConfiguration.statusUpdate.auth === StatusUpdateJobAuth.All){
+      }
+      if (jobConfiguration.statusUpdate.auth === StatusUpdateJobAuth.All) {
         can(Action.JobStatusUpdateConfiguration, JobClass, {
           ownerGroup: undefined,
         });
-      };
+      }
     } else {
       /**
        * authenticated users
@@ -1436,13 +1434,21 @@ export class CaslAbilityFactory {
             ownerGroup: { $in: user.currentGroups },
             ownerUser: user.username,
           });
-          if (jobCreateInstanceAuthorizationValues.some((a) => jobConfiguration.create.auth === a)){
+          if (
+            jobCreateInstanceAuthorizationValues.some(
+              (a) => jobConfiguration.create.auth === a,
+            )
+          ) {
             can(Action.JobCreateConfiguration, JobClass);
-          };
-          if (jobCreateDatasetAuthorizationValues.some((a) => jobConfiguration.create.auth === a)){
+          }
+          if (
+            jobCreateDatasetAuthorizationValues.some(
+              (a) => jobConfiguration.create.auth === a,
+            )
+          ) {
             can(Action.JobCreateConfiguration, JobClass, {
-                datasetsValidation: true,
-              });
+              datasetsValidation: true,
+            });
           }
         }
         const jobUpdateInstanceAuthorizationValues = [
@@ -1457,29 +1463,37 @@ export class CaslAbilityFactory {
             configuration().statusUpdateJobGroups.includes(g),
           )
         ) {
-          if (jobUpdateInstanceAuthorizationValues.some((a) => jobConfiguration.statusUpdate.auth === a)){
+          if (
+            jobUpdateInstanceAuthorizationValues.some(
+              (a) => jobConfiguration.statusUpdate.auth === a,
+            )
+          ) {
             can(Action.JobStatusUpdateConfiguration, JobClass);
-          };
+          }
           can(Action.JobStatusUpdateOwner, JobClass, {
             ownerUser: user.username,
           });
           can(Action.JobStatusUpdateOwner, JobClass, {
             ownerGroup: { $in: user.currentGroups },
           });
         } else {
-          if (jobUpdateInstanceAuthorizationValues.some((a) => jobConfiguration.statusUpdate.auth === a)){
+          if (
+            jobUpdateInstanceAuthorizationValues.some(
+              (a) => jobConfiguration.statusUpdate.auth === a,
+            )
+          ) {
             can(Action.JobStatusUpdateConfiguration, JobClass);
-          };
-          if (jobConfiguration.statusUpdate.auth ===  "#jobOwnerUser"){
+          }
+          if (jobConfiguration.statusUpdate.auth === "#jobOwnerUser") {
             can(Action.JobStatusUpdateConfiguration, JobClass, {
               ownerUser: user.username,
             });
           }
-          if (jobConfiguration.statusUpdate.auth ===  "#jobOwnerGroup"){
+          if (jobConfiguration.statusUpdate.auth === "#jobOwnerGroup") {
             can(Action.JobStatusUpdateConfiguration, JobClass, {
               ownerGroup: { $in: user.currentGroups },
             });
-          };
+          }
         }
       }
     }
@@ -1766,4 +1780,4 @@ export class CaslAbilityFactory {
         item.constructor as ExtractSubjectType<Subjects>,
     });
   }
-}
+}
diff --git a/src/jobs/config/jobconfig.ts b/src/jobs/config/jobconfig.ts
@@ -49,7 +49,7 @@ export class JobConfig {
    * @param data JSON
    * @returns
    */
-  
+
   static parse(
     jobData: Record<string, unknown>,
     configVersion: string,
@@ -81,7 +81,6 @@ export class JobConfig {
   }
 }
 
-
 /**
  * Encapsulates all information for a particular job operation (eg "create", "statusUpdate")
  */

diff --git a/src/jobs/jobs.controller.ts b/src/jobs/jobs.controller.ts
@@ -48,7 +48,6 @@ import {
 } from "src/common/utils";
 import { JobCreateInterceptor } from "./interceptors/job-create.interceptor";
 import { JobAction } from "./config/jobconfig";
-import { ConnectableObservable } from "rxjs";
 
 @ApiBearerAuth()
 @ApiTags("jobs")
@@ -519,7 +518,10 @@ export class JobsController {
     }
 
     // instantiate the casl matrix for the user
-    const ability = this.caslAbilityFactory.jobsInstanceAccess(user,jobConfiguration);
+    const ability = this.caslAbilityFactory.jobsInstanceAccess(
+      user,
+      jobConfiguration,
+    );
     // check if the user can create this job
     const canCreate =
       ability.can(Action.JobCreateAny, JobClass) ||
@@ -587,7 +589,7 @@ export class JobsController {
    * Create job
    */
   @UseGuards(PoliciesGuard)
-  @CheckPolicies("jobs",(ability: AppAbility) =>
+  @CheckPolicies("jobs", (ability: AppAbility) =>
     ability.can(Action.JobCreate, JobClass),
   )
   // @UseInterceptors(JobCreateInterceptor)
@@ -641,7 +643,7 @@ export class JobsController {
    * Update job status
    */
   @UseGuards(PoliciesGuard)
-  @CheckPolicies("jobs",(ability: AppAbility) =>
+  @CheckPolicies("jobs", (ability: AppAbility) =>
     ability.can(Action.JobStatusUpdate, JobClass),
   )
   @Patch(":id")
@@ -708,7 +710,9 @@ export class JobsController {
    * Get job by id
    */
   @UseGuards(PoliciesGuard)
-  @CheckPolicies("jobs",(ability: AppAbility) => ability.can(Action.JobRead, JobClass))
+  @CheckPolicies("jobs", (ability: AppAbility) =>
+    ability.can(Action.JobRead, JobClass),
+  )
   @Get(":id")
   @ApiOperation({
     summary: "It returns the requested job.",
@@ -797,7 +801,9 @@ export class JobsController {
       const jobsAccessible: JobClass[] = [];
 
       for (const i in jobsFound) {
-        const jobConfiguration = this.getJobTypeConfiguration(jobsFound[i].type);
+        const jobConfiguration = this.getJobTypeConfiguration(
+          jobsFound[i].type,
+        );
         const ability = this.caslAbilityFactory.jobsInstanceAccess(
           request.user as JWTUser,
           jobConfiguration,
@@ -829,9 +835,8 @@ export class JobsController {
    * Delete a job
    */
   @UseGuards(PoliciesGuard)
-  @CheckPolicies("jobs",
-    (ability: AppAbility) =>
-      ability.can(Action.JobDelete, JobClass),
+  @CheckPolicies("jobs", (ability: AppAbility) =>
+    ability.can(Action.JobDelete, JobClass),
   )
   @Delete(":id")
   @ApiOperation({

diff --git a/src/proposals/proposals.controller.ts b/src/proposals/proposals.controller.ts
@@ -33,7 +33,6 @@ import {
   ApiTags,
 } from "@nestjs/swagger";
 import { PoliciesGuard } from "src/casl/guards/policies.guard";
-import { AuthenticatedPoliciesGuard } from "../casl/guards/auth-check.guard";
 import { CheckPolicies } from "src/casl/decorators/check-policies.decorator";
 import { AppAbility, CaslAbilityFactory } from "src/casl/casl-ability.factory";
 import { Action } from "src/casl/action.enum";

diff --git a/src/users/users.controller.ts b/src/users/users.controller.ts
@@ -68,7 +68,8 @@ export class UsersController {
     viewedUserSchema._id = viewedUserId;
     viewedUserSchema.id = viewedUserId;
 
-    const ability = this.caslAbilityFactory.userEndpointAccess(authenticatedUser);
+    const ability =
+      this.caslAbilityFactory.userEndpointAccess(authenticatedUser);
     // const authorized = actions.map( action =>
     //   ability.can(action, viewedUserSchema)
     // ) as Array<Boolean>;