Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.keycloak.models.RequiredActionProviderModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserModel;
import org.keycloak.representations.idm.RealmRepresentation;

public class MigrateTo26_7_0 extends RealmMigration {

Expand All @@ -26,10 +27,25 @@ public ModelVersion getVersion() {
}


@Override
public void migrate(KeycloakSession session) {
// addOrganizationAdminRoles accesses cross-realm entities (master admin client)
// which fails with LazyInitializationException when RealmMigration clears the
// persistence context between realms. Handle it in a separate pass.
session.realms().getRealmsStream().forEach(this::addOrganizationAdminRoles);
super.migrate(session);
}

@Override
public void migrateImport(KeycloakSession session, RealmModel realm, RealmRepresentation rep,
boolean skipUserDependent) {
addOrganizationAdminRoles(realm);
super.migrateImport(session, realm, rep, skipUserDependent);
}

@Override
public void migrateRealm(KeycloakSession session, RealmModel realm) {
updatePasswordAfterEmailVerificationDuringRegistrationOfUsers(realm);
addOrganizationAdminRoles(realm);
}

private void updatePasswordAfterEmailVerificationDuringRegistrationOfUsers(RealmModel realm) {
Expand Down
Loading