Fix unit tests

Author: Avery-Dunn

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

@@ -26,6 +26,12 @@ static MsalServiceException fromHttpResponse(IHttpResponse response) {
                 responseBody,
                 ErrorResponse.class);
 
+        if (errorResponse.error() != null &&
+                errorResponse.error().equalsIgnoreCase(AuthenticationErrorCode.INVALID_GRANT) && isInteractionRequired(errorResponse.subError)) {
+            return new MsalInteractionRequiredException(errorResponse, response.headers());
+        }
+
+
         if (!StringHelper.isBlank(errorResponse.error()) && !StringHelper.isBlank(errorResponse.errorDescription)) {
 
             errorResponse.statusCode(response.statusCode());

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

@@ -4,7 +4,6 @@
 package com.microsoft.aad.msal4j;
 
 import com.nimbusds.oauth2.sdk.ParseException;
-import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import com.nimbusds.oauth2.sdk.util.JSONObjectUtils;
 import net.minidev.json.JSONObject;
 import org.json.JSONException;
@@ -154,12 +153,12 @@ public void tokenCacheEntitiesFormatTest(String folder) throws URISyntaxExceptio
         TokenRequestExecutor request = spy(new TokenRequestExecutor(
                 new AADAuthority(new URL(AUTHORIZE_REQUEST_URL)), msalRequest, serviceBundle));
         OAuthHttpRequest msalOAuthHttpRequest = mock(OAuthHttpRequest.class);
-        HTTPResponse httpResponse = mock(HTTPResponse.class);
+        HttpResponse httpResponse = mock(HttpResponse.class);
 
         doReturn(msalOAuthHttpRequest).when(request).createOauthHttpRequest();
         doReturn(httpResponse).when(msalOAuthHttpRequest).send();
-        doReturn(200).when(httpResponse).getStatusCode();
-        doReturn(JSONObjectUtils.parse(tokenResponse)).when(httpResponse).getContentAsJSONObject();
+        doReturn(200).when(httpResponse).statusCode();
+        doReturn(JSONObjectUtils.parse(tokenResponse)).when(httpResponse).getBodyAsJson();
 
         final AuthenticationResult result = request.executeTokenRequest();
 

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

@@ -5,7 +5,6 @@
 
 import com.nimbusds.oauth2.sdk.ParseException;
 import com.nimbusds.oauth2.sdk.SerializeException;
-import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import com.nimbusds.oauth2.sdk.util.JSONObjectUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -43,7 +42,8 @@ void executeOAuthRequest_SCBadRequestErrorInvalidGrant_InteractionRequiredExcept
 
         OAuthHttpRequest msalOAuthHttpRequest = mock(OAuthHttpRequest.class);
 
-        HTTPResponse httpResponse = new HTTPResponse(HTTPResponse.SC_BAD_REQUEST);
+        HttpResponse httpResponse = new HttpResponse();
+        httpResponse.statusCode(HttpHelper.HTTP_STATUS_400);
 
         String claims = "{\\\"access_token\\\":{\\\"polids\\\":{\\\"essential\\\":true,\\\"values\\\":[\\\"5ce770ea-8690-4747-aa73-c5b3cd509cd4\\\"]}}}";
 
@@ -55,8 +55,8 @@ void executeOAuthRequest_SCBadRequestErrorInvalidGrant_InteractionRequiredExcept
                 "\"correlation_id\":\"3a...95a\"," +
                 "\"suberror\":\"basic_action\"," +
                 "\"claims\":\"" + claims + "\"}";
-        httpResponse.setContent(content);
-        httpResponse.setContentType(HTTPContentType.ApplicationJSON.contentType);
+        httpResponse.body(content);
+        httpResponse.addHeader("Content-Type", HTTPContentType.ApplicationJSON.contentType);
 
         doReturn(msalOAuthHttpRequest).when(request).createOauthHttpRequest();
         doReturn(httpResponse).when(msalOAuthHttpRequest).send();
@@ -79,7 +79,8 @@ void executeOAuthRequest_SCBadRequestErrorInvalidGrant_SubErrorFilteredServiceEx
 
         OAuthHttpRequest msalOAuthHttpRequest = mock(OAuthHttpRequest.class);
 
-        HTTPResponse httpResponse = new HTTPResponse(HTTPResponse.SC_BAD_REQUEST);
+        HttpResponse httpResponse = new HttpResponse();
+        httpResponse.statusCode(HttpHelper.HTTP_STATUS_400);
 
         String claims = "{\\\"access_token\\\":{\\\"polids\\\":{\\\"essential\\\":true,\\\"values\\\":[\\\"5ce770ea-8690-4747-aa73-c5b3cd509cd4\\\"]}}}";
 
@@ -91,8 +92,8 @@ void executeOAuthRequest_SCBadRequestErrorInvalidGrant_SubErrorFilteredServiceEx
                 "\"correlation_id\":\"3a...95a\"," +
                 "\"suberror\":\"client_mismatch\"," +
                 "\"claims\":\"" + claims + "\"}";
-        httpResponse.setContent(content);
-        httpResponse.setContentType(HTTPContentType.ApplicationJSON.contentType);
+        httpResponse.body(content);
+        httpResponse.addHeader("Content-Type", HTTPContentType.ApplicationJSON.contentType);
 
         doReturn(msalOAuthHttpRequest).when(request).createOauthHttpRequest();
         doReturn(httpResponse).when(msalOAuthHttpRequest).send();
@@ -181,7 +182,7 @@ void testToOAuthRequestNonEmptyCorrelationId()
     @Test
     void testToOAuthRequestNullCorrelationId_NullClientAuth()
             throws MalformedURLException, SerializeException,
-            URISyntaxException, ParseException {
+            URISyntaxException {
 
         PublicClientApplication app = PublicClientApplication.builder("id").correlationId("corr-id").build();
 
@@ -230,15 +231,13 @@ void testExecuteOAuth_Success() throws SerializeException, ParseException, MsalE
 
         final OAuthHttpRequest msalOAuthHttpRequest = mock(OAuthHttpRequest.class);
 
-        final HTTPResponse httpResponse = mock(HTTPResponse.class);
+        final HttpResponse httpResponse = mock(HttpResponse.class);
 
         doReturn(msalOAuthHttpRequest).when(request).createOauthHttpRequest();
         doReturn(httpResponse).when(msalOAuthHttpRequest).send();
-        doReturn(JSONObjectUtils.parse(TestConfiguration.TOKEN_ENDPOINT_OK_RESPONSE)).when(httpResponse).getContentAsJSONObject();
-
-        httpResponse.ensureStatusCode(200);
+        doReturn(JSONObjectUtils.parse(TestConfiguration.TOKEN_ENDPOINT_OK_RESPONSE)).when(httpResponse).getBodyAsJson();
 
-        doReturn(200).when(httpResponse).getStatusCode();
+        doReturn(200).when(httpResponse).statusCode();
 
         final AuthenticationResult result = request.executeTokenRequest();
 
@@ -275,22 +274,21 @@ void testExecuteOAuth_Failure() throws SerializeException,
                 new AADAuthority(new URL(TestConstants.ORGANIZATIONS_AUTHORITY)), acr, serviceBundle));
         final OAuthHttpRequest msalOAuthHttpRequest = mock(OAuthHttpRequest.class);
 
-        final HTTPResponse httpResponse = mock(HTTPResponse.class);
+        final HttpResponse httpResponse = mock(HttpResponse.class);
 
         doReturn(msalOAuthHttpRequest).when(request).createOauthHttpRequest();
         doReturn(httpResponse).when(msalOAuthHttpRequest).send();
-        lenient().doReturn(402).when(httpResponse).getStatusCode();
-        doReturn("403 Forbidden").when(httpResponse).getStatusMessage();
-        doReturn(new HashMap<>()).when(httpResponse).getHeaderMap();
-        doReturn(TestConfiguration.HTTP_ERROR_RESPONSE).when(httpResponse).getContent();
+        lenient().doReturn(402).when(httpResponse).statusCode();
+        doReturn(new HashMap<>()).when(httpResponse).headers();
+        doReturn(TestConfiguration.HTTP_ERROR_RESPONSE).when(httpResponse).body();
 
         final ErrorResponse errorResponse = mock(ErrorResponse.class);
 
         lenient().doReturn("invalid_request").when(errorResponse).error();
-        lenient().doReturn(null).when(httpResponse).getHeaderValue("User-Agent");
-        lenient().doReturn(null).when(httpResponse).getHeaderValue("x-ms-request-id");
-        lenient().doReturn(null).when(httpResponse).getHeaderValue("x-ms-clitelem");
-        doReturn(402).when(httpResponse).getStatusCode();
+        lenient().doReturn(null).when(httpResponse).getHeader("User-Agent");
+        lenient().doReturn(null).when(httpResponse).getHeader("x-ms-request-id");
+        lenient().doReturn(null).when(httpResponse).getHeader("x-ms-clitelem");
+        doReturn(402).when(httpResponse).statusCode();
 
         assertThrows(MsalException.class, request::executeTokenRequest);
     }