From ca60c283fcba019f7dd3c38262e6cdc82cea109e Mon Sep 17 00:00:00 2001 From: Marko Strukelj Date: Fri, 22 May 2015 19:16:34 +0200 Subject: [PATCH] Fix HttpClient issues in example demos on AS7 / Wildfly - don't use org.keycloak.adapter.HttpClientBuilder - it's Keycloak internals - don't use HttpClient 4.2 or 4.3 APIs (not default in AS7, and Wildfly 8) so way we can use the same jboss-deployment-structure.xml --- .../main/java/org/keycloak/example/AdminClient.java | 11 ++++------- .../main/java/org/keycloak/example/AdminClient.java | 5 ++--- .../org/keycloak/example/CustomerDatabaseClient.java | 7 ++----- .../keycloak/example/oauth/ProductDatabaseClient.java | 6 +++--- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java b/examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java index 8b3d40c4e2..24a5cd8e9f 100755 --- a/examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java +++ b/examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java @@ -7,10 +7,10 @@ import org.apache.http.client.HttpClient; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; import org.keycloak.OAuth2Constants; import org.keycloak.constants.ServiceUrlConstants; -import org.keycloak.adapters.HttpClientBuilder; import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.util.HostUtils; @@ -70,8 +70,7 @@ public class AdminClient { public static AccessTokenResponse getToken(HttpServletRequest request) throws IOException { - HttpClient client = new HttpClientBuilder() - .disableTrustManager().build(); + HttpClient client = new DefaultHttpClient(); try { @@ -104,8 +103,7 @@ public class AdminClient { public static void logout(HttpServletRequest request, AccessTokenResponse res) throws IOException { - HttpClient client = new HttpClientBuilder() - .disableTrustManager().build(); + HttpClient client = new DefaultHttpClient(); try { @@ -135,8 +133,7 @@ public class AdminClient { public static List getRealmRoles(HttpServletRequest request, AccessTokenResponse res) throws Failure { - HttpClient client = new HttpClientBuilder() - .disableTrustManager().build(); + HttpClient client = new DefaultHttpClient(); try { HttpGet get = new HttpGet(getBaseUrl(request) + "/auth/admin/realms/demo/roles"); get.addHeader("Authorization", "Bearer " + res.getToken()); diff --git a/examples/demo-template/customer-app/src/main/java/org/keycloak/example/AdminClient.java b/examples/demo-template/customer-app/src/main/java/org/keycloak/example/AdminClient.java index 7b17e18d53..c111f36e87 100755 --- a/examples/demo-template/customer-app/src/main/java/org/keycloak/example/AdminClient.java +++ b/examples/demo-template/customer-app/src/main/java/org/keycloak/example/AdminClient.java @@ -4,9 +4,9 @@ import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.DefaultHttpClient; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterUtils; -import org.keycloak.adapters.HttpClientBuilder; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.util.JsonSerialization; @@ -40,8 +40,7 @@ public class AdminClient { public static List getRealmRoles(HttpServletRequest req) throws Failure { KeycloakSecurityContext session = (KeycloakSecurityContext) req.getAttribute(KeycloakSecurityContext.class.getName()); - HttpClient client = new HttpClientBuilder() - .disableTrustManager().build(); + HttpClient client = new DefaultHttpClient(); try { HttpGet get = new HttpGet(AdapterUtils.getOriginForRestCalls(req.getRequestURL().toString(), session) + "/auth/admin/realms/demo/roles"); get.addHeader("Authorization", "Bearer " + session.getTokenString()); diff --git a/examples/demo-template/customer-app/src/main/java/org/keycloak/example/CustomerDatabaseClient.java b/examples/demo-template/customer-app/src/main/java/org/keycloak/example/CustomerDatabaseClient.java index 3a0409b9dc..e9dcbb1108 100755 --- a/examples/demo-template/customer-app/src/main/java/org/keycloak/example/CustomerDatabaseClient.java +++ b/examples/demo-template/customer-app/src/main/java/org/keycloak/example/CustomerDatabaseClient.java @@ -4,13 +4,11 @@ import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.DefaultHttpClient; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterUtils; -import org.keycloak.adapters.HttpClientBuilder; -import org.keycloak.constants.ServiceUrlConstants; import org.keycloak.representations.IDToken; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.KeycloakUriBuilder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -49,8 +47,7 @@ public class CustomerDatabaseClient { public static List getCustomers(HttpServletRequest req) throws Failure { KeycloakSecurityContext session = (KeycloakSecurityContext) req.getAttribute(KeycloakSecurityContext.class.getName()); - HttpClient client = new HttpClientBuilder() - .disableTrustManager().build(); + HttpClient client = new DefaultHttpClient(); try { HttpGet get = new HttpGet(AdapterUtils.getOriginForRestCalls(req.getRequestURL().toString(), session) + "/database/customers"); get.addHeader("Authorization", "Bearer " + session.getTokenString()); diff --git a/examples/demo-template/product-app/src/main/java/org/keycloak/example/oauth/ProductDatabaseClient.java b/examples/demo-template/product-app/src/main/java/org/keycloak/example/oauth/ProductDatabaseClient.java index f259d0c0c4..3e8634332e 100755 --- a/examples/demo-template/product-app/src/main/java/org/keycloak/example/oauth/ProductDatabaseClient.java +++ b/examples/demo-template/product-app/src/main/java/org/keycloak/example/oauth/ProductDatabaseClient.java @@ -4,9 +4,9 @@ import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.DefaultHttpClient; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterUtils; -import org.keycloak.adapters.HttpClientBuilder; import org.keycloak.util.JsonSerialization; import javax.servlet.http.HttpServletRequest; @@ -37,8 +37,8 @@ public class ProductDatabaseClient public static List getProducts(HttpServletRequest req) throws Failure { KeycloakSecurityContext session = (KeycloakSecurityContext)req.getAttribute(KeycloakSecurityContext.class.getName()); - HttpClient client = new HttpClientBuilder() - .disableTrustManager().build(); + + HttpClient client = new DefaultHttpClient(); try { HttpGet get = new HttpGet(AdapterUtils.getOriginForRestCalls(req.getRequestURL().toString(), session) + "/database/products"); get.addHeader("Authorization", "Bearer " + session.getTokenString());