Merge pull request #424 from AzureAD/release/0.2.1_msal-420

Prepares 0.2.1

Author: iambmelt

README.md

@@ -43,11 +43,12 @@ Add to your app's Build.Gradle:
         mavenCentral()
     }
     dependencies {
-        compile('com.microsoft.identity.client:msal:0.1.3') {
+        compile('com.microsoft.identity.client:msal:0.2.1') {
             // if your app includes android support
-            // libraries or GSON in its dependencies
+            // libraries, nimbus-jose, or GSON in its dependencies
             // uncomment below
 
+            // exclude group: 'com.nimbusds', module: 'nimbus-jose-jwt'
             // exclude group: 'com.android.support', module: 'appcompat-v7'
             // exclude group: 'com.google.code.gson'
         }
@@ -90,7 +91,6 @@ Copyright (c) Microsoft Corporation.  All rights reserved. Licensed under the MI
 
 ### Requirements
 * Android SDK 21+
-* [Chrome](https://github.com/Azure-Samples/active-directory-general-docs/blob/master/AndroidEmulator.md) 
 
 ### Step 1: Configure the AndroidManifest.xml
 

changelog

@@ -1,5 +1,13 @@
 MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
 
+Version 0.2.1
+----------------------------
+- Picks up [email protected]
+    * Bugfix: Resolves MSAL/#420
+        - Corrects an issue whereby expired access tokens can be returned from the cache
+    * Bugfix: Resolves MSAL/#418
+        - Adds client_id, redirect_uri to refresh token requests (previously missing, yielding inconsistent behavior depending on account type).
+
 Version 0.2.0
 ----------------------------
 - Cache schema has been redesigned to support migration from ADAL 1.15.2+

common

@@ -125,9 +125,9 @@ dependencies {
         transitive = false
     }
 
-    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '0.0.5', changing: true)
+    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '0.0.7', changing: true)
 
-    distApi("com.microsoft.identity:common:0.0.5") {
+    distApi("com.microsoft.identity:common:0.0.7") {
         transitive = false
     }
 }

msal/build.gradle

@@ -841,6 +841,7 @@ private MSALAcquireTokenSilentOperationParameters getSilentOperationParameters(f
         parameters.setClientId(mClientId);
         parameters.setTokenCache(mOauth2TokenCache);
         parameters.setAuthority(Authority.getAuthorityFromAuthorityUrl(authorityStr));
+        parameters.setRedirectUri(mRedirectUri);
         if (null != account) {
             parameters.setAccount(
                     getAccountInternal(

msal/src/main/java/com/microsoft/identity/client/PublicClientApplication.java

@@ -34,6 +34,7 @@
 import com.microsoft.identity.client.exception.MsalClientException;
 import com.microsoft.identity.client.exception.MsalUiRequiredException;
 import com.microsoft.identity.client.internal.authorities.Authority;
+import com.microsoft.identity.common.adal.internal.util.StringExtensions;
 import com.microsoft.identity.common.exception.ClientException;
 import com.microsoft.identity.common.internal.cache.ICacheRecord;
 import com.microsoft.identity.common.internal.dto.AccountRecord;
@@ -424,11 +425,20 @@ private TokenResult performSilentTokenRequest(final OAuth2Strategy strategy,
                 "Requesting tokens..."
         );
         throwIfNetworkNotAvailable(parameters.getAppContext());
-        return strategy.requestToken(
-                strategy.createRefreshTokenRequest(
-                        parameters.getRefreshToken(),
-                        parameters.getScopes()
-                )
-        );
+
+        final TokenRequest refreshTokenRequest = strategy.createRefreshTokenRequest();
+        refreshTokenRequest.setClientId(parameters.getClientId());
+        refreshTokenRequest.setScope(StringUtil.join(' ', parameters.getScopes()));
+        refreshTokenRequest.setRefreshToken(parameters.getRefreshToken().getSecret());
+        refreshTokenRequest.setRedirectUri(parameters.getRedirectUri());
+
+        if (!StringExtensions.isNullOrBlank(refreshTokenRequest.getScope())) {
+            Logger.verbosePII(
+                    TAG + methodName,
+                    "Scopes: [" + refreshTokenRequest.getScope() + "]"
+            );
+        }
+
+        return strategy.requestToken(refreshTokenRequest);
     }
 }

msal/src/main/java/com/microsoft/identity/client/internal/controllers/LocalMSALController.java

@@ -1,3 +1,3 @@
 #Wed Aug 01 15:24:11 PDT 2018
-versionName=0.2.0
+versionName=0.2.1
 versionCode=0