Adjust changes to fit current coding

cloudfoundry · Jul 26, 2017 · 9d60fb5 · 9d60fb5
1 parent ec8a84f
commit 9d60fb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrap.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrap.java
@@ -52,6 +52,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static java.util.Collections.emptyList;
@@ -254,7 +255,7 @@ public void onApplicationEvent(AuthEvent event) {
             String origin = exEvent.getUser().getOrigin();
             if (!OriginKeys.UAA.equals(origin)) {
                 Set<ScimGroup> groupsWithMember = membershipManager.getGroupsWithExternalMember(exEvent.getUser().getId(), origin);
-                Map<String, String> groupsMap = groupsWithMember.stream().collect(Collectors.toMap(ScimGroup::getDisplayName, ScimGroup::getId));
+                Map<String, ScimGroup> groupsMap = groupsWithMember.stream().collect(Collectors.toMap(ScimGroup::getDisplayName, Function.identity()));
                 Collection<? extends GrantedAuthority> externalAuthorities = exEvent.getExternalAuthorities();
                 for (GrantedAuthority authority : externalAuthorities) {
                     if (groupsMap.containsKey(authority.getAuthority())) {
@@ -263,8 +264,8 @@ public void onApplicationEvent(AuthEvent event) {
                         addToGroup(exEvent.getUser().getId(), authority.getAuthority(), origin, exEvent.isAddGroups());
                     }
                 }
-                for (String groupId : groupsMap.values()) {
-                    membershipManager.removeMemberById(groupId, exEvent.getUser().getId());
+                for (ScimGroup group : groupsMap.values()) {
+                    membershipManager.removeMemberById(group.getId(), exEvent.getUser().getId(), group.getZoneId());
                 }
             }
             //update the user itself

diff --git a/...src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupMembershipManager.java b/...src/main/java/org/cloudfoundry/identity/uaa/scim/jdbc/JdbcScimGroupMembershipManager.java
@@ -514,6 +514,8 @@ private List<ScimGroupMember.Role> getAuthorities(String authorities) {
     @Override
     public void deleteMembersByOrigin(String origin, String zoneId) throws ScimResourceNotFoundException {
         jdbcTemplate.update(DELETE_MEMBERS_WITH_ORIGIN_GROUP_SQL, origin, zoneId);
+    }
+
     private static final class ScimGroupRowMapper implements RowMapper<ScimGroup> {
 
         @Override