keycloak-aplcache

fix2

11/24/2015 8:25:05 PM

Details

diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java
index c341a8f..1d289d7 100755
--- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java
+++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java
@@ -218,7 +218,7 @@ public abstract class SamlAuthenticator {
                         challenge = new AuthChallenge() {
                             @Override
                             public boolean challenge(HttpFacade exchange) {
-                                SamlAuthError error = new SamlAuthError(SamlAuthError.Reason.INVALID_SIGNATURE);
+                                SamlAuthenticationError error = new SamlAuthenticationError(SamlAuthenticationError.Reason.INVALID_SIGNATURE);
                                 exchange.getRequest().setError(error);
                                 exchange.getResponse().sendError(403);
                                 return true;
@@ -258,7 +258,7 @@ public abstract class SamlAuthenticator {
                     challenge = new AuthChallenge() {
                         @Override
                         public boolean challenge(HttpFacade exchange) {
-                            SamlAuthError error = new SamlAuthError(SamlAuthError.Reason.ERROR_STATUS, statusResponse);
+                            SamlAuthenticationError error = new SamlAuthenticationError(SamlAuthenticationError.Reason.ERROR_STATUS, statusResponse);
                             exchange.getRequest().setError(error);
                             exchange.getResponse().sendError(403);
                             return true;
@@ -299,7 +299,7 @@ public abstract class SamlAuthenticator {
             challenge = new AuthChallenge() {
                 @Override
                 public boolean challenge(HttpFacade exchange) {
-                    SamlAuthError error = new SamlAuthError(SamlAuthError.Reason.EXTRACTION_FAILURE);
+                    SamlAuthenticationError error = new SamlAuthenticationError(SamlAuthenticationError.Reason.EXTRACTION_FAILURE);
                     exchange.getRequest().setError(error);
                     exchange.getResponse().sendError(403);
                     return true;
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlAdapterTestStrategy.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlAdapterTestStrategy.java
index 1c57c4a..b63c960 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlAdapterTestStrategy.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/keycloaksaml/SamlAdapterTestStrategy.java
@@ -3,7 +3,7 @@ package org.keycloak.testsuite.keycloaksaml;
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.rules.ExternalResource;
-import org.keycloak.adapters.saml.SamlAuthError;
+import org.keycloak.adapters.saml.SamlAuthenticationError;
 import org.keycloak.adapters.saml.SamlPrincipal;
 import org.keycloak.admin.client.Keycloak;
 import org.keycloak.admin.client.resource.RealmResource;
@@ -121,8 +121,8 @@ public class SamlAdapterTestStrategy  extends ExternalResource {
         Assert.assertTrue(errorPage.contains("Error Page"));
         client.close();
         Assert.assertNotNull(ErrorServlet.authError);
-        SamlAuthError error = (SamlAuthError)ErrorServlet.authError;
-        Assert.assertEquals(SamlAuthError.Reason.ERROR_STATUS, error.getReason());
+        SamlAuthenticationError error = (SamlAuthenticationError)ErrorServlet.authError;
+        Assert.assertEquals(SamlAuthenticationError.Reason.ERROR_STATUS, error.getReason());
         Assert.assertNotNull(error.getStatus());
         ErrorServlet.authError = null;
 
@@ -404,8 +404,8 @@ public class SamlAdapterTestStrategy  extends ExternalResource {
         assertEquals(driver.getCurrentUrl(), APP_SERVER_BASE_URL + "/bad-realm-sales-post-sig/");
         System.out.println(driver.getPageSource());
         Assert.assertNotNull(ErrorServlet.authError);
-        SamlAuthError error = (SamlAuthError)ErrorServlet.authError;
-        Assert.assertEquals(SamlAuthError.Reason.INVALID_SIGNATURE, error.getReason());
+        SamlAuthenticationError error = (SamlAuthenticationError)ErrorServlet.authError;
+        Assert.assertEquals(SamlAuthenticationError.Reason.INVALID_SIGNATURE, error.getReason());
         ErrorServlet.authError = null;
     }