From d90a708ceb7ccbe908139da23fc9155458d82e35 Mon Sep 17 00:00:00 2001 From: Stan Silvert Date: Fri, 1 Jul 2016 10:25:14 -0400 Subject: [PATCH 1/2] RHSSO-274: "Undefined" as auth flow execution --- .../profile/ecp/authenticator/HttpBasicAuthenticator.java | 4 ++-- .../testsuite/admin/authentication/ProvidersTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java index 68d62b388d..7daf470e4a 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java +++ b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java @@ -43,7 +43,7 @@ public class HttpBasicAuthenticator implements AuthenticatorFactory { @Override public String getDisplayType() { - return null; + return "HTTP Basic Authentication"; } @Override @@ -68,7 +68,7 @@ public class HttpBasicAuthenticator implements AuthenticatorFactory { @Override public String getHelpText() { - return null; + return "Validates username and password from Authorization HTTP header"; } @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java index 42b446f349..858e06ef45 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java @@ -145,7 +145,7 @@ public class ProvidersTest extends AbstractAuthenticationTest { "Validates the password supplied as a 'password' form parameter in direct grant request"); addProviderInfo(result, "direct-grant-validate-username", "Username Validation", "Validates the username supplied as a 'username' form parameter in direct grant request"); - addProviderInfo(result, "http-basic-authenticator", null, null); + addProviderInfo(result, "http-basic-authenticator", "HTTP Basic Authentication", "Validates username and password from Authorization HTTP header"); addProviderInfo(result, "idp-confirm-link", "Confirm link existing account", "Show the form where user confirms if he wants " + "to link identity provider with existing account or rather edit user profile data retrieved from identity provider to avoid conflict"); addProviderInfo(result, "idp-create-user-if-unique", "Create User If Unique", "Detect if there is existing Keycloak account " + From 8b8ebfc7e162d804fa376657c1dc0636c6aa5892 Mon Sep 17 00:00:00 2001 From: Stan Silvert Date: Fri, 1 Jul 2016 12:24:13 -0400 Subject: [PATCH 2/2] Fix failing test. --- .../testsuite/admin/authentication/InitialFlowsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b2437110df..3640af5288 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 @@ -200,7 +200,7 @@ public class InitialFlowsTest extends AbstractAuthenticationTest { addExecExport(flow, null, false, "http-basic-authenticator", false, null, REQUIRED, 10); execs = new LinkedList<>(); - addExecInfo(execs, null, "http-basic-authenticator", false, 0, 0, REQUIRED, null, new String[]{}); + addExecInfo(execs, "HTTP Basic Authentication", "http-basic-authenticator", false, 0, 0, REQUIRED, null, new String[]{}); expected.add(new FlowExecutions(flow, execs)); return expected;