From 012c9de471e18a17481d3fe8826e7c2b02680250 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Wed, 8 May 2024 13:51:12 +0200 Subject: [PATCH] Provided named key components to reduceInactiveValueSets method to avoid removal not related permissions --- .../vitro/webapp/auth/policy/EntityPolicyController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/EntityPolicyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/EntityPolicyController.java index 4bf7212e03..a37191204f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/EntityPolicyController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/EntityPolicyController.java @@ -65,7 +65,7 @@ public static void revokeAccess(String entityUri, AccessObjectType aot, AccessOp getLoader().updateAccessControlModel(toRemove, false); } } else { - reduceInactiveValueSet(entityUri, aot, ao, role); + reduceInactiveValueSet(entityUri, aot, ao, role, namedKeyComponents); } } @@ -74,9 +74,9 @@ private static PolicyLoader getLoader() { } private static void reduceInactiveValueSet(String entityUri, AccessObjectType aot, AccessOperation ao, - String role) { + String role, String... namedKeyComponents) { StringBuilder removals = new StringBuilder(); - getDataValueStatements(entityUri, aot, ao, Collections.singleton(role), removals); + getDataValueStatements(entityUri, aot, ao, Collections.singleton(role), removals, namedKeyComponents); getLoader().updateAccessControlModel(removals.toString(), false); }