From 79e3444fba351fd338127a20a868426271802be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Krau=C3=9F?= Date: Tue, 22 Oct 2024 13:34:17 +0200 Subject: [PATCH] Adds support for default first broker login flow on realm level --- .github/workflows/ci.yaml | 4 +- pom.xml | 66 +++++++++++++++++++ .../service/ImportAuthenticationFlowsIT.java | 2 +- 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e6e02d70f..035d64630 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -77,9 +77,7 @@ jobs: echo "COMPATIBILITY_PROFILE=-Ppre-keycloak19" >> $GITHUB_ENV - name: Build & Test - run: | - echo "using COMPATIBILITY_PROFILE: ${COMPATIBILITY_PROFILE}" - ./mvnw ${MAVEN_CLI_OPTS} -Dkeycloak.version=${{ matrix.env.KEYCLOAK_VERSION }} ${ADJUSTED_RESTEASY_VERSION} clean verify -Pcoverage ${COMPATIBILITY_PROFILE} + run: ./mvnw ${MAVEN_CLI_OPTS} -Dkeycloak.version=${{ matrix.env.KEYCLOAK_VERSION }} ${ADJUSTED_RESTEASY_VERSION} clean verify -Pcoverage ${COMPATIBILITY_PROFILE} - name: Upload coverage to Codecov uses: codecov/codecov-action@v4.6.0 diff --git a/pom.xml b/pom.xml index fb646ff4c..8fd361313 100644 --- a/pom.xml +++ b/pom.xml @@ -650,6 +650,39 @@ ${project.basedir}/src/test/java/de/adorsys/keycloak/config/test/util/SubGroupUtil.java + + replace-used-authentication-flow-workaround-with-legacy + generate-sources + + copy + + + ${project.basedir}/src/main/java/de/adorsys/keycloak/config/factory/UsedAuthenticationFlowWorkaroundFactory.java.legacy + ${project.basedir}/src/main/java/de/adorsys/keycloak/config/factory/UsedAuthenticationFlowWorkaroundFactory.java + + + + replace-authentication-flow-import-service-with-legacy + generate-sources + + copy + + + ${project.basedir}/src/main/java/de/adorsys/keycloak/config/service/AuthenticationFlowsImportService.java.legacy + ${project.basedir}/src/main/java/de/adorsys/keycloak/config/service/AuthenticationFlowsImportService.java + + + + replace-authentication-flow-import-service-test-with-legacy + generate-sources + + copy + + + ${project.basedir}/src/test/java/de/adorsys/keycloak/config/service/ImportAuthenticationFlowsIT.java.legacy + ${project.basedir}/src/test/java/de/adorsys/keycloak/config/service/ImportAuthenticationFlowsIT.java + + @@ -743,6 +776,39 @@ import org.keycloak.representations.userprofile.config.UPConfig; ${project.basedir}/src/test/java/de/adorsys/keycloak/config/test/util/SubGroupUtil.java + + replace-used-authentication-flow-workaround-with-legacy + generate-sources + + copy + + + ${project.basedir}/src/main/java/de/adorsys/keycloak/config/factory/UsedAuthenticationFlowWorkaroundFactory.java.legacy + ${project.basedir}/src/main/java/de/adorsys/keycloak/config/factory/UsedAuthenticationFlowWorkaroundFactory.java + + + + replace-authentication-flow-import-service-with-legacy + generate-sources + + copy + + + ${project.basedir}/src/main/java/de/adorsys/keycloak/config/service/AuthenticationFlowsImportService.java.legacy + ${project.basedir}/src/main/java/de/adorsys/keycloak/config/service/AuthenticationFlowsImportService.java + + + + replace-authentication-flow-import-service-test-with-legacy + generate-sources + + copy + + + ${project.basedir}/src/test/java/de/adorsys/keycloak/config/service/ImportAuthenticationFlowsIT.java.legacy + ${project.basedir}/src/test/java/de/adorsys/keycloak/config/service/ImportAuthenticationFlowsIT.java + + diff --git a/src/test/java/de/adorsys/keycloak/config/service/ImportAuthenticationFlowsIT.java b/src/test/java/de/adorsys/keycloak/config/service/ImportAuthenticationFlowsIT.java index 2c9ed11ef..6884f8c7f 100644 --- a/src/test/java/de/adorsys/keycloak/config/service/ImportAuthenticationFlowsIT.java +++ b/src/test/java/de/adorsys/keycloak/config/service/ImportAuthenticationFlowsIT.java @@ -1238,7 +1238,7 @@ void shouldUpdateCustomFirstBrokerLoginFlowWhenSetAsDefault() throws IOException assertThat(realm.getRealm(), is(DEFAULT_FLOW_REALM_NAME)); assertThat(realm.isEnabled(), is(true)); assertThat(realm.getFirstBrokerLoginFlow(), is("my auth flow")); - assertThat(flow.getAuthenticationExecutions().getFirst().getAuthenticator(), is("idp-auto-link")); + assertThat(flow.getAuthenticationExecutions().get(0).getAuthenticator(), is("idp-auto-link")); } private List getExecutionFromFlow(AuthenticationFlowRepresentation flow, String executionAuthenticator) {