From e4f4b4fa0041f4815fb1c906a9f17f199a9ba1e0 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 29 Aug 2022 14:14:11 +0200
Subject: [PATCH] OZG-2653 OrganisationseinheitIds nur aus user atributes
auslesen
---
.../de/itvsh/kop/user/UserResourceMapper.java | 20 ++-----------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/main/java/de/itvsh/kop/user/UserResourceMapper.java b/src/main/java/de/itvsh/kop/user/UserResourceMapper.java
index 17959edf..82f9c22b 100644
--- a/src/main/java/de/itvsh/kop/user/UserResourceMapper.java
+++ b/src/main/java/de/itvsh/kop/user/UserResourceMapper.java
@@ -3,17 +3,14 @@ package de.itvsh.kop.user;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
-import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
-import java.util.Set;
import javax.inject.Inject;
import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.representations.idm.ClientMappingsRepresentation;
-import org.keycloak.representations.idm.GroupRepresentation;
import org.keycloak.representations.idm.RoleRepresentation;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@@ -45,21 +42,8 @@ public abstract class UserResourceMapper {
return createdAt != null ? new Date(createdAt) : new Date();
}
- Set<String> mapOrganisationsEinheitIds(UserResource userRes) {
- var combinedOrganisationseinheitIds = new ArrayList<String>();
- combinedOrganisationseinheitIds.addAll(getOrganisationsEinheitIdsFromGroups(userRes));
- combinedOrganisationseinheitIds.addAll(getOrganisationsEinheitIdsFromUserAttributes(userRes));
- return new HashSet<>(combinedOrganisationseinheitIds);
- }
-
- private List<String> getOrganisationsEinheitIdsFromGroups(UserResource userResource) {
- return userResource.groups().stream()
- .map(GroupRepresentation::getAttributes)
- .filter(Objects::nonNull)
- .map(attributeMap -> attributeMap.get(properties.organisationsEinheitIdKey()))
- .filter(Objects::nonNull)
- .map(attributeValues -> attributeValues.get(0))
- .toList();
+ List<String> mapOrganisationsEinheitIds(UserResource userRes) {
+ return getOrganisationsEinheitIdsFromUserAttributes(userRes);
}
private List<String> getOrganisationsEinheitIdsFromUserAttributes(UserResource userResource) {
--
GitLab