keycloak-uncached

Merge pull request #2757 from stianst/KEYCLOAK-2924-1.9 KEYCLOAK-2924:

4/28/2016 5:18:09 AM

Details

diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
index 169eef7..dc51cdc 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
@@ -960,7 +960,10 @@ public class UsersResource {
         }
 
         try {
-            if (user.isMemberOf(group)) user.leaveGroup(group);
+            if (user.isMemberOf(group)){
+                user.leaveGroup(group);
+                adminEvent.operation(OperationType.DELETE).resourcePath(uriInfo).success();
+            }
         } catch (ModelException me) {
             Properties messages = AdminRoot.getMessages(session, realm, auth.getAuth().getToken().getLocale());
             throw new ErrorResponseException(me.getMessage(), MessageFormat.format(messages.getProperty(me.getMessage(), me.getMessage()), me.getParameters()),
@@ -982,7 +985,10 @@ public class UsersResource {
         if (group == null) {
             throw new NotFoundException("Group not found");
         }
-        if (!user.isMemberOf(group)) user.joinGroup(group);
+        if (!user.isMemberOf(group)){
+            user.joinGroup(group);
+            adminEvent.operation(OperationType.CREATE).resourcePath(uriInfo).success();
+        }
     }