import console from export

services/src/main/java/org/keycloak/services/managers/RealmManager.java

@@ -18,6 +18,7 @@ import org.keycloak.models.UserModel;
 import org.keycloak.models.UserSessionProvider;
 import org.keycloak.models.utils.KeycloakModelUtils;
 import org.keycloak.models.utils.RepresentationToModel;
+import org.keycloak.representations.idm.ApplicationRepresentation;
 import org.keycloak.representations.idm.RealmAuditRepresentation;
 import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.timer.TimerProvider;
@@ -115,6 +116,10 @@ public class RealmManager {
         return "realm-management";
     }
 
+    public String getRealmAdminApplicationName(RealmRepresentation realm) {
+        return "realm-management";
+    }
+
 
 
     protected void setupRealmDefaults(RealmModel realm) {
@@ -208,20 +213,61 @@ public class RealmManager {
         if (id == null) {
             id = KeycloakModelUtils.generateId();
         }
-        RealmModel realm = createRealm(id, rep.getRealm());
+        RealmModel realm = model.createRealm(id, rep.getRealm());
-        importRealm(rep, realm);
+        realm.setName(rep.getRealm());
+
+        // setup defaults
+
+        setupRealmDefaults(realm);
+        setupMasterAdminManagement(realm);
+        if (!hasRealmAdminManagementApp(rep)) setupRealmAdminManagement(realm);
+        if (!hasAccountManagementApp(rep)) setupAccountManagement(realm);
+        if (!hasAdminConsoleApp(rep)) setupAdminConsole(realm);
+
+        RepresentationToModel.importRealm(session, rep, realm);
+
+
+        if (realm.getAuditListeners().size() == 0) {
+            realm.setAuditListeners(Collections.singleton("jboss-logging"));
+        }
+
+        // Refresh periodic sync tasks for configured federationProviders
+        List<UserFederationProviderModel> federationProviders = realm.getUserFederationProviders();
+        UsersSyncManager usersSyncManager = new UsersSyncManager();
+        for (final UserFederationProviderModel fedProvider : federationProviders) {
+            usersSyncManager.refreshPeriodicSyncForProvider(session.getKeycloakSessionFactory(), session.getProvider(TimerProvider.class), fedProvider, realm.getId());
+        }
         return realm;
     }
 
-    public void importRealm(RealmRepresentation rep, RealmModel newRealm) {
+    private boolean hasRealmAdminManagementApp(RealmRepresentation rep) {
-        RepresentationToModel.importRealm(session, rep, newRealm);
+        if (rep.getApplications() == null) return false;
-
+        for (ApplicationRepresentation app : rep.getApplications()) {
-        // Refresh periodic sync tasks for configured federationProviders
+            if (app.getName().equals(getRealmAdminApplicationName(rep))) {
-        List<UserFederationProviderModel> federationProviders = newRealm.getUserFederationProviders();
+                return true;
-        UsersSyncManager usersSyncManager = new UsersSyncManager();
+            }
-        for (final UserFederationProviderModel fedProvider : federationProviders) {
-            usersSyncManager.refreshPeriodicSyncForProvider(session.getKeycloakSessionFactory(), session.getProvider(TimerProvider.class), fedProvider, newRealm.getId());
         }
+        return false;
+    }
+
+    private boolean hasAccountManagementApp(RealmRepresentation rep) {
+        if (rep.getApplications() == null) return false;
+        for (ApplicationRepresentation app : rep.getApplications()) {
+            if (app.getName().equals(Constants.ACCOUNT_MANAGEMENT_APP)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean hasAdminConsoleApp(RealmRepresentation rep) {
+        if (rep.getApplications() == null) return false;
+        for (ApplicationRepresentation app : rep.getApplications()) {
+            if (app.getName().equals(Constants.ADMIN_CONSOLE_APPLICATION)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**

services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java

@@ -217,8 +217,7 @@ public class KeycloakApplication extends Application {
                 return;
             }
 
-            RealmModel realm = manager.createRealm(rep.getId(), rep.getRealm());
+            RealmModel realm = manager.importRealm(rep);
-            manager.importRealm(rep, realm);
 
             log.info("Imported realm " + realm.getName() + " from " + from);
 

testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java

@@ -246,8 +246,7 @@ public class KeycloakServer {
                 return;
             }
             manager.setContextPath("/auth");
-            RealmModel realm = manager.createRealm(rep.getId(), rep.getRealm());
+            RealmModel realm = manager.importRealm(rep);
-            manager.importRealm(rep, realm);
 
             info("Imported realm " + realm.getName());
 

testsuite/integration/src/test/java/org/keycloak/testsuite/composites/CompositeImportRoleTest.java

@@ -53,9 +53,9 @@ public class CompositeImportRoleTest {
     public static AbstractKeycloakRule keycloakRule = new AbstractKeycloakRule(){
         @Override
         protected void configure(KeycloakSession session, RealmManager manager, RealmModel adminRealm) {
-            RealmModel realm = manager.createRealm("Test");
             RealmRepresentation representation = KeycloakServer.loadJson(getClass().getResourceAsStream("/testcomposite.json"), RealmRepresentation.class);
-            manager.importRealm(representation, realm);
+            representation.setId("Test");
+            RealmModel realm = manager.importRealm(representation);
 
             realmPublicKey = realm.getPublicKey();
 

testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java

@@ -103,8 +103,8 @@ public class ExportImportTest {
             // Import "test-realm" realm
             try {
                 RealmRepresentation rep = AbstractModelTest.loadJson("model/testrealm.json");
-                RealmModel demoRealm = manager.createRealm("test-realm", rep.getRealm());
+                rep.setId("test-realm");
-                manager.importRealm(rep, demoRealm);
+                RealmModel demoRealm = manager.importRealm(rep);
             } catch (IOException ioe) {
                 throw new RuntimeException(ioe);
             }

testsuite/integration/src/test/java/org/keycloak/testsuite/model/CompositeRolesModelTest.java

@@ -24,8 +24,8 @@ public class CompositeRolesModelTest extends AbstractModelTest {
         super.before();
         RealmManager manager = realmManager;
         RealmRepresentation rep = AbstractModelTest.loadJson("model/testcomposites.json");
-        RealmModel realm = manager.createRealm("TestComposites", rep.getRealm());
+        rep.setId("TestComposites");
-        manager.importRealm(rep, realm);
+        RealmModel realm = manager.importRealm(rep);
     }
 
     @Test

testsuite/integration/src/test/java/org/keycloak/testsuite/model/ImportTest.java

@@ -43,8 +43,8 @@ public class ImportTest extends AbstractModelTest {
     @Test
     public void install() throws Exception {
         RealmRepresentation rep = AbstractModelTest.loadJson("model/testrealm.json");
-        RealmModel realm = realmManager.createRealm("demo", rep.getRealm());
+        rep.setId("demo");
-        realmManager.importRealm(rep, realm);
+        RealmModel realm = realmManager.importRealm(rep);
 
         // Commit after import
         commit();
@@ -216,8 +216,8 @@ public class ImportTest extends AbstractModelTest {
     public void install2() throws Exception {
         RealmManager manager = realmManager;
         RealmRepresentation rep = AbstractModelTest.loadJson("model/testrealm-demo.json");
-        RealmModel realm = manager.createRealm("demo", rep.getRealm());
+        rep.setId("demo");
-        manager.importRealm(rep, realm);
+        RealmModel realm =manager.importRealm(rep);
 
         Assert.assertFalse(realm.isUpdateProfileOnInitialSocialLogin());
         Assert.assertEquals(600, realm.getAccessCodeLifespanUserAction());

testsuite/integration/src/test/java/org/keycloak/testsuite/model/ModelTest.java

@@ -69,8 +69,8 @@ public class ModelTest extends AbstractModelTest {
     private RealmModel importExport(RealmModel src, String copyName) {
         RealmRepresentation representation = ModelToRepresentation.toRepresentation(src);
         representation.setRealm(copyName);
-        RealmModel copy = realmManager.createRealm(copyName);
+        representation.setId(copyName);
-        realmManager.importRealm(representation, copy);
+        RealmModel copy = realmManager.importRealm(representation);
         return realmManager.getRealm(copy.getId());
     }