Merge pull request #107 from AzureAD/dev

0.6.0-preview release

Author: sangonzal

README.md

@@ -11,18 +11,33 @@ The MSAL library for Java gives your app the ability to begin using the Microsof
 
 
 ## Versions
-Current version - 0.5.0-preview
+Current version - 0.6.0-preview
 
 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).
 
 The library is currently in preview. During the preview we reserve the right to make changes to the API, cache format, and other mechanisms of this library without notice which you will be required to take along with bug fixes or feature improvements
+
+### Maven
+
+```
+<dependency>
+    <groupId>com.microsoft.azure</groupId>
+    <artifactId>msal4j</artifactId>
+    <version>0.6.0-preview</version>
+</dependency>
+```
+### Gradle
+
+```
+compile group: 'com.microsoft.azure', name: 'msal4j', version: '0.6.0-preview'
+```
+
 ## Contribution
 
 This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com.
 When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA.
 This project has adopted the Microsoft Open Source Code of Conduct. For more information see the Code of Conduct FAQ or contact [email protected] with any additional questions or comments.
 
-
 ## Build and Run
 
 Refer [this page](https://github.com/AzureAD/microsoft-authentication-library-for-java/wiki/Maven)

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>msal4j</artifactId>
-	<version>0.5.0-preview</version>
+	<version>0.6.0-preview</version>
 	<packaging>jar</packaging>
 	<name>msal4j</name>
 	<description>
@@ -55,8 +55,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
+            <artifactId>commons-text</artifactId>
+            <version>1.7</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5</version>
+            <version>4.5.9</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>
@@ -133,6 +133,7 @@
     </dependencies>
 
     <build>
+        <sourceDirectory>${project.build.directory}/delombok</sourceDirectory>
         <plugins>
             <plugin>
                 <groupId>org.projectlombok</groupId>

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

@@ -171,4 +171,50 @@ private IPublicClientApplication getPublicClientApplicationWithTokensInCache()
                 .get();
         return pca;
     }
+
+    @Test
+    private void acquireTokenSilent_usingCommonAuthority_returnCachedAt() throws Exception {
+        acquireTokenSilent_returnCachedTokens(TestConstants.ORGANIZATIONS_AUTHORITY);
+    }
+
+    @Test
+    private void acquireTokenSilent_usingTenantSpecificAuthority_returnCachedAt() throws Exception {
+        LabResponse labResponse = labUserProvider.getDefaultUser(
+                NationalCloud.AZURE_CLOUD,
+                false);
+        String tenantSpecificAuthority = TestConstants.MICROSOFT_AUTHORITY_HOST + labResponse.getUser().getTenantId();
+
+        acquireTokenSilent_returnCachedTokens(tenantSpecificAuthority);
+    }
+
+    void acquireTokenSilent_returnCachedTokens(String authority) throws Exception {
+
+        LabResponse labResponse = labUserProvider.getDefaultUser(
+                NationalCloud.AZURE_CLOUD,
+                false);
+        String password = labUserProvider.getUserPassword(labResponse.getUser());
+
+        PublicClientApplication pca = new PublicClientApplication.Builder(
+                labResponse.getAppId()).
+                authority(authority).
+                build();
+
+        IAuthenticationResult interactiveAuthResult = pca.acquireToken(UserNamePasswordParameters.
+                builder(Collections.singleton(TestConstants.GRAPH_DEFAULT_SCOPE),
+                        labResponse.getUser().getUpn(),
+                        password.toCharArray())
+                .build())
+                .get();
+
+        Assert.assertNotNull(interactiveAuthResult);
+
+        IAuthenticationResult silentAuthResult = pca.acquireTokenSilently(
+                SilentParameters.builder(
+                        Collections.singleton(TestConstants.GRAPH_DEFAULT_SCOPE), interactiveAuthResult.account())
+                        .build())
+                .get();
+
+        Assert.assertNotNull(silentAuthResult);
+        Assert.assertEquals(interactiveAuthResult.accessToken(), silentAuthResult.accessToken());
+    }
 }

src/integrationtest/java/com.microsoft.aad.msal4j/AuthorizationCodeIT.java

