8000 KEYCLOAK-16928 Fix typo in authenticatorFlow representation by pskopek · Pull Request #8001 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

KEYCLOAK-16928 Fix typo in authenticatorFlow representation #8001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mposolda merged 1 commit into from
May 6, 2021
Merged

KEYCLOAK-16928 Fix typo in authenticatorFlow representation #8001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions .../java/org/keycloak/representations/idm/AbstractAuthenticationExecutionRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

}
2 changes: 1 addition & 1 deletion server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/java/org/keycloak/testsuite/admin/authentication/AbstractAuthenticationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions ...illian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion ...ests/base/src/test/java/org/keycloak/testsuite/admin/authentication/InitialFlowsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...ion-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ExecutionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public ExecutionBuilder priority(int priority) {
}

public ExecutionBuilder authenticatorFlow(boolean authenticatorFlow) {
rep.setAutheticatorFlow(authenticatorFlow);
rep.setAuthenticatorFlow(authenticatorFlow);
return this;
}

Expand Down
0