ais_auth_lib 1.0.6 → 1.0.8

package/dist/conditions.d.ts

@@ -1,4 +1,5 @@
 import { Condition } from "./interfaces/condition";
 import { ConditionGroup } from "./interfaces/condition-group";
-export declare function evaluateCondition(obj: any, condition: Condition): any;
-export declare function evaluateConditionGroup(obj: any, group: ConditionGroup): any;
+export declare function evaluateCondition(obj: any, condition: Condition): boolean;
+export declare function evaluateConditionGroup(obj: any, group: ConditionGroup): boolean;
+export declare const getPropertiesByPath: (object: any, path: string) => any[];

package/dist/conditions.js

@@ -1,17 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.evaluateConditionGroup = exports.evaluateCondition = void 0;
+exports.getPropertiesByPath = exports.evaluateConditionGroup = exports.evaluateCondition = void 0;
 function evaluateCondition(obj, condition) {
     const { attribute, value, operator } = condition;
+    console.log("attr", (0, exports.getPropertiesByPath)(obj, condition.attribute));
+    const attributeValues = (0, exports.getPropertiesByPath)(obj, condition.attribute);
     switch (operator) {
         case "Равно":
-            return obj[attribute] === value;
+            return attributeValues.some(attributeValue => attributeValue === value);
         case "Не равно":
-            return obj[attribute] !== value;
+            return attributeValues.some(attributeValue => attributeValue !== value);
         case "Содержит":
-            return obj[attribute].includes(value);
+            return attributeValues.some(attributeValue => attributeValue.includes(value));
         case "Не содержит":
-            return !obj[attribute].includes(value);
+            return attributeValues.some(attributeValue => !attributeValue.includes(value));
         default:
             return false;
     }
@@ -33,3 +35,27 @@ function evaluateConditionGroup(obj, group) {
     return result;
 }
 exports.evaluateConditionGroup = evaluateConditionGroup;
+const getPropertiesByPath = (object, path) => {
+    const properties = path.split('.');
+    let clone = object;
+    for (let i = 0; i < properties.length; i++) {
+        const property = properties[i];
+        if (clone) {
+            if (property === '*' && Array.isArray(clone)) {
+                const result = [];
+                for (const item of clone) {
+                    const values = (0, exports.getPropertiesByPath)(item, properties.slice(i + 1).join('.'));
+                    result.push(...values);
+                }
+                return result;
+            }
+            if (property in clone) {
+                clone = clone[property];
+                continue;
+            }
+        }
+        return [];
+    }
+    return [clone];
+};
+exports.getPropertiesByPath = getPropertiesByPath;

package/dist/filter.js

@@ -24,7 +24,7 @@ function checkResourceMatchWithRules(obj, rules) {
             }
         }
         if (ruleResult) {
-            actions.add(rule.action);
+            rule.actions.forEach(action => actions.add(action));
         }
         overallResult = overallResult || ruleResult;
     }

package/dist/interfaces/rule.d.ts

@@ -4,7 +4,7 @@ export interface Rule {
     resource: string;
     appName: string;
     name: string;
-    action: string;
+    actions: string[];
     description: string;
     conditionGroups: ConditionGroup[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ais_auth_lib",
-    "version": "1.0.6",
+    "version": "1.0.8",
     "description": "auth lib for microservices",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",