Ensure groups logic works with Keycloak 20+ (#11)

The 'getGroups()' method was removed in Keycloak 20 and replaced with 'getGroupsStream()'
instipod · Apr 3, 2023 · cfc3a88 · cfc3a88
1 parent 4a44d22
commit cfc3a88
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <keycloak.version>18.0.0</keycloak.version>
+        <keycloak.version>21.0.1</keycloak.version>
     </properties>
 
     <dependencies>
@@ -111,4 +111,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/src/main/java/com/instipod/duouniversal/DuoUniversalAuthenticator.java b/src/main/java/com/instipod/duouniversal/DuoUniversalAuthenticator.java
@@ -148,7 +148,7 @@ public void authenticate(AuthenticationFlowContext authenticationFlowContext) {
         }
         String username = user.getUsername();
         if (!duoRequired(duoGroups, user)) {
-            String userGroupsStr = user.getGroups().stream().map(GroupModel::getName).collect(Collectors.joining(","));
+            String userGroupsStr = user.getGroupsStream().map(GroupModel::getName).collect(Collectors.joining(","));
             logger.infof("Skipping Duo MFA for %s based on group membership, groups=%s", username, userGroupsStr);
             authenticationFlowContext.success();
             return;
@@ -258,8 +258,9 @@ private boolean duoRequired(String duoGroups, UserModel user) {
         if (duoGroups == "none") return true;
         if (duoGroups != null && duoGroups.isEmpty()) return true;
         List<String> groups = Arrays.asList(duoGroups.split(","));
-        for (GroupModel group : user.getGroups()) {
-            if (groups.contains(group.getName())) {
+        List<String> groupNames = user.getGroupsStream().map(GroupModel::getName).collect(Collectors.toList());
+        for (String group : groupNames) {
+            if (groups.contains(group)) {
                 return true;
             }
         }