The Unified and Autonomous Development Platform
chore: Improve Entra Id authenticator to handle groups better
Robin Shencb52875967e0
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.javaindex 5b4864424c..dc1d9db9e9 100644--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.java+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.java@@ -126,10 +126,15 @@ public class EntraIdConnector extends OpenIdConnector {var groupName = groupInfo.getAsString("displayName");groupNames.put(groupId, groupName);}- return groups.stream()- .map(groupNames::get)- .filter(Objects::nonNull)- .collect(toList());+ var convertedGroups = new ArrayList<String>();+ for (var group: groups) {+ var convertedGroup = groupNames.get(group);+ if (convertedGroup != null)+ convertedGroups.add(convertedGroup);+ else+ convertedGroups.add(group);+ }+ return convertedGroups;} else {List<String> details = new ArrayList<>();var body = httpResponse.getBody();