Remove use of Nimbus Oauth2 SDK's CommonContentTypes (#322)

* Remove use of Nimbus Oauth2 SDK's CommonContentTypes

* Add enum for HTTP content-type constants

* Remove use of javax.mail.internet.ContentType

Author: Avery-Dunn

src/main/java/com/microsoft/aad/msal4j/ClientAuthenticationPost.java

@@ -8,12 +8,9 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.mail.internet.ContentType;
-
 import com.nimbusds.oauth2.sdk.SerializeException;
 import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
 import com.nimbusds.oauth2.sdk.auth.ClientAuthenticationMethod;
-import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
 import com.nimbusds.oauth2.sdk.http.HTTPRequest;
 import com.nimbusds.oauth2.sdk.id.ClientID;
 import com.nimbusds.oauth2.sdk.util.URLUtils;
@@ -40,15 +37,15 @@ public void applyTo(HTTPRequest httpRequest) throws SerializeException {
         if (httpRequest.getMethod() != HTTPRequest.Method.POST)
             throw new SerializeException("The HTTP request method must be POST");
 
-        ContentType ct = httpRequest.getContentType();
+        String ct = String.valueOf(httpRequest.getEntityContentType());
 
         if (ct == null)
             throw new SerializeException("Missing HTTP Content-Type header");
 
-        if (!ct.match(CommonContentTypes.APPLICATION_URLENCODED))
+        if (!ct.equals(HTTPContentType.ApplicationURLEncoded.contentType))
             throw new SerializeException(
                     "The HTTP Content-Type header must be "
-                            + CommonContentTypes.APPLICATION_URLENCODED);
+                    + HTTPContentType.ApplicationURLEncoded.contentType);
 
         Map<String, List<String>> params = httpRequest.getQueryParameters();
 

src/main/java/com/microsoft/aad/msal4j/HTTPContentType.java

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.aad.msal4j;
+
+/**
+ * Enum containing HTTP Content-Type header values
+ */
+enum HTTPContentType {
+
+    ApplicationURLEncoded("application/x-www-form-urlencoded; charset=UTF-8"),
+    ApplicationJSON("application/json; charset=UTF-8");
+
+    public final String contentType;
+
+    HTTPContentType(String contentType) {
+        this.contentType = contentType;
+    }
+}

src/main/java/com/microsoft/aad/msal4j/OAuthHttpRequest.java

@@ -4,7 +4,6 @@
 package com.microsoft.aad.msal4j;
 
 import com.nimbusds.oauth2.sdk.ParseException;
