libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

KEYCLOAK-7975 fix updating execution with Oracle DB

Browse source
This commit is contained in:
vramik 2018-08-23 21:17:24 +02:00 committed by Hynek Mlnařík
parent 59082e0b5f
commit 01b0b6b345
2 changed files with 56 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java
View file

@ -1855,7 +1855,7 @@ public class RepresentationToModel {
public static AuthenticatorConfigModel toModel(AuthenticatorConfigRepresentation rep) {
AuthenticatorConfigModel model = new AuthenticatorConfigModel();
model.setAlias(rep.getAlias());
model.setConfig(rep.getConfig());
model.setConfig(removeEmptyString(rep.getConfig()));
return model;
}

55
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ExecutionTest.java
View file

@ -26,6 +26,8 @@ import org.keycloak.events.admin.ResourceType;
import org.keycloak.representations.idm.AuthenticationExecutionInfoRepresentation;
import org.keycloak.representations.idm.AuthenticationExecutionRepresentation;
import org.keycloak.representations.idm.AuthenticationFlowRepresentation;
import org.keycloak.representations.idm.AuthenticatorConfigRepresentation;
import org.keycloak.testsuite.admin.ApiUtil;
import org.keycloak.testsuite.util.AdminEventPaths;
import org.keycloak.testsuite.util.AssertAdminEvents;
@ -35,12 +37,65 @@ import javax.ws.rs.core.Response;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.hamcrest.Matchers.hasItems;
/**
* @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
*/
public class ExecutionTest extends AbstractAuthenticationTest {
// KEYCLOAK-7975
@Test
public void testUpdateAuthenticatorConfig() {
// copy built-in flow so we get a new editable flow
HashMap<String, String> params = new HashMap<>();
params.put("newName", "new-browser-flow");
Response response = authMgmtResource.copy("browser", params);
assertAdminEvents.assertEvent(REALM_NAME, OperationType.CREATE, AdminEventPaths.authCopyFlowPath("browser"), params, ResourceType.AUTH_FLOW);
try {
Assert.assertEquals("Copy flow", 201, response.getStatus());
} finally {
response.close();
}
// create Conditional OTP Form execution
params.put("provider", "auth-conditional-otp-form");
authMgmtResource.addExecution("new-browser-flow", params);
assertAdminEvents.assertEvent(REALM_NAME, OperationType.CREATE, AdminEventPaths.authAddExecutionPath("new-browser-flow"), params, ResourceType.AUTH_EXECUTION);
List<AuthenticationExecutionInfoRepresentation> executionReps = authMgmtResource.getExecutions("new-browser-flow");
AuthenticationExecutionInfoRepresentation exec = findExecutionByProvider("auth-conditional-otp-form", executionReps);
// create authenticator config for the execution
Map<String, String> config = new HashMap<>();
config.put("defaultOtpOutcome", "skip");
config.put("otpControlAttribute", "test");
config.put("forceOtpForHeaderPattern", "");
config.put("forceOtpRole", "");
config.put("noOtpRequiredForHeaderPattern", "");
config.put("skipOtpRole", "");
AuthenticatorConfigRepresentation authConfigRep = new AuthenticatorConfigRepresentation();
authConfigRep.setAlias("conditional-otp-form-config-alias");
authConfigRep.setConfig(config);
response = authMgmtResource.newExecutionConfig(exec.getId(), authConfigRep);
try {
authConfigRep.setId(ApiUtil.getCreatedId(response));
} finally {
response.close();
}
// try to update the config adn check
config.put("otpControlAttribute", "test-updated");
authConfigRep.setConfig(config);
authMgmtResource.updateAuthenticatorConfig(authConfigRep.getId(), authConfigRep);
AuthenticatorConfigRepresentation updated = authMgmtResource.getAuthenticatorConfig(authConfigRep.getId());
Assert.assertThat(updated.getConfig().values(), hasItems("test-updated", "skip"));
}
@Test
public void testAddRemoveExecution() {