fix: extend acs-client to validate multiple matching entities and ins…

…tances for a given subject

filter_ownership.aql

@@ -2,10 +2,11 @@ let meta = node.meta
 let owner = meta.owners
 let found = (
     for o in owner
-    filter o.id == "urn:restorecommerce:acs:names:ownerIndicatoryEntity" && o.value == @entity
-    let nestedAttributes = o.attributes
-    for ownerInst in nestedAttributes
-      filter ownerInst.id == "urn:restorecommerce:acs:names:ownerInstance" && ownerInst.value in @instance    
-    return true
+    for arg in @customArguments
+      filter o.id == "urn:restorecommerce:acs:names:ownerIndicatoryEntity" && o.value == arg.entity
+      let nestedAttributes = o.attributes
+      for ownerInst in nestedAttributes
+        filter ownerInst.id == "urn:restorecommerce:acs:names:ownerInstance" && ownerInst.value in arg.instance    
+      return true
 )
 filter true in found

filter_role_association.aql

@@ -5,10 +5,11 @@ let foundAssoc = (
         let attributes = roleAssoc.attributes
         let inAttributes = (
             for a in attributes
-                filter a.id == "urn:restorecommerce:acs:names:roleScopingEntity" && a.value == @scopingEntity
+              for arg in @customArguments
+                filter a.id == "urn:restorecommerce:acs:names:roleScopingEntity" && a.value == arg.scopingEntity
                 let nestedAttributes = a.attributes
                 for scopInst in nestedAttributes
-                    filter scopInst.id == "urn:restorecommerce:acs:names:roleScopingInstance" && scopInst.value in @scopingInstances
+                    filter scopInst.id == "urn:restorecommerce:acs:names:roleScopingInstance" && scopInst.value in arg.scopingInstances
                 limit 1
                 return true
         )