switch to resteasy client

Author: vramik

pom.xml

@@ -27,7 +27,6 @@
         <version.wicket.cdi>6.0</version.wicket.cdi>
         <version.keycloak>1.1.0.Final</version.keycloak>
 
-
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
         <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
 
@@ -381,24 +380,6 @@
         </dependency>
         -->
 
-        <!-- PicketBox, PicketLink - for login attempts -->
-<!--        <dependency>
-            <groupId>org.picketbox</groupId>
-            <artifactId>picketbox-core</artifactId>
-            <version>${version.picketbox}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.picketbox</groupId>
-            <artifactId>picketbox-http</artifactId>
-            <version>${version.picketbox}</version>
-        </dependency>        
-        <dependency>
-            <groupId>org.picketlink</groupId>
-            <artifactId>picketlink-idm-api</artifactId>
-            <version>3.0.0.Beta2</version>
-            <type>jar</type>
-        </dependency>-->
-
         <!-- Wicket -->
         <dependency>
             <groupId>org.apache.wicket</groupId>

src/main/java/com/issuetracker/web/security/KeycloakAuthSession.java

@@ -7,7 +7,7 @@
 import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.wicket.request.cycle.RequestCycle;
-import org.jboss.resteasy.logging.Logger;
+import org.jboss.logging.Logger;
 import org.keycloak.KeycloakSecurityContext;
 import org.keycloak.representations.AccessToken;
 import org.keycloak.representations.IDToken;

src/main/java/com/issuetracker/web/security/KeycloakService.java

@@ -1,72 +1,43 @@
 package com.issuetracker.web.security;
 
 import static com.issuetracker.web.Constants.SERVER_URL;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.keycloak.adapters.HttpClientBuilder;
 import static com.issuetracker.web.security.KeycloakAuthSession.*;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.client.jaxrs.ResteasyClient;
+import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.keycloak.KeycloakSecurityContext;
 import org.keycloak.representations.idm.RoleRepresentation;
-import org.keycloak.representations.idm.UserRepresentation;
-import org.keycloak.util.JsonSerialization;
 
 /**
  *
  * @author vramik
  */
 public class KeycloakService {
+    private static final Logger log = Logger.getLogger(KeycloakService.class);
 
-    private static class TypedListOfUser extends ArrayList<UserRepresentation> {
-    }
     private static class TypedSetOfRoles extends HashSet<RoleRepresentation> {
     }
 
-    public static class Failure extends Exception {
-        private final int status;
-
-        public Failure(int status) {
-            this.status = status;
-        }
+    private static class AuthHedersRequestFilter implements ClientRequestFilter {
 
-        public int getStatus() {
-            return status;
+        private final String tokenString;
+        
+        public AuthHedersRequestFilter(KeycloakSecurityContext session) {
+            tokenString = session.getTokenString();
         }
-    }
-    
-    public static List<UserRepresentation> getUsers() throws Failure {
-        HttpClient client = new HttpClientBuilder().disableTrustManager().build();
 
-        try {
-            HttpGet get = new HttpGet(SERVER_URL + "/auth/admin/realms/issue-tracker/users");
-            System.out.println("GET: " + get.toString());
-            KeycloakSecurityContext session = getKeycloakSecurityContext();
-            get.addHeader("Authorization", "Bearer " + session.getTokenString());
-            System.out.println("GET HEADER: " + Arrays.toString(get.getHeaders("Authorization")));
-            try {
-                HttpResponse response = client.execute(get);
-                if (response.getStatusLine().getStatusCode() != 200) {
-                    System.out.println("STATUS CODE: " + response.getStatusLine().getStatusCode());
-                    throw new Failure(response.getStatusLine().getStatusCode());
-                }
-                HttpEntity entity = response.getEntity();
-                try (InputStream is = entity.getContent()) {
-                    return JsonSerialization.readValue(is, TypedListOfUser.class);
-                }
-            } catch (IOException ex) {
-                throw new RuntimeException(ex);
-            }
-        } finally {
-            client.getConnectionManager().shutdown();
+        @Override
+        public void filter(ClientRequestContext requestContext) throws IOException {
+            requestContext.getHeaders().add("Authorization", "Bearer " + tokenString);
         }
     }
 
@@ -76,37 +47,26 @@ public static List<UserRepresentation> getUsers() throws Failure {
      * 
      */
     public static List<String> getRealmRoles() {
-        HttpClient client = new HttpClientBuilder().disableTrustManager().build();
+        Set<String> roles = new TreeSet<>();
+        roles.add("Public");
+        
+        KeycloakSecurityContext session = getKeycloakSecurityContext();
+        if (session == null) {
+            return new ArrayList<>(roles);
+        }
 
+        ResteasyClient client = new ResteasyClientBuilder().build();
+        client.register(new AuthHedersRequestFilter(session));
         try {
-            HttpGet get = new HttpGet(SERVER_URL + "/auth/admin/realms/issue-tracker/roles");
-            KeycloakSecurityContext session = getKeycloakSecurityContext();
-            if (session == null) {
-                return new ArrayList<>();
-            }
-            get.addHeader("Authorization", "Bearer " + session.getTokenString());
-            try {
-                HttpResponse response = client.execute(get);
-                if (response.getStatusLine().getStatusCode() != 200) {
-                    throw new Failure(response.getStatusLine().getStatusCode());
-                }
-                HttpEntity entity = response.getEntity();
-                try (InputStream is = entity.getContent()) {
-                    Set<String> roles = new TreeSet<>();
-                    for (RoleRepresentation role : JsonSerialization.readValue(is, TypedSetOfRoles.class)) {
-                        roles.add(role.getName());
-                    }
-                    roles.add("Public");
-                    return new ArrayList<>(roles);
-                }
-            } catch (IOException ex) {
-                throw new RuntimeException(ex);
-            } catch (Failure f) {
-                throw new RuntimeException("Returned status code: " + f.getStatus(), f);
+            TypedSetOfRoles typedSetOfRoles = client.target(SERVER_URL + "/auth/admin/realms/issue-tracker/roles").request().get(TypedSetOfRoles.class);
+        
+            for (RoleRepresentation typedSetOfRole : typedSetOfRoles) {
+                roles.add(typedSetOfRole.getName());
             }
-        } finally {
-            client.getConnectionManager().shutdown();
+        } catch (WebApplicationException e) {
+            //in case the response status code of the response returned by the server is not successful
         }
+        return new ArrayList<>(roles);
     }
 
 }