Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Commit

Permalink
Update Keycloak and CWA-Parent (#272)
Browse files Browse the repository at this point in the history
* Manually set KC Lib to 20.0.1

* Add fix for new Keycloud-Group-Search

* Update DGC-Lib

* Fix Keycloak Admin Dependency
  • Loading branch information
f11h authored Feb 15, 2023
1 parent 237b8ab commit 84edea9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>app.coronawarn</groupId>
<artifactId>cwa-parent</artifactId>
<version>1.7.1</version>
<version>1.8</version>
</parent>
<artifactId>cwa-quick-test-backend</artifactId>
<version>1.0.0-SNAPSHOT</version>
Expand Down Expand Up @@ -75,13 +75,13 @@
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
</dependency>

<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,15 @@ public Optional<GroupRepresentation> getGroup(String name) {
return realm().groups().groups(name, 0, Integer.MAX_VALUE)
.stream()
.filter(group -> group.getPath().equals(path))
.findFirst();
.findFirst()
/*
The following call is required because found Search Result will
not return whole Sub-Group Structure
https://github.com/keycloak/keycloak/pull/8134
https://github.com/keycloak/keycloak/pull/11778
*/
.map(group -> realm().groups().group(group.getId()).toRepresentation());
}

/**
Expand Down

0 comments on commit 84edea9

Please sign in to comment.