Remove support for setting query parameters for the tokens endpoint (#3669)

Co-authored-by: Harsh <[email protected]>

Author: mattcreaser

aws-android-sdk-mobile-client/src/main/java/com/amazonaws/mobile/client/AWSMobileClient.java

@@ -3359,18 +3359,6 @@ public void run() {
                         return;
                     }
                 }
-                if (hostedUIOptions.getTokenQueryParameters() != null) {
-                    try {
-                    JSONObject tokenParams = new JSONObject();
-                    for (Map.Entry<String, String> e : hostedUIOptions.getTokenQueryParameters().entrySet()) {
-                            tokenParams.put(e.getKey(), e.getValue());
-                    }
-                    hostedUIJSON.put("TokenQueryParameters", tokenParams);
-                    } catch (JSONException e1) {
-                        callback.onError(new Exception("Failed to construct token query parameters", e1));
-                        return;
-                    }
-                }
 
                 mStore.set(HOSTED_UI_KEY, hostedUIJSON.toString());
 
@@ -3389,21 +3377,15 @@ public void run() {
                     throw new RuntimeException("Failed to construct authorization url for OAuth", e);
                 }
 
-                Uri.Builder tokensUriBuilder;
+                final Uri tokensUri;
                 final Map<String, String> tokensBody = new HashMap<String, String>();
                 try {
-                    tokensUriBuilder = Uri.parse(hostedUIJSON.getString("TokenURI")).buildUpon();
-                    if (hostedUIOptions.getTokenQueryParameters() != null) {
-                        for (Map.Entry<String, String> e : hostedUIOptions.getTokenQueryParameters().entrySet()) {
-                            tokensUriBuilder.appendQueryParameter(e.getKey(), e.getValue());
-                        }
-                    }
+                    tokensUri = Uri.parse(hostedUIJSON.getString("TokenURI"));
                     tokensBody.put("client_id", hostedUIJSON.getString("AppClientId"));
                     tokensBody.put("redirect_uri", hostedUIJSON.getString("SignInRedirectURI"));
                 } catch (Exception e) {
                     throw new RuntimeException("Failed to construct tokens url for OAuth", e);
                 }
-                final Uri tokensUri = tokensUriBuilder.build();
 
                 mOAuth2Client.authorize(authorizeUriBuilder.build(), new Callback<AuthorizeResponse>() {
                     @Override
@@ -3492,18 +3474,6 @@ public void run() {
                         return;
                     }
                 }
-                if (hostedUIOptions.getTokenQueryParameters() != null) {
-                    try {
-                        JSONObject tokenParams = new JSONObject();
-                        for (Map.Entry<String, String> e : hostedUIOptions.getTokenQueryParameters().entrySet()) {
-                            tokenParams.put(e.getKey(), e.getValue());
-                        }
-                        hostedUIJSON.put("TokenQueryParameters", tokenParams);
-                    } catch (JSONException e1) {
-                        callback.onError(new Exception("Failed to construct token query parameters", e1));
-                        return;
-                    }
-                }
 
                 mStore.set(HOSTED_UI_KEY, hostedUIJSON.toString());
 

aws-android-sdk-mobile-client/src/main/java/com/amazonaws/mobile/client/HostedUIOptions.java

@@ -38,10 +38,6 @@ public Map<String, String> getSignOutQueryParameters() {
         return builder.signOutQueryParameters;
     }
 
-    public Map<String, String> getTokenQueryParameters() {
-        return builder.tokenQueryParameters;
-    }
-
     public static Builder builder() {
         return new Builder();
     }
@@ -54,7 +50,6 @@ public static class Builder {
         private String federationProviderName;
         private Map<String, String> signInQueryParameters;
         private Map<String, String> signOutQueryParameters;
-        private Map<String, String> tokenQueryParameters;
 
         public Builder() { }
 
@@ -68,11 +63,6 @@ public Builder signOutQueryParameters(final Map<String, String> signOutQueryPara
             return this;
         }
 
-        public Builder tokenQueryParameters(final Map<String, String> tokenQueryParameters) {
-            this.tokenQueryParameters = tokenQueryParameters;
-            return this;
-        }
-
         public Builder scopes(final String... scopes) {
             this.scopes = scopes;
             return this;