From 733597a4731dc840520672f344f55a290237e988 Mon Sep 17 00:00:00 2001 From: Dominik Frantisek Bucik Date: Mon, 11 Apr 2022 12:13:10 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Added=20missing=20return?= =?UTF-8?q?=20values=20when=20RPC=20disabled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/adapters/impl/PerunAdapterRpc.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/adapters/impl/PerunAdapterRpc.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/adapters/impl/PerunAdapterRpc.java index 1f30ff160..5d3eb5805 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/adapters/impl/PerunAdapterRpc.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/adapters/impl/PerunAdapterRpc.java @@ -851,7 +851,11 @@ public class PerunAdapterRpc extends PerunAdapterWithMappingServices implements @Override public boolean isValidMemberInGroupsAndVos(Long userId, Set mandatoryVos, Set mandatoryGroups, - Set envVos, Set envGroups) { + Set envVos, Set envGroups) + { + if (!this.connectorRpc.isEnabled()) { + return false; + } List members = getMembersByUser(userId); Set foundVoIds = new HashSet<>(); Set foundGroupIds = new HashSet<>(); @@ -869,7 +873,11 @@ public class PerunAdapterRpc extends PerunAdapterWithMappingServices implements } @Override - public boolean isValidMemberInGroupsAndVos(Long userId, Set vos, Set groups) { + public boolean isValidMemberInGroupsAndVos(Long userId, Set vos, Set groups) + { + if (!this.connectorRpc.isEnabled()) { + return false; + } List members = getMembersByUser(userId); Set foundVoIds = new HashSet<>(); Set foundGroupIds = new HashSet<>(); @@ -889,6 +897,9 @@ public class PerunAdapterRpc extends PerunAdapterWithMappingServices implements @Override public boolean isUserInVo(Long userId, String voShortName) { + if (!this.connectorRpc.isEnabled()) { + return false; + } if (userId == null) { throw new IllegalArgumentException("No userId"); } else if (!StringUtils.hasText(voShortName)) {