From 331847b76b1ca8fb78c1588ffb56dd729945cf4a Mon Sep 17 00:00:00 2001 From: Garth <244253+xgp@users.noreply.github.com> Date: Tue, 9 Jan 2024 22:25:36 +0100 Subject: [PATCH] allow a KC_ORGS_SKIP_MIGRATION flag for large numbers of realms. TODO make this an --spi* var. --- .../java/io/phasetwo/service/representation/Invitation.java | 2 +- .../phasetwo/service/resource/OrganizationAdminResource.java | 1 - .../resource/OrganizationResourceProviderFactory.java | 5 ++++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/phasetwo/service/representation/Invitation.java b/src/main/java/io/phasetwo/service/representation/Invitation.java index 2c3100b1..2643c3ae 100644 --- a/src/main/java/io/phasetwo/service/representation/Invitation.java +++ b/src/main/java/io/phasetwo/service/representation/Invitation.java @@ -136,7 +136,7 @@ public Invitation teamIds(List teamIds) { @JsonProperty("teams") @JsonIgnore // ignore field "teams" because it is not present in InvitationRepresentation (class - // io.phasetwo.client.openapi.model.InvitationRepresentation) + // io.phasetwo.client.openapi.model.InvitationRepresentation) public List getTeamIds() { return teamIds; } diff --git a/src/main/java/io/phasetwo/service/resource/OrganizationAdminResource.java b/src/main/java/io/phasetwo/service/resource/OrganizationAdminResource.java index 67ea5262..981af8fe 100644 --- a/src/main/java/io/phasetwo/service/resource/OrganizationAdminResource.java +++ b/src/main/java/io/phasetwo/service/resource/OrganizationAdminResource.java @@ -7,7 +7,6 @@ import lombok.extern.jbosslog.JBossLog; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; -import org.keycloak.services.managers.AppAuthManager; /** */ @JBossLog diff --git a/src/main/java/io/phasetwo/service/resource/OrganizationResourceProviderFactory.java b/src/main/java/io/phasetwo/service/resource/OrganizationResourceProviderFactory.java index 11f0abb3..41544f18 100644 --- a/src/main/java/io/phasetwo/service/resource/OrganizationResourceProviderFactory.java +++ b/src/main/java/io/phasetwo/service/resource/OrganizationResourceProviderFactory.java @@ -61,7 +61,10 @@ public void postInit(KeycloakSessionFactory factory) { realmPostCreate((RealmModel.RealmPostCreateEvent) event); } else if (event instanceof PostMigrationEvent) { log.debug("PostMigrationEvent"); - KeycloakModelUtils.runJobInTransaction(factory, this::initRoles); + if (System.getenv("KC_ORGS_SKIP_MIGRATION") == null) { + log.info("initializing organization roles following migration"); + KeycloakModelUtils.runJobInTransaction(factory, this::initRoles); + } } else if (event instanceof RealmModel.RealmRemovedEvent) { log.debug("RealmRemovedEvent"); realmRemoved((RealmModel.RealmRemovedEvent) event);