diff --git a/core/src/main/java/org/keycloak/representations/idm/AbstractAuthenticationExecutionRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/AbstractAuthenticationExecutionRepresentation.java index 8cd4f285b5c7..c5977c4c9cb0 100644 --- a/core/src/main/java/org/keycloak/representations/idm/AbstractAuthenticationExecutionRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/AbstractAuthenticationExecutionRepresentation.java @@ -67,11 +67,27 @@ public void setPriority(int priority) { * * @return */ + @Deprecated public boolean isAutheticatorFlow() { return authenticatorFlow; } + @Deprecated public void setAutheticatorFlow(boolean autheticatorFlow) { this.authenticatorFlow = autheticatorFlow; } + + /** + * Is the referenced authenticator a flow? + * + * @return + */ + public boolean isAuthenticatorFlow() { + return authenticatorFlow; + } + + public void setAuthenticatorFlow(boolean authenticatorFlow) { + this.authenticatorFlow = authenticatorFlow; + } + } diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java b/server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java index 2adfe89baf14..74b92d425bdf 100755 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java @@ -735,7 +735,7 @@ public static AuthenticationExecutionExportRepresentation toRepresentation(Realm rep.setAuthenticatorConfig(config.getAlias()); } rep.setAuthenticator(model.getAuthenticator()); - rep.setAutheticatorFlow(model.isAuthenticatorFlow()); + rep.setAuthenticatorFlow(model.isAuthenticatorFlow()); if (model.getFlowId() != null) { AuthenticationFlowModel flow = realm.getAuthenticationFlowById(model.getFlowId()); rep.setFlowAlias(flow.getAlias()); diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java b/server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java index dc25a59c0a95..e1de98f30155 100755 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java @@ -2085,7 +2085,7 @@ private static AuthenticationExecutionModel toModel(RealmModel realm, Authentica model.setAuthenticatorConfig(config.getId()); } model.setAuthenticator(rep.getAuthenticator()); - model.setAuthenticatorFlow(rep.isAutheticatorFlow()); + model.setAuthenticatorFlow(rep.isAuthenticatorFlow()); if (rep.getFlowAlias() != null) { AuthenticationFlowModel flow = realm.getFlowByAlias(rep.getFlowAlias()); model.setFlowId(flow.getId()); @@ -2111,7 +2111,7 @@ public static AuthenticationExecutionModel toModel(RealmModel realm, Authenticat model.setAuthenticator(rep.getAuthenticator()); model.setPriority(rep.getPriority()); model.setParentFlow(rep.getParentFlow()); - model.setAuthenticatorFlow(rep.isAutheticatorFlow()); + model.setAuthenticatorFlow(rep.isAuthenticatorFlow()); model.setRequirement(AuthenticationExecutionModel.Requirement.valueOf(rep.getRequirement())); if (rep.getAuthenticatorConfig() != null) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AbstractAuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AbstractAuthenticationTest.java index e4d6b05c3196..e444aa32ddcc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AbstractAuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AbstractAuthenticationTest.java @@ -107,7 +107,7 @@ void compareExecution(AuthenticationExecutionExportRepresentation expected, Auth Assert.assertEquals("Execution flowAlias - " + actual.getFlowAlias(), expected.getFlowAlias(), actual.getFlowAlias()); Assert.assertEquals("Execution authenticator - " + actual.getAuthenticator(), expected.getAuthenticator(), actual.getAuthenticator()); Assert.assertEquals("Execution userSetupAllowed - " + actual.getAuthenticator(), expected.isUserSetupAllowed(), actual.isUserSetupAllowed()); - Assert.assertEquals("Execution authenticatorFlow - " + actual.getAuthenticator(), expected.isAutheticatorFlow(), actual.isAutheticatorFlow()); + Assert.assertEquals("Execution authenticatorFlow - " + actual.getAuthenticator(), expected.isAuthenticatorFlow(), actual.isAuthenticatorFlow()); Assert.assertEquals("Execution authenticatorConfig - " + actual.getAuthenticator(), expected.getAuthenticatorConfig(), actual.getAuthenticatorConfig()); Assert.assertEquals("Execution priority - " + actual.getAuthenticator(), expected.getPriority(), actual.getPriority()); Assert.assertEquals("Execution requirement - " + actual.getAuthenticator(), expected.getRequirement(), actual.getRequirement()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java index 0dbfda5ea3b8..760c7836fe11 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java @@ -185,7 +185,7 @@ public void testAddRemoveFlow() { AuthenticationExecutionExportRepresentation expected = new AuthenticationExecutionExportRepresentation(); expected.setFlowAlias("SomeFlow"); expected.setUserSetupAllowed(false); - expected.setAutheticatorFlow(true); + expected.setAuthenticatorFlow(true); expected.setRequirement("DISABLED"); expected.setPriority(0); compareExecution(expected, execs.get(0)); @@ -194,7 +194,7 @@ public void testAddRemoveFlow() { expected.setFlowAlias("SomeFlow2"); expected.setUserSetupAllowed(false); expected.setAuthenticator("registration-page-form"); - expected.setAutheticatorFlow(true); + expected.setAuthenticatorFlow(true); expected.setRequirement("DISABLED"); expected.setPriority(1); compareExecution(expected, execs.get(1)); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/InitialFlowsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/InitialFlowsTest.java index 760829e4455b..3719fb21ac0b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/InitialFlowsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/InitialFlowsTest.java @@ -251,7 +251,7 @@ private AuthenticationExecutionExportRepresentation newExecutionExportRepresenta rep.setFlowAlias(flowAlias); rep.setUserSetupAllowed(userSetupAllowed); rep.setAuthenticator(authenticator); - rep.setAutheticatorFlow(authenticatorFlow); + rep.setAuthenticatorFlow(authenticatorFlow); rep.setAuthenticatorConfig(authenticatorConfig); rep.setRequirement(requirement); rep.setPriority(priority); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ExecutionBuilder.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ExecutionBuilder.java index 1722c445662b..b42defdc7bee 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ExecutionBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ExecutionBuilder.java @@ -60,7 +60,7 @@ public ExecutionBuilder priority(int priority) { } public ExecutionBuilder authenticatorFlow(boolean authenticatorFlow) { - rep.setAutheticatorFlow(authenticatorFlow); + rep.setAuthenticatorFlow(authenticatorFlow); return this; }