Address PR feedback

Author: Avery-Dunn

msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/AcquireTokenByAuthorizationGrantSupplier.java

@@ -104,7 +104,7 @@ private OAuthAuthorizationGrant processPasswordGrant(
             Map<String, List<String>> params = getSAMLAuthGrantParameters(response);
             params.putAll(authGrant.toParameters());
 
-            authGrant = new OAuthAuthorizationGrant(params, null, null);
+            authGrant = new OAuthAuthorizationGrant(params, null);
         }
         return authGrant;
     }

msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/OAuthAuthorizationGrant.java

@@ -19,36 +19,45 @@ class OAuthAuthorizationGrant extends AbstractMsalAuthorizationGrant {
      *
      * @param params parameters relevant for the specific authorization grant type
      * @param scopes additional scopes which will be added to a default set of common scopes
-     * @param claims optional claims
      */
-    OAuthAuthorizationGrant(Map<String, List<String>> params, Set<String> scopes, ClaimsRequest claims) {
+    OAuthAuthorizationGrant(Map<String, List<String>> params, Set<String> scopes) {
         this.scopes = new HashSet<>(AbstractMsalAuthorizationGrant.COMMON_SCOPES);
 
         if (scopes != null) {
             this.scopes.addAll(scopes);
         }
 
+        // Default scopes that apply to most flows
         this.params.put(SCOPE_PARAM_NAME, Collections.singletonList(String.join(" ", this.scopes)));
+        // Parameter to request client info from the endpoint
+        this.params.put("client_info", Collections.singletonList("1"));
 
         if (params != null) {
             this.params.putAll(params);
         }
+    }
 
-        if (claims != null) {
-            this.claims = claims;
-            this.params.put("claims", Collections.singletonList(claims.formatAsJSONString()));
+        /**
+         * Constructor to create an OAuthAuthorizationGrant
+         *
+         * @param params parameters relevant for the specific authorization grant type
+         * @param scopes additional scopes which will be added to a default set of common scopes
+         * @param claims optional claims
+         */
+        OAuthAuthorizationGrant(Map<String, List<String>> params, Set<String> scopes, ClaimsRequest claims) {
+            this(params, scopes);
+
+            if (claims != null) {
+                this.claims = claims;
+                this.params.put("claims", Collections.singletonList(claims.formatAsJSONString()));
+            }
         }
-    }
 
     /**
-     * Returns an unmodifiable version of the parameters map, and adds the client_info parameter
+     * Returns an unmodifiable version of the parameters map
      */
     @Override
     public Map<String, List<String>> toParameters() {
-        final Map<String, List<String>> outParams = new LinkedHashMap<>(params);
-
-        outParams.put("client_info", Collections.singletonList("1"));
-
-        return Collections.unmodifiableMap(outParams);
+        return Collections.unmodifiableMap(new LinkedHashMap<>(params));
     }
 }

msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/OnBehalfOfRequest.java

@@ -29,7 +29,7 @@ private static OAuthAuthorizationGrant createAuthenticationGrant(OnBehalfOfParam
             params.put("claims", Collections.singletonList(parameters.claims().formatAsJSONString()));
         }
 
-        return new OAuthAuthorizationGrant(params, parameters.scopes(), null);
+        return new OAuthAuthorizationGrant(params, parameters.scopes());
     }
 
     OnBehalfOfParameters parameters() {

msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/MsalOauthAuthorizatonGrantTest.java

@@ -22,7 +22,7 @@ void testToParameters() {
         Map<String, List<String>> params = new LinkedHashMap<>();
         params.put(GrantConstants.GRANT_TYPE_PARAMETER, Collections.singletonList("SomeGrantType"));
 
-        final OAuthAuthorizationGrant grant = new OAuthAuthorizationGrant(params, null, null);
+        final OAuthAuthorizationGrant grant = new OAuthAuthorizationGrant(params, null);
 
         assertNotNull(grant);
         assertNotNull(grant.toParameters());