#448 Adding field filter option to get client by ID API (#449)

* Adding field filter option to get client by ID API

* Adding field filter option to get client by ID API

Author: bhatmadhavi

src/main/java/com/auth0/client/mgmt/ClientsEntity.java

@@ -1,6 +1,7 @@
 package com.auth0.client.mgmt;
 
 import com.auth0.client.mgmt.filter.ClientFilter;
+import com.auth0.client.mgmt.filter.FieldsFilter;
 import com.auth0.json.mgmt.client.Client;
 import com.auth0.json.mgmt.client.ClientsPage;
 import com.auth0.net.CustomRequest;
@@ -95,6 +96,33 @@ public Request<Client> get(String clientId) {
         return request;
     }
 
+    /**
+     * Request an Application. A token with scope read:clients is needed. If you also need the client_secret and encryption_key attributes the token must have read:client_keys scope.
+     * See https://auth0.com/docs/api/management/v2#!/Clients/get_clients_by_id
+     *
+     * @param clientId the application's client id.
+     * @param filter optional filter to restrict fields (to be included/excluded in response)
+     * @return a Request to execute.
+     */
+    public Request<Client> get(String clientId, FieldsFilter filter) {
+        Asserts.assertNotNull(clientId, "client id");
+
+        HttpUrl.Builder builder = baseUrl
+            .newBuilder()
+            .addPathSegments("api/v2/clients")
+            .addPathSegment(clientId);
+        if (filter != null) {
+            for (Map.Entry<String, Object> e : filter.getAsMap().entrySet()) {
+                builder.addQueryParameter(e.getKey(), String.valueOf(e.getValue()));
+            }
+        }
+        String url = builder.build().toString();
+        CustomRequest<Client> request = new CustomRequest<>(client, url, "GET", new TypeReference<Client>() {
+        });
+        request.addHeader("Authorization", "Bearer " + apiToken);
+        return request;
+    }
+
     /**
      * Create a new Application. A token with scope create:clients is needed.
      * See https://auth0.com/docs/api/management/v2#!/Clients/post_clients

src/test/java/com/auth0/client/mgmt/ClientsEntityTest.java

@@ -1,6 +1,7 @@
 package com.auth0.client.mgmt;
 
 import com.auth0.client.mgmt.filter.ClientFilter;
+import com.auth0.client.mgmt.filter.FieldsFilter;
 import com.auth0.json.mgmt.client.Client;
 import com.auth0.json.mgmt.client.ClientsPage;
 import com.auth0.net.Request;
@@ -175,6 +176,43 @@ public void shouldGetClient() throws Exception {
         assertThat(response, is(notNullValue()));
     }
 
+    @Test
+    public void shouldGetClientWithFilter() throws Exception {
+        FieldsFilter fieldsFilter = new FieldsFilter()
+            .withFields("name,client_id,app_type,tenant", true);
+
+        Request<Client> request = api.clients().get("1", fieldsFilter);
+        assertThat(request, is(notNullValue()));
+
+        server.jsonResponse(MGMT_CLIENT, 200);
+        Client response = request.execute();
+        RecordedRequest recordedRequest = server.takeRequest();
+
+        assertThat(recordedRequest, hasMethodAndPath("GET", "/api/v2/clients/1"));
+        assertThat(recordedRequest, hasHeader("Content-Type", "application/json"));
+        assertThat(recordedRequest, hasHeader("Authorization", "Bearer apiToken"));
+        assertThat(recordedRequest, hasQueryParameter("fields", "name,client_id,app_type,tenant"));
+        assertThat(recordedRequest, hasQueryParameter("include_fields", "true"));
+
+        assertThat(response, is(notNullValue()));
+    }
+
+    @Test
+    public void shouldGetClientWithNullFilter() throws Exception {
+        Request<Client> request = api.clients().get("1", null);
+        assertThat(request, is(notNullValue()));
+
+        server.jsonResponse(MGMT_CLIENT, 200);
+        Client response = request.execute();
+        RecordedRequest recordedRequest = server.takeRequest();
+
+        assertThat(recordedRequest, hasMethodAndPath("GET", "/api/v2/clients/1"));
+        assertThat(recordedRequest, hasHeader("Content-Type", "application/json"));
+        assertThat(recordedRequest, hasHeader("Authorization", "Bearer apiToken"));
+
+        assertThat(response, is(notNullValue()));
+    }
+
     @Test
     public void shouldThrowOnCreateClientWithNullData() {
         exception.expect(IllegalArgumentException.class);