[DSC-1118][CST-10501] Fixes AuthorizationRestRepositoryIT

4Science · Jun 21, 2023 · 3050cac · 3050cac
1 parent 14e636c
commit 3050cac
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/content/security/CrisSecurityServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/security/CrisSecurityServiceImpl.java
@@ -11,7 +11,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.UUID;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -183,25 +182,20 @@ private boolean hasAccessByGroup(Context context, EPerson user, List<String> gro
  }
 
  return groups.stream()
- .map(group -> findGroupOrSpecialGroups(context, group))
+ .map(group -> findGroupByNameOrUUID(context, group))
  .filter(group -> Objects.nonNull(group))
- .anyMatch(group -> userGroups.contains(group));
+ .anyMatch(group -> userGroups.contains(group) || isSpecialGroup(context, group));
  }
 
- private Group findGroupOrSpecialGroups(Context context, String group) {
- return Optional.ofNullable(findGroupByNameOrUUID(context, group))
- .or(() -> Optional.ofNullable(findInSpecialGroups(context, group)))
- .orElse(null);
+ private boolean isSpecialGroup(Context context, Group group) {
+ return findInSpecialGroups(context, group) != null;
  }
 
- private Group findInSpecialGroups(Context context, String group) {
+ private Group findInSpecialGroups(Context context, Group group) {
  try {
  return context.getSpecialGroups()
  .stream()
- .filter(specialGroup ->
- specialGroup.getName().equals(group) ||
- specialGroup.getID().toString().equals(group)
- )
+ .filter(specialGroup -> specialGroup != null && specialGroup.equals(group))
  .findFirst()
  .orElse(null);
  } catch (SQLException e) {