@@ -247,7 +247,7 @@ private IAuthenticationResult acquireTokenInteractiveB2C(LabResponse labResponse
                                                             String authCode) {
         IAuthenticationResult result;
         try{
-            IClientCredential credential = ClientCredentialFactory.create("=]Y)_A7LX`]6\"]_PoD!)Lo24");
+            IClientCredential credential = ClientCredentialFactory.create("");
             ConfidentialClientApplication cca = ConfidentialClientApplication.builder(
                     labResponse.getAppId(),
                     credential)

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

@@ -8,6 +8,8 @@
 
 import java.net.URL;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -35,6 +37,15 @@ class AadInstanceDiscovery {
 
     static ConcurrentHashMap<String, InstanceDiscoveryMetadataEntry> cache = new ConcurrentHashMap<>();
 
+    static Set<String> getAliases(String host){
+        if(cache.containsKey(host)){
+            return cache.get(host).aliases();
+        }
+        else{
+            return Collections.singleton(host);
+        }
+    }
+
     private static String getAuthorizeEndpoint(String host, String tenant) {
         return AUTHORIZE_ENDPOINT_TEMPLATE.
                 replace("{host}", host).

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

@@ -59,18 +59,18 @@ String getKey() {
         return String.join(Constants.CACHE_KEY_SEPARATOR, keyParts).toLowerCase();
     }
 
-    static AccountCacheEntity create(String clientInfoStr, String environment, IdToken idToken, String policy) {
+    static AccountCacheEntity create(String clientInfoStr, Authority requestAuthority, IdToken idToken, String policy) {
 
         AccountCacheEntity account = new AccountCacheEntity();
         account.authorityType(MSSTS_ACCOUNT_TYPE);
         account.clientInfoStr = clientInfoStr;
         account.homeAccountId(policy != null ?
                 account.clientInfo().toAccountIdentifier() + Constants.CACHE_KEY_SEPARATOR + policy :
                 account.clientInfo().toAccountIdentifier());
-        account.environment(environment);
+        account.environment(requestAuthority.host());
+        account.realm(requestAuthority.tenant());
 
         if (idToken != null) {
-            account.realm(idToken.tenantIdentifier);
             String localAccountId = !StringHelper.isBlank(idToken.objectIdentifier)
                     ? idToken.objectIdentifier : idToken.subject;
             account.localAccountId(localAccountId);
@@ -81,8 +81,8 @@ static AccountCacheEntity create(String clientInfoStr, String environment, IdTok
         return account;
     }
 
-    static AccountCacheEntity create(String clientInfoStr, String environment, IdToken idToken){
-        return create(clientInfoStr, environment, idToken, null);
+    static AccountCacheEntity create(String clientInfoStr, Authority requestAuthority, IdToken idToken){
+        return create(clientInfoStr, requestAuthority, idToken, null);
     }
 
     IAccount toAccount(){

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

@@ -28,31 +28,35 @@ AuthenticationResult execute() throws Exception {
                     requestAuthority,
                     silentRequest.parameters().scopes(),
                     clientApplication.clientId());
-            return StringHelper.isBlank(res.accessToken()) ? null : res;
         }
+        else {
+            res = clientApplication.tokenCache.getCachedAuthenticationResult(
+                    silentRequest.parameters().account(),
+                    requestAuthority,
+                    silentRequest.parameters().scopes(),
+                    clientApplication.clientId());
 
-        res = clientApplication.tokenCache.getCachedAuthenticationResult(
-                silentRequest.parameters().account(),
-                requestAuthority,
-                silentRequest.parameters().scopes(),
-                clientApplication.clientId());
-
-        if (!silentRequest.parameters().forceRefresh() && !StringHelper.isBlank(res.accessToken())) {
-            return res;
-        }
+            if (silentRequest.parameters().forceRefresh() || StringHelper.isBlank(res.accessToken())) {
 
-        if (!StringHelper.isBlank(res.refreshToken())) {
-            RefreshTokenRequest refreshTokenRequest = new RefreshTokenRequest(
-                    RefreshTokenParameters.builder(silentRequest.parameters().scopes(), res.refreshToken()).build(),
-                    silentRequest.application(),
-                    silentRequest.requestContext());
+                if (!StringHelper.isBlank(res.refreshToken())) {
+                    RefreshTokenRequest refreshTokenRequest = new RefreshTokenRequest(
+                            RefreshTokenParameters.builder(silentRequest.parameters().scopes(), res.refreshToken()).build(),
+                            silentRequest.application(),
+                            silentRequest.requestContext());
 
-            AcquireTokenByAuthorizationGrantSupplier acquireTokenByAuthorisationGrantSupplier =
-                    new AcquireTokenByAuthorizationGrantSupplier(clientApplication, refreshTokenRequest, requestAuthority);
+                    AcquireTokenByAuthorizationGrantSupplier acquireTokenByAuthorisationGrantSupplier =
+                            new AcquireTokenByAuthorizationGrantSupplier(clientApplication, refreshTokenRequest, requestAuthority);
 
-            return acquireTokenByAuthorisationGrantSupplier.execute();
-        } else {
-            return null;
+                    res = acquireTokenByAuthorisationGrantSupplier.execute();
+                }
+                else{
+                    res = null;
+                }
+            }
+        }
+        if(res == null || StringHelper.isBlank(res.accessToken())){
+            throw new MsalClientException(AuthenticationErrorMessage.NO_TOKEN_IN_CACHE, AuthenticationErrorCode.CACHE_MISS);
         }
+        return res;
     }
 }

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

@@ -41,6 +41,11 @@ public class AuthenticationErrorCode {
      */
     public final static String USER_REALM_DISCOVERY_FAILED = "user_realm_discovery_failed";
 
+    /**
+     * Not found in the cache
+     */
+    public final static String CACHE_MISS = "cache_miss";
+
     /**
      * Unknown error occurred
      */

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

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.aad.msal4j;
+
+public class AuthenticationErrorMessage {
+
+    /**
+     * Token not found it the cache
+     */
+    public final static String NO_TOKEN_IN_CACHE = "Token not found it the cache";
+}

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

@@ -3,6 +3,7 @@
 
 package com.microsoft.aad.msal4j;
 
+import java.util.Set;
 import java.util.concurrent.CompletionException;
 
 class RemoveAccountRunnable implements Runnable {
@@ -21,11 +22,10 @@ class RemoveAccountRunnable implements Runnable {
     @Override
     public void run() {
         try {
-            InstanceDiscoveryMetadataEntry instanceDiscoveryData =
-                    AadInstanceDiscovery.cache.get(clientApplication.authenticationAuthority.host());
+            Set<String> aliases = AadInstanceDiscovery.getAliases(clientApplication.authenticationAuthority.host());
 
             clientApplication.tokenCache.removeAccount
-                    (clientApplication.clientId(), account, instanceDiscoveryData.aliases());
+                    (clientApplication.clientId(), account, aliases);
 
         } catch (Exception ex) {
             clientApplication.log.error(