Ensure user loginName and email unique within realm

model/tests/src/test/java/org/keycloak/model/test/AbstractModelTest.java

@@ -99,6 +99,10 @@ public class AbstractModelTest {
         } else {
             identitySession.getTransaction().commit();
         }
+        resetSession();
+    }
+
+    protected void resetSession() {
         identitySession.close();
         identitySession = factory.createSession();
         identitySession.getTransaction().begin();

model/tests/src/test/java/org/keycloak/model/test/AdapterTest.java

@@ -267,7 +267,7 @@ public class AdapterTest extends AbstractModelTest {
             UserModel user3 = realmModel.addUser("doublelast");
             user3.setFirstName("Ole");
             user3.setLastName("Alver Veland");
-            user3.setEmail("knut@redhat.com");
+            user3.setEmail("knut2@redhat.com");
         }
 
         RealmManager adapter = realmManager;
@@ -531,9 +531,7 @@ public class AdapterTest extends AbstractModelTest {
         } catch (ModelDuplicateException e) {
         }
 
-        identitySession.close();
-        identitySession = factory.createSession();
-        identitySession.getTransaction().begin();
+        resetSession();
     }
 
     @Test
@@ -562,9 +560,7 @@ public class AdapterTest extends AbstractModelTest {
         } catch (ModelDuplicateException e) {
         }
 
-        identitySession.close();
-        identitySession = factory.createSession();
-        identitySession.getTransaction().begin();
+        resetSession();
     }
 
     @Test
@@ -593,9 +589,64 @@ public class AdapterTest extends AbstractModelTest {
         } catch (ModelDuplicateException e) {
         }
 
-        identitySession.close();
-        identitySession = factory.createSession();
-        identitySession.getTransaction().begin();
+        resetSession();
+    }
+
+    @Test
+    public void testUsernameCollisions() throws Exception {
+        realmManager.createRealm("JUGGLER1").addUser("user1");
+        realmManager.createRealm("JUGGLER2").addUser("user1");
+        commit();
+
+        // Try to create user with duplicate login name
+        try {
+            realmManager.getRealmByName("JUGGLER1").addUser("user1");
+            commit();
+            Assert.fail("Expected exception");
+        } catch (ModelDuplicateException e) {
+        }
+        commit(true);
+
+        // Ty to rename user to duplicate login name
+        realmManager.getRealmByName("JUGGLER1").addUser("user2");
+        commit();
+        try {
+            realmManager.getRealmByName("JUGGLER1").getUser("user2").setLoginName("user1");
+            commit();
+            Assert.fail("Expected exception");
+        } catch (ModelDuplicateException e) {
+        }
+
+        resetSession();
+    }
+
+    @Test
+    public void testEmailCollisions() throws Exception {
+        realmManager.createRealm("JUGGLER1").addUser("user1").setEmail("email@example.com");
+        realmManager.createRealm("JUGGLER2").addUser("user1").setEmail("email@example.com");
+        commit();
+
+        // Try to create user with duplicate email
+        try {
+            realmManager.getRealmByName("JUGGLER1").addUser("user2").setEmail("email@example.com");
+            commit();
+            Assert.fail("Expected exception");
+        } catch (ModelDuplicateException e) {
+        }
+
+        resetSession();
+
+        // Ty to rename user to duplicate email
+        realmManager.getRealmByName("JUGGLER1").addUser("user3").setEmail("email2@example.com");
+        commit();
+        try {
+            realmManager.getRealmByName("JUGGLER1").getUser("user3").setEmail("email@example.com");
+            commit();
+            Assert.fail("Expected exception");
+        } catch (ModelDuplicateException e) {
+        }
+
+        resetSession();
     }
 
 }

model/tests/src/test/resources/testcomposites.json

@@ -18,7 +18,7 @@
         {
             "username" : "REALM_COMPOSITE_1_USER",
             "enabled": true,
-            "email" : "test-user@localhost",
+            "email" : "test-user1@localhost",
             "credentials" : [
                 { "type" : "password",
                     "value" : "password" }
@@ -27,7 +27,7 @@
         {
             "username" : "REALM_ROLE_1_USER",
             "enabled": true,
-            "email" : "test-user@localhost",
+            "email" : "test-user2@localhost",
             "credentials" : [
                 { "type" : "password",
                     "value" : "password" }
@@ -36,7 +36,7 @@
         {
             "username" : "REALM_APP_COMPOSITE_USER",
             "enabled": true,
-            "email" : "test-user@localhost",
+            "email" : "test-user3@localhost",
             "credentials" : [
                 { "type" : "password",
                     "value" : "password" }
@@ -45,7 +45,7 @@
         {
             "username" : "REALM_APP_ROLE_USER",
             "enabled": true,
-            "email" : "test-user@localhost",
+            "email" : "test-user4@localhost",
             "credentials" : [
                 { "type" : "password",
                     "value" : "password" }
@@ -54,7 +54,7 @@
         {
             "username" : "APP_COMPOSITE_USER",
             "enabled": true,
-            "email" : "test-user@localhost",
+            "email" : "test-user5@localhost",
             "credentials" : [
                 { "type" : "password",
                     "value" : "password" }