Merge branch 'avdunn/nimbus-removal' of https://github.com/AzureAD/microsoft-authentication-library-for-java into avdunn/nimbus-utils

# Conflicts:
#	msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/HelperAndUtilityTests.java

Author: Avery-Dunn

README.md

@@ -16,7 +16,7 @@ Quick links:
 The library supports the following Java environments:
 - Java 8 (or higher)
 
-Current version - 1.20.0
+Current version - 1.20.1
 
 You can find the changes for each version in the [change log](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/main/msal4j-sdk/changelog.txt).
 
@@ -28,13 +28,13 @@ Find [the latest package in the Maven repository](https://mvnrepository.com/arti
 <dependency>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>msal4j</artifactId>
-    <version>1.20.0</version>
+    <version>1.20.1</version>
 </dependency>
 ```
 ### Gradle
 
 ```gradle
-implementation group: 'com.microsoft.azure', name: 'com.microsoft.aad.msal4j', version: '1.20.0'
+implementation group: 'com.microsoft.azure', name: 'com.microsoft.aad.msal4j', version: '1.20.1'
 ```
 
 ## Usage

changelog.txt

@@ -1,3 +1,7 @@
+Version 1.20.1
+=============
+- Fix Base64URL decoding bug (#938)
+
 Version 1.20.0
 =============
 - Replace some usage of jackson-databind with azure-json (#918)

msal4j-sdk/README.md

@@ -16,7 +16,7 @@ Quick links:
 The library supports the following Java environments:
 - Java 8 (or higher)
 
-Current version - 1.20.0
+Current version - 1.20.1
 
 You can find the changes for each version in the [change log](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/master/changelog.txt).
 
@@ -28,13 +28,13 @@ Find [the latest package in the Maven repository](https://mvnrepository.com/arti
 <dependency>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>msal4j</artifactId>
-    <version>1.20.0</version>
+    <version>1.20.1</version>
 </dependency>
 ```
 ### Gradle
 
 ```gradle
-compile group: 'com.microsoft.azure', name: 'msal4j', version: '1.20.0'
+compile group: 'com.microsoft.azure', name: 'msal4j', version: '1.20.1'
 ```
 
 ## Usage

msal4j-sdk/bnd.bnd

@@ -1,2 +1,2 @@
-Export-Package: com.microsoft.aad.msal4j;version="1.20.0"
+Export-Package: com.microsoft.aad.msal4j;version="1.20.1"
 Automatic-Module-Name: com.microsoft.aad.msal4j

msal4j-sdk/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>msal4j</artifactId>
-	<version>1.20.0</version>
+	<version>1.20.1</version>
 	<packaging>jar</packaging>
 	<name>msal4j</name>
 	<description>

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

@@ -7,7 +7,6 @@
 import java.net.MalformedURLException;
 import java.net.Proxy;
 import java.net.URL;
-import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
@@ -134,22 +133,22 @@ public URL getAuthorizationRequestUrl(AuthorizationRequestUrlParameters paramete
 
         validateNotNull("parameters", parameters);
 
-        parameters.requestParameters.put("client_id", Collections.singletonList(this.clientId));
+        parameters.requestParameters.put("client_id", this.clientId);
 
         //If the client application has any client capabilities set, they must be merged into the claims parameter
         if (this.clientCapabilities != null) {
             if (parameters.requestParameters.containsKey("claims")) {
-                String claims = String.valueOf(parameters.requestParameters.get("claims").get(0));
+                String claims = String.valueOf(parameters.requestParameters.get("claims"));
                 String mergedClaimsCapabilities = JsonHelper.mergeJSONString(claims, this.clientCapabilities);
-                parameters.requestParameters.put("claims", Collections.singletonList(mergedClaimsCapabilities));
+                parameters.requestParameters.put("claims", mergedClaimsCapabilities);
             } else {
-                parameters.requestParameters.put("claims", Collections.singletonList(this.clientCapabilities));
+                parameters.requestParameters.put("claims", this.clientCapabilities);
             }
         }
 
         return parameters.createAuthorizationURL(
                 this.authenticationAuthority,
-                parameters.requestParameters());
+                parameters.requestParameters);
     }
 
     @Override

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

