Merge branch 'master' into dependabot/npm_and_yarn/typescript-eslint/…

…eslint-plugin-8.1.0
SciCatProject · Aug 22, 2024 · 7790e53 · 7790e53
2 parents 04aca6f + 9a3d8d0
commit 7790e53
Show file tree

Hide file tree

Showing 29 changed files with 1,361 additions and 842 deletions.
diff --git a/src/casl/casl-ability.factory.ts b/src/casl/casl-ability.factory.ts
diff --git a/src/casl/decorators/check-policies.decorator.ts b/src/casl/decorators/check-policies.decorator.ts
@@ -3,5 +3,5 @@ import { PolicyHandler } from "../interfaces/policy-handler.interface";
 
 export const CHECK_POLICIES_KEY = "check_policy";
 
-export const CheckPolicies = (...handlers: PolicyHandler[]) =>
-  SetMetadata(CHECK_POLICIES_KEY, handlers);
+export const CheckPolicies = (endpoint: string, ...handlers: PolicyHandler[]) =>
+  SetMetadata(CHECK_POLICIES_KEY, { endpoint, handlers });
diff --git a/src/casl/guards/policies.guard.ts b/src/casl/guards/policies.guard.ts
@@ -12,22 +12,27 @@ export class PoliciesGuard implements CanActivate {
   ) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
-    const policyHandlers =
-      this.reflector.get<PolicyHandler[]>(
-        CHECK_POLICIES_KEY,
-        context.getHandler(),
-      ) || [];
+    const policyData = this.reflector.get<{
+      endpoint: string;
+      handlers: PolicyHandler[];
+    }>(CHECK_POLICIES_KEY, context.getHandler());
 
+    if (!policyData) {
+      return false;
+    }
+
+    const policyHandlers = policyData["handlers"];
+    const endpoint = policyData["endpoint"];
     const req = context.switchToHttp().getRequest();
     const user = req.user;
-    const ability = this.caslAbilityFactory.createForUser(user);
+
+    const ability = this.caslAbilityFactory.endpointAccess(endpoint, user);
     return policyHandlers.every((handler) =>
       this.execPolicyHandler(handler, ability),
     );
   }
 
   private execPolicyHandler(handler: PolicyHandler, ability: AppAbility) {
-    //console.log('PoliciesGuard:execPolicyHandler ', handler, ability)
     if (typeof handler === "function") {
       const res = handler(ability);
       //console.log("PoliciesGuard:execPolicyHandler ", res);

diff --git a/src/config/default-filters.config.json b/src/config/default-filters.config.json
@@ -0,0 +1,11 @@
+[
+  { "type": "LocationFilterComponent", "visible": true },
+  { "type": "PidFilterComponent", "visible": true },
+  { "type": "PidFilterContainsComponent", "visible": false },
+  { "type": "PidFilterStartsWithComponent", "visible": false },
+  { "type": "GroupFilterComponent", "visible": true },
+  { "type": "TypeFilterComponent", "visible": true },
+  { "type": "KeywordFilterComponent", "visible": true },
+  { "type": "DateRangeFilterComponent", "visible": true },
+  { "type": "TextFilterComponent", "visible": true }
+]