External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-09 15:02:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Update browser flow with organization flow on migration

Browse Source 
Closes #36593

Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com>
This commit is contained in:
Pedro Igor 2026-01-06 09:52:28 -03:00
parent 234526761e
commit 17f0dbdc1c
3 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo26_6_0.java Normal file
View File

@ -0,0 +1,23 @@
package org.keycloak.migration.migrators;
import org.keycloak.migration.ModelVersion;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.utils.DefaultAuthenticationFlows;
public class MigrateTo26_6_0 extends RealmMigration {
public static final ModelVersion VERSION = new ModelVersion("26.6.0");
@Override
public ModelVersion getVersion() {
return VERSION;
}
@Override
public void migrateRealm(KeycloakSession session, RealmModel realm) {
DefaultAuthenticationFlows.addOrganizationBrowserFlowStep(realm, realm.getBrowserFlow());
}
}

4
model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultMigrationManager.java
View File

@ -49,6 +49,7 @@ import org.keycloak.migration.migrators.MigrateTo26_2_0;
import org.keycloak.migration.migrators.MigrateTo26_3_0; import org.keycloak.migration.migrators.MigrateTo26_3_0;
import org.keycloak.migration.migrators.MigrateTo26_4_0; import org.keycloak.migration.migrators.MigrateTo26_4_0;
import org.keycloak.migration.migrators.MigrateTo26_4_3; import org.keycloak.migration.migrators.MigrateTo26_4_3;
import org.keycloak.migration.migrators.MigrateTo26_6_0;
import org.keycloak.migration.migrators.MigrateTo2_0_0; import org.keycloak.migration.migrators.MigrateTo2_0_0;
import org.keycloak.migration.migrators.MigrateTo2_1_0; import org.keycloak.migration.migrators.MigrateTo2_1_0;
import org.keycloak.migration.migrators.MigrateTo2_2_0; import org.keycloak.migration.migrators.MigrateTo2_2_0;
@ -131,7 +132,8 @@ public class DefaultMigrationManager implements MigrationManager {
new MigrateTo26_2_0(), new MigrateTo26_2_0(),
new MigrateTo26_3_0(), new MigrateTo26_3_0(),
new MigrateTo26_4_0(), new MigrateTo26_4_0(),
new MigrateTo26_4_3() new MigrateTo26_4_3(),
new MigrateTo26_6_0()
}; };
private final KeycloakSession session; private final KeycloakSession session;

18
server-spi-private/src/main/java/org/keycloak/models/utils/DefaultAuthenticationFlows.java
View File

@ -825,6 +825,11 @@ public class DefaultAuthenticationFlows {
if (!Profile.isFeatureEnabled(Feature.ORGANIZATION)) { if (!Profile.isFeatureEnabled(Feature.ORGANIZATION)) {
return; return;
} }
if (isOrganizationAuthenticatorPresent(realm, flow.getId())) {
return;
}
if (!Config.getAdminRealm().equals(realm.getName())) { if (!Config.getAdminRealm().equals(realm.getName())) {
// do not add the org flows to the master realm for now. // do not add the org flows to the master realm for now.
AuthenticationFlowModel organizations = new AuthenticationFlowModel(); AuthenticationFlowModel organizations = new AuthenticationFlowModel();
@ -873,4 +878,17 @@ public class DefaultAuthenticationFlows {
realm.addAuthenticatorExecution(execution); realm.addAuthenticatorExecution(execution);
} }
} }
private static boolean isOrganizationAuthenticatorPresent(RealmModel realm, String flowId) {
return flowId != null && realm.getAuthenticationExecutionsStream(flowId)
.anyMatch((e) -> isOrganizationAuthenticatorPresent(realm, e));
}
private static boolean isOrganizationAuthenticatorPresent(RealmModel realm, AuthenticationExecutionModel execution) {
if ("organization".equals(execution.getAuthenticator())) {
return true;
}
return isOrganizationAuthenticatorPresent(realm, execution.getFlowId());
}
} }