fix(auth-query-params): include auth query params in request (#96)

This commit fixes the problem of not including auth query parameters in the API request. Now request builder makes sure to include the query params specific to auth.

Author: sufyankhanrao

src/main/java/io/apimatic/core/HttpRequest.java

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -79,16 +80,24 @@ private HttpRequest(final GlobalConfiguration coreConfig, final String server,
             final ArraySerializationFormat arraySerializationFormat) throws IOException {
         this.coreConfig = coreConfig;
         this.compatibilityFactory = coreConfig.getCompatibilityFactory();
-        queryUrlBuilder = getStringBuilder(server, path, queryParams, arraySerializationFormat);
+        HttpHeaders requestHeaders = addHeaders(headerParams);
+        // Creating a basic request to provide it to auth instances
+        Request request = buildBasicRequest(httpMethod, requestHeaders);
+
+        applyAuthentication(request, authentication);
+        // include auth query parameters in request query params to have them in the query url
+        if (request.getQueryParameters() != null) {
+            queryParams.putAll(request.getQueryParameters());
+        }
 
+        queryUrlBuilder = getStringBuilder(server, path, queryParams, arraySerializationFormat);
         processTemplateParams(templateParams);
         Object bodyValue = buildBody(body, bodySerializer, bodyParameters);
         List<SimpleEntry<String, Object>> formFields =
                 generateFormFields(formParams, formParameters, arraySerializationFormat);
         coreHttpRequest =
-                buildRequest(httpMethod, bodyValue, addHeaders(headerParams), queryParams,
+                buildRequest(httpMethod, bodyValue, requestHeaders, queryParams,
                         formFields, arraySerializationFormat);
-        applyAuthentication(authentication);
     }
 
     /**
@@ -111,14 +120,26 @@ private Request buildRequest(
                 queryParams, formFields);
     }
 
-    private void applyAuthentication(Authentication authentication) {
+    /**
+     * Builds a request with minimal query parameters.
+     * @param httpMethod The request HTTP verb.
+     * @param headerParams The request header parameters.
+     * @return the {@link Request} instance.
+     */
+    private Request buildBasicRequest(Method httpMethod, HttpHeaders headerParams)
+            throws IOException {
+        return compatibilityFactory.createHttpRequest(httpMethod, null, headerParams,
+                new HashMap<String, Object>(), Collections.emptyList());
+    }
+
+    private void applyAuthentication(Request request, Authentication authentication) {
         if (authentication != null) {
             authentication.validate();
             if (!authentication.isValid()) {
                 throw new AuthValidationException(authentication.getErrorMessage());
             }
 
-            authentication.apply(coreHttpRequest);
+            authentication.apply(request);
         }
     }
 

src/test/java/apimatic/core/EndToEndTest.java

@@ -5,6 +5,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
@@ -519,6 +520,9 @@ private void prepareStub() throws IOException {
         when(getCompatibilityFactory().createHttpRequest(any(Method.class),
                 any(StringBuilder.class), any(HttpHeaders.class), anyMap(), anyList()))
                         .thenReturn(coreHttpRequest);
+        when(getCompatibilityFactory().createHttpRequest(any(Method.class),
+                nullable(StringBuilder.class), nullable(HttpHeaders.class), anyMap(), anyList()))
+            .thenReturn(coreHttpRequest);
         when(getCompatibilityFactory().createHttpContext(coreHttpRequest, response))
                 .thenReturn(context);
         when(context.getResponse()).thenReturn(response);

src/test/java/apimatic/core/RequestBuilderTest.java

@@ -7,6 +7,7 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.nullable;
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.anyMap;
 import static org.mockito.Mockito.anyList;
@@ -868,6 +869,10 @@ private void prepareCompatibilityStub() {
         when(getCompatibilityFactory().createHttpRequest(any(Method.class),
                 any(StringBuilder.class), any(HttpHeaders.class), anyMap(), anyList()))
                         .thenReturn(getCoreHttpRequest());
+
+        when(getCompatibilityFactory().createHttpRequest(any(Method.class),
+                nullable(StringBuilder.class), nullable(HttpHeaders.class), anyMap(), anyList()))
+            .thenReturn(getCoreHttpRequest());
     }
 
     private Employee getEmployeeModel() throws IOException {