Skip to content
Snippets Groups Projects

feat+refactor: filtering of assigned resource groups in entitlements, filtering of groups in access control filter, refactor PerunRPC Adapter

Merged Ghost User requested to merge dBucik/resource_tags_entitlements_groupcheck into main
5 files
+ 45
30
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -62,12 +62,12 @@ public class PerunAdapterImpl extends PerunAdapter {
}
@Override
public boolean canUserAccessBasedOnMembership(Facility facility, Long userId) {
public boolean canUserAccessBasedOnMembership(Facility facility, Long userId, String accessControlDisabledAttr) {
try {
return this.getAdapterPrimary().canUserAccessBasedOnMembership(facility, userId);
return this.getAdapterPrimary().canUserAccessBasedOnMembership(facility, userId, accessControlDisabledAttr);
} catch (UnsupportedOperationException e) {
if (this.isCallFallback()) {
return this.getAdapterFallback().canUserAccessBasedOnMembership(facility, userId);
return this.getAdapterFallback().canUserAccessBasedOnMembership(facility, userId, accessControlDisabledAttr);
} else {
throw e;
}
Loading