Removing some and adding some params

Author: melissaahn

common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerRequest.java

@@ -143,13 +143,6 @@ private static final class SerializedNames {
     @SerializedName(SerializedNames.EXTRA_QUERY_STRING_PARAMETER)
     private String mExtraQueryStringParameter;
 
-    /**
-     * Extra token body parameters for the request.
-     */
-    @Nullable
-    @SerializedName(SerializedNames.EXTRA_TOKEN_BODY_PARAMETER)
-    private String mExtraTokenBodyParameter;
-
     /**
      * Extra options flags for the request.
      */
@@ -295,11 +288,4 @@ private static final class SerializedNames {
     @Nullable
     @SerializedName(SerializedNames.REQUEST_TYPE)
     private String mRequestType;
-
-    /**
-     * State for web apps requests. Make sure not to log this.
-     */
-    @Nullable
-    @SerializedName(SerializedNames.WEB_APPS_STATE)
-    private String mWebAppsState;
 }

common/src/main/java/com/microsoft/identity/common/internal/request/MsalBrokerRequestAdapter.java

@@ -83,8 +83,6 @@
 import com.microsoft.identity.common.logging.Logger;
 
 import java.io.IOException;
-import java.util.List;
-import java.util.Map;
 
 public class MsalBrokerRequestAdapter implements IBrokerRequestAdapter {
 
@@ -100,8 +98,6 @@ public BrokerRequest brokerRequestFromAcquireTokenParameters(@NonNull final Inte
                 : null;
         final String extraOptions = parameters.getExtraOptions() != null ?
                 QueryParamsAdapter._toJson(parameters.getExtraOptions()) : null;
-        final String extraTokenBodyParameters = parameters.getExtraTokenBodyParameters() != null ?
-                QueryParamsAdapter._toJson(parameters.getExtraTokenBodyParameters()) : null;
 
         final BrokerRequest.BrokerRequestBuilder brokerRequestBuilder = BrokerRequest.builder()
                 .authority(parameters.getAuthority().getAuthorityURL().toString())
@@ -113,7 +109,6 @@ public BrokerRequest brokerRequestFromAcquireTokenParameters(@NonNull final Inte
                 .userName(parameters.getLoginHint())
                 .extraQueryStringParameter(extraQueryStringParameter)
                 .extraOptions(extraOptions)
-                .extraTokenBodyParameter(extraTokenBodyParameters)
                 .prompt((OpenIdConnectPromptParameter.UNSET.name().equals(parameters.getPrompt().name())) ? null : parameters.getPrompt().name())
                 .claims(parameters.getClaimsRequestJson())
                 .forceRefresh(parameters.isForceRefresh())
@@ -148,7 +143,6 @@ public BrokerRequest brokerRequestFromAcquireTokenParameters(@NonNull final Inte
 
         if (parameters instanceof BrokerInteractiveTokenCommandParameters) {
             brokerRequestBuilder.requestType(((BrokerInteractiveTokenCommandParameters) parameters).getRequestType().name());
-            brokerRequestBuilder.webAppsState(((BrokerInteractiveTokenCommandParameters) parameters).getWebAppsState());
         }
 
         return brokerRequestBuilder.build();
@@ -190,16 +184,12 @@ public BrokerRequest brokerRequestFromSilentOperationParameters(@NonNull final S
         Logger.info(methodTag, "Constructing result bundle from AcquireTokenSilentOperationParameters.");
         final String extraOptions = parameters.getExtraOptions() != null ?
                 QueryParamsAdapter._toJson(parameters.getExtraOptions()) : null;
-        final List<Map.Entry<String, String>> extraTokenBodyParams = parameters.getExtraTokenBodyParameters();
-        final String extraTokenBodyParameters = extraTokenBodyParams != null ?
-                QueryParamsAdapter._toJson(extraTokenBodyParams) : null;
 
         final BrokerRequest.BrokerRequestBuilder brokerRequestBuilder = BrokerRequest.builder()
                 .authority(parameters.getAuthority().getAuthorityURL().toString())
                 .scope(TextUtils.join(" ", parameters.getScopes()))
                 .redirect(parameters.getRedirectUri())
                 .extraOptions(extraOptions)
-                .extraTokenBodyParameter(extraTokenBodyParameters)
                 .clientId(parameters.getClientId())
                 .childRedirectUri(parameters.getChildRedirectUri())
                 .childClientId(parameters.getChildClientId())

common/src/test/java/com/microsoft/identity/common/internal/request/MsalBrokerRequestAdapterTests.java

@@ -339,7 +339,6 @@ private void test_BrokerRequestFromAcquireTokenParametersInternal(final boolean
         assertEquals(params.getPrompt().name(), brokerRequest.getPrompt());
         assertEquals(params.isSuppressBrokerAccountPicker(), brokerRequest.isSuppressAccountPicker());
         assertNull(brokerRequest.getSignInWithGoogleCredential());
-        assertEquals(params.getExtraTokenBodyParameters(), QueryParamsAdapter._fromJson(brokerRequest.getExtraTokenBodyParameter()));
     }
 
     /**

common4j/src/main/com/microsoft/identity/common/java/commands/parameters/BrokerInteractiveTokenCommandParameters.java

@@ -86,6 +86,9 @@ public class BrokerInteractiveTokenCommandParameters extends InteractiveTokenCom
     // Optional field to persist state for WebApps interactive token requests.
     private final String webAppsState;
 
+    // Optional field to persist nonce for WebApps interactive token requests.
+    private final String webAppsNonce;
+
     @Override
     public void validate() throws ArgumentException, ClientException {
         super.validate();

common4j/src/main/com/microsoft/identity/common/java/commands/parameters/BrokerSilentTokenCommandParameters.java

@@ -67,6 +67,12 @@ public class BrokerSilentTokenCommandParameters extends SilentTokenCommandParame
     @Expose
     private final BrokerRequestType requestType;
 
+    // Optional field to persist state for WebApps interactive token requests.
+    private final String webAppsState;
+
+    // Optional field to persist nonce for WebApps interactive token requests.
+    private final String webAppsNonce;
+
     @Expose
     private final String homeTenantId;