diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java b/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java
index a0034e9..3a0e577 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java
@@ -397,6 +397,8 @@ public class AuthenticationManagementResource {
ProviderFactory f;
if (parentFlow.getProviderId().equals(AuthenticationFlow.CLIENT_FLOW)) {
f = session.getKeycloakSessionFactory().getProviderFactory(ClientAuthenticator.class, provider);
+ } else if (parentFlow.getProviderId().equals(AuthenticationFlow.FORM_FLOW)) {
+ f = session.getKeycloakSessionFactory().getProviderFactory(FormAction.class, provider);
} else {
f = session.getKeycloakSessionFactory().getProviderFactory(Authenticator.class, provider);
}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RegistrationFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RegistrationFlowTest.java
new file mode 100644
index 0000000..bf2babe
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RegistrationFlowTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2016 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.keycloak.testsuite.admin.authentication;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.core.Response;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class RegistrationFlowTest extends AbstractAuthenticationTest {
+
+ @Test
+ public void testAddExecution() {
+ // Add registration flow 2
+ Response response = authMgmtResource.createFlow(newFlow("registration2", "RegistrationFlow2", "basic-flow", true, false));
+ try {
+ Assert.assertEquals("createFlow success", 201, response.getStatus());
+ } finally {
+ response.close();
+ }
+
+
+ // add registration execution form flow
+ Map<String, String> data = new HashMap<>();
+ data.put("alias", "registrationForm2");
+ data.put("type", "form-flow");
+ data.put("description", "registrationForm2 flow");
+ data.put("provider", "registration-page-form");
+ authMgmtResource.addExecutionFlow("registration2", data);
+
+ // Should fail to add execution under top level flow
+ Map<String, String> data2 = new HashMap<>();
+ data2.put("provider", "registration-profile-action");
+ try {
+ authMgmtResource.addExecution("registration2", data2);
+ Assert.fail("Not expected to add execution of type 'registration-profile-action' under top flow");
+ } catch (BadRequestException bre) {
+ String errorMessage = bre.getResponse().readEntity(String.class);
+ Assert.assertEquals("No authentication provider found for id: registration-profile-action", errorMessage);
+ }
+
+ // Should success to add execution under form flow
+ authMgmtResource.addExecution("registrationForm2", data2);
+
+ }
+
+ // TODO: More coverage... And hopefully more type-safety instead of passing generic maps
+
+}
