Merge remote-tracking branch 'upstream/master'

services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java

@@ -135,14 +135,10 @@ public class UsersResource {
                                              @QueryParam("username") String username) {
         RealmManager manager = new RealmManager(session);
         List<UserRepresentation> results = new ArrayList<UserRepresentation>();
+        List<UserModel> userModels;
         if (search != null) {
-            List<UserModel> userModels = manager.searchUsers(search, realm);
-            for (UserModel user : userModels) {
-                if (isUser(user)) {
-                    results.add(manager.toRepresentation(user));
-                }
-            }
-        } else {
+            userModels = manager.searchUsers(search, realm);
+        } else if (last != null || first != null || email != null || username != null) {
             Map<String, String> attributes = new HashMap<String, String>();
             if (last != null) {
                 attributes.put(UserModel.LAST_NAME, last);
@@ -156,11 +152,18 @@ public class UsersResource {
             if (username != null) {
                 attributes.put(UserModel.LOGIN_NAME, username);
             }
-            List<UserModel> userModels = realm.searchForUserByAttributes(attributes);
+            userModels = realm.searchForUserByAttributes(attributes);
             for (UserModel user : userModels) {
                 results.add(manager.toRepresentation(user));
             }
+        } else {
+            userModels = realm.getUsers();
+        }
 
+        for (UserModel user : userModels) {
+            if (isUser(user)) {
+                results.add(manager.toRepresentation(user));
+            }
         }
         return results;
     }

services/src/test/java/org/keycloak/test/AdapterTest.java

@@ -303,7 +303,6 @@ public class AdapterTest extends AbstractKeycloakTest {
         }
 
         RealmManager adapter = getRealmManager();
-        adapter.createRealm("other").addUser("bburke");
 
         {
             List<UserModel> userModels = adapter.searchUsers("total junk query", realmModel);
@@ -438,8 +437,11 @@ public class AdapterTest extends AbstractKeycloakTest {
             }
         }
 
+        RealmModel otherRealm = adapter.createRealm("other");
+        otherRealm.addUser("bburke");
 
-
+        Assert.assertEquals(1, otherRealm.getUsers().size());
+        Assert.assertEquals(1, otherRealm.searchForUser("u").size());
     }