Skip to content
Snippets Groups Projects
Commit e4f4b4fa authored by OZGCloud's avatar OZGCloud
Browse files

OZG-2653 OrganisationseinheitIds nur aus user atributes auslesen

parent 3a841690
No related branches found
No related tags found
No related merge requests found
...@@ -3,17 +3,14 @@ package de.itvsh.kop.user; ...@@ -3,17 +3,14 @@ package de.itvsh.kop.user;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
import org.keycloak.admin.client.resource.UserResource; import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.representations.idm.ClientMappingsRepresentation; import org.keycloak.representations.idm.ClientMappingsRepresentation;
import org.keycloak.representations.idm.GroupRepresentation;
import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.RoleRepresentation;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mapping; import org.mapstruct.Mapping;
...@@ -45,21 +42,8 @@ public abstract class UserResourceMapper { ...@@ -45,21 +42,8 @@ public abstract class UserResourceMapper {
return createdAt != null ? new Date(createdAt) : new Date(); return createdAt != null ? new Date(createdAt) : new Date();
} }
Set<String> mapOrganisationsEinheitIds(UserResource userRes) { List<String> mapOrganisationsEinheitIds(UserResource userRes) {
var combinedOrganisationseinheitIds = new ArrayList<String>(); return getOrganisationsEinheitIdsFromUserAttributes(userRes);
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();
} }
private List<String> getOrganisationsEinheitIdsFromUserAttributes(UserResource userResource) { private List<String> getOrganisationsEinheitIdsFromUserAttributes(UserResource userResource) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment