Merge branch 'nebharg/MSI' into nebharg/MsiAzureArc

Author: neha-bhargava

README.md

@@ -16,7 +16,7 @@ Quick links:
 The library supports the following Java environments:
 - Java 8 (or higher)
 
-Current version - 1.13.10
+Current version - 1.14.2-beta
 
 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.13.10</version>
+    <version>1.14.2-beta</version>
 </dependency>
 ```
 ### Gradle
 
 ```gradle
-implementation group: 'com.microsoft.azure', name: 'com.microsoft.aad.msal4j', version: '1.13.10'
+implementation group: 'com.microsoft.azure', name: 'com.microsoft.aad.msal4j', version: '1.14.2-beta'
 ```
 
 ## Usage

changelog.txt

@@ -1,3 +1,7 @@
+Version 1.14.2-beta
+=============
+- Add support for Managed Identity (#712)
+
 Version 1.13.10
 =============
 - Remove default HTTP timeout (#664)

msal4j-sdk/README.md

@@ -16,7 +16,7 @@ Quick links:
 The library supports the following Java environments:
 - Java 8 (or higher)
 
-Current version - 1.13.10
+Current version - 1.14.2-beta
 
 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.13.10</version>
+    <version>1.14.2-beta</version>
 </dependency>
 ```
 ### Gradle
 
 ```gradle
-compile group: 'com.microsoft.azure', name: 'msal4j', version: '1.13.10'
+compile group: 'com.microsoft.azure', name: 'msal4j', version: '1.14.2-beta'
 ```
 
 ## Usage

msal4j-sdk/bnd.bnd

@@ -1,2 +1,2 @@
-Export-Package: com.microsoft.aad.msal4j;version="1.13.10"
+Export-Package: com.microsoft.aad.msal4j;version="1.14.2-beta"
 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.13.10</version>
+	<version>1.14.2-beta</version>
 	<packaging>jar</packaging>
 	<name>msal4j</name>
 	<description>

msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AcquireTokenSilentIT.java

@@ -69,6 +69,8 @@ void acquireTokenSilent_LabAuthority_TokenNotRefreshed(String environment) throw
         // Check that access and id tokens are coming from cache
         assertEquals(result.accessToken(), acquireSilentResult.accessToken());
         assertEquals(result.idToken(), acquireSilentResult.idToken());
+        assertEquals(TokenSource.IDENTITY_PROVIDER, result.metadata().tokenSource());
+        assertEquals(TokenSource.CACHE, acquireSilentResult.metadata().tokenSource());
     }
 
     @ParameterizedTest
@@ -92,6 +94,8 @@ void acquireTokenSilent_ForceRefresh(String environment) throws Exception {
 
         // Check that new refresh and id tokens are being returned
         assertTokensAreNotEqual(result, resultAfterRefresh);
+        assertEquals(TokenSource.IDENTITY_PROVIDER, result.metadata().tokenSource());
+        assertEquals(TokenSource.IDENTITY_PROVIDER, resultAfterRefresh.metadata().tokenSource());
     }
 
     @ParameterizedTest
@@ -253,6 +257,8 @@ void acquireTokenSilent_WithRefreshOn(String environment) throws Exception {
         //Current time is after refreshOn, so token should be refreshed
         assertNotNull(resultSilentWithRefreshOn);
         assertTokensAreNotEqual(resultSilent, resultSilentWithRefreshOn);
+        assertEquals(TokenSource.CACHE, resultSilent.metadata().tokenSource());
+        assertEquals(TokenSource.IDENTITY_PROVIDER, resultSilentWithRefreshOn.metadata().tokenSource());
     }
 
     @ParameterizedTest

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

@@ -64,29 +64,35 @@ static InstanceDiscoveryMetadataEntry getMetadataEntry(URL authorityUrl,
                                                            ServiceBundle serviceBundle) {
         String host = authorityUrl.getHost();
 
-        if (shouldUseRegionalEndpoint(msalRequest)) {
+        if (msalRequest.application() instanceof AbstractClientApplicationBase && shouldUseRegionalEndpoint(msalRequest)) {
             //Server side telemetry requires the result from region discovery when any part of the region API is used
             String detectedRegion = discoverRegion(msalRequest, serviceBundle);
 
-            if (msalRequest.application().azureRegion() != null) {
-                host = getRegionalizedHost(authorityUrl.getHost(), msalRequest.application().azureRegion());
+            if (((AbstractClientApplicationBase) msalRequest.application()).azureRegion() != null) {
+                host = getRegionalizedHost(authorityUrl.getHost(),
+                        ((AbstractClientApplicationBase) msalRequest.application()).azureRegion());
             }
 
             //If region autodetection is enabled and a specific region not already set,
             // set the application's region to the discovered region so that future requests can skip the IMDS endpoint call
-            if (null == msalRequest.application().azureRegion() && msalRequest.application().autoDetectRegion()
+            if (null == ((AbstractClientApplicationBase) msalRequest.application()).azureRegion()
+                    && ((AbstractClientApplicationBase) msalRequest.application()).autoDetectRegion()
                     && null != detectedRegion) {
-                msalRequest.application().azureRegion = detectedRegion;
+                ((AbstractClientApplicationBase) msalRequest.application()).azureRegion = detectedRegion;
             }
-            cacheRegionInstanceMetadata(authorityUrl.getHost(), msalRequest.application().azureRegion());
+            cacheRegionInstanceMetadata(authorityUrl.getHost(), ((AbstractClientApplicationBase) msalRequest.application()).azureRegion());
             serviceBundle.getServerSideTelemetry().getCurrentRequest().regionOutcome(
-                    determineRegionOutcome(detectedRegion, msalRequest.application().azureRegion(), msalRequest.application().autoDetectRegion()));
+                    determineRegionOutcome(detectedRegion,
+                            ((AbstractClientApplicationBase) msalRequest.application()).azureRegion(),
+                            ((AbstractClientApplicationBase) msalRequest.application()).autoDetectRegion()));
         }
 
         InstanceDiscoveryMetadataEntry result = cache.get(host);
 
         if (result == null) {
-            if(msalRequest.application().instanceDiscovery() && !instanceDiscoveryFailed){
+            if(msalRequest.application() instanceof AbstractClientApplicationBase &&
+                    ((AbstractClientApplicationBase) msalRequest.application()).instanceDiscovery()
+                    && !instanceDiscoveryFailed){
                 doInstanceDiscoveryAndCache(authorityUrl, validateAuthority, msalRequest, serviceBundle);
             } else {
                 // instanceDiscovery flag is set to False. Do not perform instanceDiscovery.
@@ -145,7 +151,8 @@ static void cacheInstanceDiscoveryMetadata(String host,
 
 
     private static boolean shouldUseRegionalEndpoint(MsalRequest msalRequest){
-        if (msalRequest.application().azureRegion() != null || msalRequest.application().autoDetectRegion()){
+        if (((AbstractClientApplicationBase) msalRequest.application()).azureRegion() != null
+                || ((AbstractClientApplicationBase) msalRequest.application()).autoDetectRegion()){
             //This class type check is a quick and dirty fix to accommodate changes to the internal workings of the region API
             //
             //ESTS-R only supports a small, but growing, number of scenarios, and the original design failed silently whenever