@@ -20,7 +20,7 @@ abstract class AbstractMsalAuthorizationGrant {
      *
      * @return A map contains the HTTP parameters
      */
-    abstract Map<String, List<String>> toParameters();
+    abstract Map<String, String> toParameters();
 
     static final String SCOPE_PARAM_NAME = "scope";
     static final String SCOPES_DELIMITER = " ";

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

@@ -3,8 +3,6 @@
 
 package com.microsoft.aad.msal4j;
 
-import com.nimbusds.jose.util.Base64URL;
-
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -75,7 +73,7 @@ private boolean IsUiRequiredCacheSupported() {
 
     private void processPasswordGrant(OAuthAuthorizationGrant authGrant) throws Exception {
 
-        //Additional processing is only needed if it's a password grant with a non-AAD authority
+        //Additional processing is only needed if it's a password grant with an AAD authority
         if (!(authGrant.getParamValue(GrantConstants.GRANT_TYPE_PARAMETER).equals(GrantConstants.PASSWORD))
                 || msalRequest.application().authenticationAuthority.authorityType != AuthorityType.AAD) {
             return;
@@ -101,24 +99,22 @@ private void processPasswordGrant(OAuthAuthorizationGrant authGrant) throws Exce
         }
     }
 
-    private Map<String, List<String>> getSAMLAuthGrantParameters(WSTrustResponse response) {
-        Map<String, List<String>> params = new LinkedHashMap<>();
+    private Map<String, String> getSAMLAuthGrantParameters(WSTrustResponse response) {
+        Map<String, String> params = new LinkedHashMap<>();
 
         if (response.isTokenSaml2()) {
-            params.put(GrantConstants.GRANT_TYPE_PARAMETER, Collections.singletonList(GrantConstants.SAML_2_BEARER));
+            params.put(GrantConstants.GRANT_TYPE_PARAMETER, GrantConstants.SAML_2_BEARER);
         } else {
-            params.put(GrantConstants.GRANT_TYPE_PARAMETER, Collections.singletonList(GrantConstants.SAML_1_1_BEARER));
+            params.put(GrantConstants.GRANT_TYPE_PARAMETER, GrantConstants.SAML_1_1_BEARER);
         }
 
-        params.put(GrantConstants.ASSERTION_PARAMETER, Collections.singletonList(new Base64URL(
-                Base64.getEncoder().encodeToString(response.getToken()
-                        .getBytes(StandardCharsets.UTF_8))).toString()));
+        params.put(GrantConstants.ASSERTION_PARAMETER, Base64.getUrlEncoder().encodeToString(response.getToken().getBytes(StandardCharsets.UTF_8)));
 
         return params;
     }
 
-    private Map<String, List<String>> getAuthorizationGrantIntegrated(String userName) throws Exception {
-        Map<String, List<String>> params;
+    private Map<String, String> getAuthorizationGrantIntegrated(String userName) throws Exception {
+        Map<String, String> params;
 
         String userRealmEndpoint = this.clientApplication.authenticationAuthority.
                 getUserRealmEndpoint(URLEncoder.encode(userName, StandardCharsets.UTF_8.name()));

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

@@ -31,8 +31,8 @@ public void createManagedIdentityRequest(String resource) {
         managedIdentityRequest.headers.put(SECRET_HEADER_NAME, identityHeader);
 
         managedIdentityRequest.queryParameters = new HashMap<>();
-        managedIdentityRequest.queryParameters.put("api-version", Collections.singletonList(APP_SERVICE_MSI_API_VERSION));
-        managedIdentityRequest.queryParameters.put("resource", Collections.singletonList(resource));
+        managedIdentityRequest.queryParameters.put("api-version", APP_SERVICE_MSI_API_VERSION);
+        managedIdentityRequest.queryParameters.put("resource", resource);
 
         if (this.idType != null && !StringHelper.isNullOrBlank(this.userAssignedId)) {
             LOG.info("[Managed Identity] Adding user assigned ID to the request for App Service Managed Identity.");

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

@@ -17,17 +17,17 @@ class AuthorizationCodeRequest extends MsalRequest {
     }
 
     private static AbstractMsalAuthorizationGrant createMsalGrant(AuthorizationCodeParameters parameters) {
-        Map<String, List<String>> params = new LinkedHashMap<>();
+        Map<String, String> params = new LinkedHashMap<>();
 
-        params.put(GrantConstants.GRANT_TYPE_PARAMETER, Collections.singletonList(GrantConstants.AUTHORIZATION_CODE));
-        params.put("code", Collections.singletonList(parameters.authorizationCode()));
+        params.put(GrantConstants.GRANT_TYPE_PARAMETER, GrantConstants.AUTHORIZATION_CODE);
+        params.put("code", parameters.authorizationCode());
 
         if (parameters.redirectUri() != null) {
-            params.put("redirect_uri", Collections.singletonList(parameters.redirectUri().toString()));
+            params.put("redirect_uri", parameters.redirectUri().toString());
         }
 
         if (parameters.codeVerifier() != null) {
-            params.put("code_verifier", Collections.singletonList(parameters.codeVerifier()));
+            params.put("code_verifier", parameters.codeVerifier());
         }
 
         return new OAuthAuthorizationGrant(params, parameters.scopes(), parameters.claims());