Oauth url auth params fix (#180)

* Add url auth params to oauth methods
+ test
fixes descope/etc#10021

* Add missing import

* Fix url builder
fix javadocs

* Fix indentation

Author: aviadl

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.descope</groupId>
     <artifactId>java-sdk</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0.35</version>
+    <version>1.0.36</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Java library used to integrate with Descope.</description>
     <url>https://github.com/descope/descope-java</url>

src/main/java/com/descope/sdk/SdkServicesBase.java

@@ -15,7 +15,6 @@
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 
-
 public abstract class SdkServicesBase {
   protected final Client client;
 
@@ -40,9 +39,7 @@ protected URI getQueryParamUri(String path, Map<String, String> params) {
         if (sb.length() > 1) {
           sb.append('&');
         }
-        sb.append(
-            URLEncoder.encode(e.getKey(), "UTF-8")).append('=').append(
-            URLEncoder.encode(e.getValue(), "UTF-8"));
+        sb.append(URLEncoder.encode(e.getKey(), "UTF-8")).append('=').append(URLEncoder.encode(e.getValue(), "UTF-8"));
       }
       return UriUtils.getUri(client.getUri(), path.concat(sb.toString()));
     }
@@ -56,4 +53,26 @@ protected Token validateAndCreateToken(String jwt) {
     return JwtUtils.getToken(jwt, client);
   }
 
+  @SneakyThrows
+  protected String appendQueryParams(String url, Map<String, String> params) {
+    if (isNotEmpty(params)) {
+      URI oldUri = new URI(url);
+
+      String newQuery = oldUri.getQuery();
+      StringBuilder sb = new StringBuilder("");
+      if (newQuery != null) {
+        sb.append(newQuery);
+      }
+      for (Entry<String, String> e : params.entrySet()) {
+        if (sb.length() > 0) {
+          sb.append("&");
+        }
+        sb.append(URLEncoder.encode(e.getKey(), "UTF-8")).append('=').append(URLEncoder.encode(e.getValue(), "UTF-8"));
+      }
+
+      return new URI(oldUri.getScheme(), oldUri.getAuthority(), oldUri.getPath(), sb.toString(), oldUri.getFragment())
+          .toString();
+    }
+    return url;
+  }
 }

src/main/java/com/descope/sdk/auth/OAuthService.java

@@ -24,7 +24,7 @@ String start(String provider, String returnURL, LoginOptions loginOptions)
    * @param provider     - provider
    * @param returnURL    - return url
    * @param loginOptions - {@link LoginOptions loginOptions}
-   * @param authParams - additional query params to append to the return URL
+   * @param authParams - additional query params to append to the authorize URL
    * @return a string represent the redirect URL
    */
   String start(String provider, String returnURL, LoginOptions loginOptions, Map<String, String> authParams)
@@ -47,7 +47,7 @@ String startSignIn(String provider, String returnURL, LoginOptions loginOptions)
    * @param provider     - provider
    * @param returnURL    - return url
    * @param loginOptions - {@link LoginOptions loginOptions}
-   * @param authParams - additional query params to append to the return URL
+   * @param authParams - additional query params to append to the authorize URL
    * @return a string represent the redirect URL
    */
   String startSignIn(String provider, String returnURL, LoginOptions loginOptions, Map<String, String> authParams)
@@ -70,7 +70,7 @@ String startSignUp(String provider, String returnURL, LoginOptions loginOptions)
    * @param provider     - provider
    * @param returnURL    - return url
    * @param loginOptions - {@link LoginOptions loginOptions}
-   * @param authParams - additional query params to append to the return URL
+   * @param authParams - additional query params to append to the authorize URL
    * @return a string represent the redirect URL
    */
   String startSignUp(String provider, String returnURL, LoginOptions loginOptions, Map<String, String> authParams)
@@ -83,4 +83,4 @@ String startSignUp(String provider, String returnURL, LoginOptions loginOptions,
    * @return {@link AuthenticationInfo}
    */
   AuthenticationInfo exchangeToken(String code) throws DescopeException;
-}
+}

src/main/java/com/descope/sdk/auth/impl/OAuthServiceImpl.java

@@ -32,8 +32,8 @@ protected String startWithUrl(String url, String provider, String redirectURL, L
     ApiProxy apiProxy = getApiProxy();
     OAuthResponse res = apiProxy.post(oauthURL, loginOptions, OAuthResponse.class);
     url = res.getUrl();
-    URI resUrl = getQueryParamUri(url, authParams);
-    return resUrl.toString();
+    String resUrl = appendQueryParams(url, authParams);
+    return resUrl;
   }
 
   @Override

src/test/java/com/descope/sdk/auth/impl/OAuthServiceImplTest.java

@@ -59,7 +59,7 @@ void testStart() {
   @Test
   void testStartWithAuthParams() {
     ApiProxy apiProxy = mock(ApiProxy.class);
-    doReturn(new OAuthResponse(MOCK_URL)).when(apiProxy).post(any(), any(), any());
+    doReturn(new OAuthResponse(MOCK_URL + "?q=t")).when(apiProxy).post(any(), any(), any());
     try (MockedStatic<ApiProxyBuilder> mockedApiProxyBuilder = mockStatic(ApiProxyBuilder.class)) {
       mockedApiProxyBuilder.when(() -> ApiProxyBuilder.buildProxy(any(), any())).thenReturn(apiProxy);
       Map<String, String> params = mapOf("aa", "val1");