-import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
 import com.nimbusds.oauth2.sdk.http.HTTPRequest;
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import lombok.AccessLevel;
@@ -57,7 +56,7 @@ public HTTPResponse send() throws IOException {
     private Map<String, String> configureHttpHeaders(){
 
         Map<String, String> httpHeaders = new HashMap<>(extraHeaderParams);
-        httpHeaders.put("Content-Type", CommonContentTypes.APPLICATION_URLENCODED.toString());
+        httpHeaders.put("Content-Type", HTTPContentType.ApplicationURLEncoded.contentType);
 
         if (this.getAuthorization() != null) {
             httpHeaders.put("Authorization", this.getAuthorization());

src/main/java/com/microsoft/aad/msal4j/TokenRequestExecutor.java

@@ -5,7 +5,6 @@
 
 import com.nimbusds.oauth2.sdk.ParseException;
 import com.nimbusds.oauth2.sdk.SerializeException;
-import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
 import com.nimbusds.oauth2.sdk.http.HTTPRequest;
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import com.nimbusds.oauth2.sdk.util.URLUtils;
@@ -45,7 +44,7 @@ AuthenticationResult executeTokenRequest() throws ParseException,
         return createAuthenticationResultFromOauthHttpResponse(oauthHttpResponse);
     }
 
-    OAuthHttpRequest createOauthHttpRequest() throws SerializeException, MalformedURLException {
+    OAuthHttpRequest createOauthHttpRequest() throws SerializeException, MalformedURLException, ParseException {
 
         if (requestAuthority.tokenEndpointUrl() == null) {
             throw new SerializeException("The endpoint URI is not specified");
@@ -57,7 +56,7 @@ OAuthHttpRequest createOauthHttpRequest() throws SerializeException, MalformedUR
                 msalRequest.headers().getReadonlyHeaderMap(),
                 msalRequest.requestContext(),
                 this.serviceBundle);
-        oauthHttpRequest.setContentType(CommonContentTypes.APPLICATION_URLENCODED);
+        oauthHttpRequest.setContentType(HTTPContentType.ApplicationURLEncoded.contentType);
 
         final Map<String, List<String>> params = new HashMap<>(msalRequest.msalAuthorizationGrant().toParameters());
         if (msalRequest.application().clientCapabilities() != null) {

src/test/java/com/microsoft/aad/msal4j/DeviceCodeFlowTest.java

@@ -3,7 +3,6 @@
 
 package com.microsoft.aad.msal4j;
 
-import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
@@ -211,7 +210,7 @@ public void executeAcquireDeviceCode_AuthenticaionPendingErrorReturned_Authentic
                 "\"correlation_id\":\"ff60101b-cb23-4a52-82cb-9966f466327a\"}";
 
         httpResponse.setContent(content);
-        httpResponse.setContentType(CommonContentTypes.APPLICATION_JSON);
+        httpResponse.setContentType(HTTPContentType.ApplicationJSON.contentType);
 
         EasyMock.expect(request.createOauthHttpRequest()).andReturn(msalOAuthHttpRequest).times(1);
         EasyMock.expect(msalOAuthHttpRequest.send()).andReturn(httpResponse).times(1);

src/test/java/com/microsoft/aad/msal4j/TokenRequestExecutorTest.java

@@ -6,7 +6,6 @@
 import com.nimbusds.oauth2.sdk.ParseException;
 import com.nimbusds.oauth2.sdk.SerializeException;
 import com.nimbusds.oauth2.sdk.TokenErrorResponse;
-import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import com.nimbusds.oauth2.sdk.util.JSONObjectUtils;
 import org.easymock.EasyMock;
@@ -49,7 +48,7 @@ public void executeOAuthRequest_SCBadRequestErrorInvalidGrant_InteractionRequire
                 "\"suberror\":\"basic_action\"," +
                 "\"claims\":\"" + claims + "\"}";
         httpResponse.setContent(content);
-        httpResponse.setContentType(CommonContentTypes.APPLICATION_JSON);
+        httpResponse.setContentType(HTTPContentType.ApplicationJSON.contentType);
 
         EasyMock.expect(request.createOauthHttpRequest()).andReturn(msalOAuthHttpRequest).times(1);
         EasyMock.expect(msalOAuthHttpRequest.send()).andReturn(httpResponse).times(1);
@@ -88,7 +87,7 @@ public void executeOAuthRequest_SCBadRequestErrorInvalidGrant_SubErrorFilteredSe
                 "\"suberror\":\"client_mismatch\"," +
                 "\"claims\":\"" + claims + "\"}";
         httpResponse.setContent(content);
-        httpResponse.setContentType(CommonContentTypes.APPLICATION_JSON);
+        httpResponse.setContentType(HTTPContentType.ApplicationJSON.contentType);
 
         EasyMock.expect(request.createOauthHttpRequest()).andReturn(msalOAuthHttpRequest).times(1);
         EasyMock.expect(msalOAuthHttpRequest.send()).andReturn(httpResponse).times(1);
@@ -154,7 +153,7 @@ public void testConstructor() throws MalformedURLException,
 
     @Test
     public void testToOAuthRequestNonEmptyCorrelationId()
-            throws MalformedURLException, SerializeException, URISyntaxException {
+            throws MalformedURLException, SerializeException, URISyntaxException, ParseException {
 
         PublicClientApplication app = PublicClientApplication.builder("id").correlationId("corr-id").build();
 
@@ -183,7 +182,7 @@ public void testToOAuthRequestNonEmptyCorrelationId()
     @Test
     public void testToOAuthRequestNullCorrelationId_NullClientAuth()
             throws MalformedURLException, SerializeException,
-            URISyntaxException {
+            URISyntaxException, ParseException {
 
         PublicClientApplication app = PublicClientApplication.builder("id").correlationId("corr-id").build();