Remove com.nimbusds's HTTPRequest, ClientAuthentication, and related classes

Avery-Dunn · Avery-Dunn · commit e5f8b533b144 · 2025-04-01T10:54:28.000-07:00
diff --git a/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/HttpResponse.java b/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/HttpResponse.java
@@ -3,6 +3,10 @@
 
 package com.microsoft.aad.msal4j;
 
+import com.nimbusds.oauth2.sdk.util.JSONObjectUtils;
+import net.minidev.json.JSONObject;
+import com.nimbusds.oauth2.sdk.ParseException;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -46,14 +50,26 @@ public void addHeaders(Map<String, List<String>> responseHeaders) {
         }
     }
 
-    private void addHeader(final String name, final String... values) {
+    void addHeader(final String name, final String... values) {
         if (values != null && values.length > 0) {
             headers.put(name, Arrays.asList(values));
         } else {
             headers.remove(name);
         }
     }
 
+    List<String> getHeader(String key) {
+        return headers.get(key);
+    }
+
+    JSONObject getBodyAsJson() {
+        try {
+            return JSONObjectUtils.parse(this.body());
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public int statusCode() {
         return this.statusCode;
     }
diff --git a/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/MsalServiceExceptionFactory.java b/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/MsalServiceExceptionFactory.java
@@ -3,8 +3,6 @@
 
 package com.microsoft.aad.msal4j;
 
-import com.nimbusds.oauth2.sdk.http.HTTPResponse;
-
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -14,37 +12,6 @@ class MsalServiceExceptionFactory {
     private MsalServiceExceptionFactory() {
     }
 
-    static MsalServiceException fromHttpResponse(HTTPResponse httpResponse) {
-
-        String responseContent = httpResponse.getContent();
-        if (responseContent == null || StringHelper.isBlank(responseContent)) {
-            return new MsalServiceException(
-                    String.format(
-                            "Unknown Service Exception. Service returned status code %s",
-                            httpResponse.getStatusCode()),
-                    AuthenticationErrorCode.UNKNOWN);
-        }
-
-        ErrorResponse errorResponse = JsonHelper.convertJsonToObject(
-                responseContent,
-                ErrorResponse.class);
-
-        errorResponse.statusCode(httpResponse.getStatusCode());
-        errorResponse.statusMessage(httpResponse.getStatusMessage());
-
-        if (errorResponse.error() != null &&
-                errorResponse.error().equalsIgnoreCase(AuthenticationErrorCode.INVALID_GRANT)) {
-
-            if (isInteractionRequired(errorResponse.subError)) {
-                return new MsalInteractionRequiredException(errorResponse, httpResponse.getHeaderMap());
-            }
-        }
-
-        return new MsalServiceException(
-                errorResponse,
-                httpResponse.getHeaderMap());
-    }
-
     static MsalServiceException fromHttpResponse(IHttpResponse response) {
         String responseBody = response.body();
         if (StringHelper.isBlank(responseBody)) {
diff --git a/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/OAuthHttpRequest.java b/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/OAuthHttpRequest.java
@@ -3,9 +3,6 @@
 
 package com.microsoft.aad.msal4j;
 
-import com.nimbusds.oauth2.sdk.ParseException;
-import com.nimbusds.oauth2.sdk.http.HTTPResponse;
-
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -35,7 +32,7 @@ class OAuthHttpRequest {
         this.serviceBundle = serviceBundle;
     }
 
-    public HTTPResponse send() throws IOException {
+    public HttpResponse send() throws IOException {
 
         Map<String, String> httpHeaders = configureHttpHeaders();
         HttpRequest httpRequest = new HttpRequest(
@@ -64,28 +61,24 @@ private Map<String, String> configureHttpHeaders() {
         return httpHeaders;
     }
 
-    private HTTPResponse createOauthHttpResponseFromHttpResponse(IHttpResponse httpResponse)
+    private HttpResponse createOauthHttpResponseFromHttpResponse(IHttpResponse httpResponse)
             throws IOException {
 
-        final HTTPResponse response = new HTTPResponse(httpResponse.statusCode());
+        final HttpResponse response = new HttpResponse();
+        response.statusCode(httpResponse.statusCode());
 
         final String location = HttpUtils.headerValue(httpResponse.headers(), "Location");
         if (!StringHelper.isBlank(location)) {
             try {
-                response.setLocation(new URI(location));
+                response.addHeader("Location", new URI(location).toString());
             } catch (URISyntaxException e) {
                 throw new IOException("Invalid location URI " + location, e);
             }
         }
 
-        try {
-            String contentType = HttpUtils.headerValue(httpResponse.headers(), "Content-Type");
-            if (!StringHelper.isBlank(contentType)) {
-                response.setContentType(contentType);
-            }
-        } catch (final ParseException e) {
-            throw new IOException("Couldn't parse Content-Type header: "
-                    + e.getMessage(), e);
+        String contentType = HttpUtils.headerValue(httpResponse.headers(), "Content-Type");
+        if (!StringHelper.isBlank(contentType)) {
+            response.addHeader("Content-Type", contentType);
         }
 
         Map<String, List<String>> headers = httpResponse.headers();
@@ -95,14 +88,14 @@ private HTTPResponse createOauthHttpResponseFromHttpResponse(IHttpResponse httpR
                 continue;
             }
 
-            String headerValue = response.getHeaderValue(header.getKey());
-            if (headerValue == null || StringHelper.isBlank(headerValue)) {
-                response.setHeader(header.getKey(), header.getValue().toArray(new String[0]));
+            List<String> headerValue = response.getHeader((header.getKey()));
+            if (headerValue == null) {
+                response.addHeader(header.getKey(), header.getValue().toArray(new String[0]));
             }
         }
 
         if (!StringHelper.isBlank(httpResponse.body())) {
-            response.setContent(httpResponse.body());
+            response.body(httpResponse.body());
         }
         return response;
     }
diff --git a/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/TokenRequestExecutor.java b/msal4j-sdk/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.HTTPResponse;
 import com.nimbusds.oauth2.sdk.util.URLUtils;
 import com.nimbusds.openid.connect.sdk.token.OIDCTokens;
 import org.slf4j.Logger;
@@ -37,7 +36,7 @@ AuthenticationResult executeTokenRequest() throws ParseException, IOException {
 
         log.debug("Sending token request to: {}", requestAuthority.canonicalAuthorityUrl());
         OAuthHttpRequest oAuthHttpRequest = createOauthHttpRequest();
-        HTTPResponse oauthHttpResponse = oAuthHttpRequest.send();
+        HttpResponse oauthHttpResponse = oAuthHttpRequest.send();
         return createAuthenticationResultFromOauthHttpResponse(oauthHttpResponse);
     }
 
@@ -116,10 +115,10 @@ private void addJWTBearerAssertionParams(Map<String, List<String>> queryParamete
     }
 
     private AuthenticationResult createAuthenticationResultFromOauthHttpResponse(
-            HTTPResponse oauthHttpResponse) throws ParseException {
+            HttpResponse oauthHttpResponse) throws ParseException {
         AuthenticationResult result;
 
-        if (oauthHttpResponse.getStatusCode() == HTTPResponse.SC_OK) {
+        if (oauthHttpResponse.statusCode() == HttpHelper.HTTP_STATUS_200) {
             final TokenResponse response = TokenResponse.parseHttpResponse(oauthHttpResponse);
 
             OIDCTokens tokens = response.getOIDCTokens();
@@ -180,7 +179,7 @@ private AuthenticationResult createAuthenticationResultFromOauthHttpResponse(
 
         } else {
             // http codes indicating that STS did not log request
-            if (oauthHttpResponse.getStatusCode() == HttpHelper.HTTP_STATUS_429 || oauthHttpResponse.getStatusCode() >= HttpHelper.HTTP_STATUS_500) {
+            if (oauthHttpResponse.statusCode() == HttpHelper.HTTP_STATUS_429 || oauthHttpResponse.statusCode() >= HttpHelper.HTTP_STATUS_500) {
                 serviceBundle.getServerSideTelemetry().previousRequests.putAll(
                         serviceBundle.getServerSideTelemetry().previousRequestInProgress);
             }
diff --git a/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/TokenResponse.java b/msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/TokenResponse.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.token.AccessToken;
 import com.nimbusds.oauth2.sdk.token.RefreshToken;
 import com.nimbusds.oauth2.sdk.util.JSONObjectUtils;
@@ -33,11 +32,13 @@ class TokenResponse extends OIDCTokenResponse {
         this.foci = foci;
     }
 
-    static TokenResponse parseHttpResponse(final HTTPResponse httpResponse) throws ParseException {
+    static TokenResponse parseHttpResponse(final HttpResponse httpResponse) throws ParseException {
 
-        httpResponse.ensureStatusCode(HTTPResponse.SC_OK);
+        if (httpResponse.statusCode() != HttpHelper.HTTP_STATUS_200) {
+            throw MsalServiceExceptionFactory.fromHttpResponse(httpResponse);
+        }
 
-        final JSONObject jsonObject = httpResponse.getContentAsJSONObject();
+        final JSONObject jsonObject = httpResponse.getBodyAsJson();
 
         return parseJsonObject(jsonObject);
     }
