Merge pull request #896 from AzureAD/release/1.2.0

Merge release/1.2.0 to master

Author: rpdome

README.md

@@ -73,6 +73,8 @@ It's simplest to create your configuration file as a "raw" resource file in your
 }
 ```
 
+>NOTE: In the `redirect_uri`, the part `<YOUR_PACKAGE_NAME>` refers to the package name returned by the `context.getPackageName()` method. This package name is the same as the [`application_id`](https://developer.android.com/studio/build/application-id) defined in your `build.gradle` file.
+
 >NOTE: This is the minimum required configuration.  MSAL relies on the defaults that ship with the library for all other settings.  Please refer to the [configuration file documentation](https://docs.microsoft.com/azure/active-directory/develop/msal-configuration) to understand the library defaults.
 
 ### Step 3: Configure the AndroidManifest.xml

changelog

@@ -1,11 +1,25 @@
 MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
 
+Version 1.2.0
+------------
+- API change
+    * Replaced the following PublicClientApplication#create methods.
+        - create(context, clientId, listener)
+        - create(context, clientId, authority, listener)
+      with 
+        - create(context, clientId, authority, redirectUri, listener)
+- Fixed issue #850, #890.
+- Fixed issue #770 in common.
+- Return AndroidManifest config error in onError() instead of throwing a runtime exception.
+- Added Fragment support in WebView flow.
+
 Version 1.1.0-hf1
-- Fix issue #882
+------------
+- Fix issue #882.
 
 Version 1.1.0
 ----------------------------
-- Expose id_token (raw) via IAccount/ITenantProfile from AuthenticationResult (#850)
+- Expose id_token (raw) via IAccount/ITenantProfile from AuthenticationResult (#850).
 
 Version 1.0.1
 ----------------------------

common

@@ -144,9 +144,9 @@ dependencies {
         transitive = false
     }
 
-    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '1.0.13-hf1', changing: true)
+    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '1.0.14-SNAPSHOT', changing: true)
 
-    distApi("com.microsoft.identity:common:1.0.13-hf1") {
+    distApi("com.microsoft.identity:common:1.0.14") {
         transitive = false
     }
 }

msal/build.gradle

@@ -16,9 +16,6 @@
         android:allowBackup="false">
         <uses-library android:name="android.test.runner" />
 
-        <activity
-            android:name="com.microsoft.identity.client.AuthenticationActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
         <activity android:name="com.microsoft.identity.client.TestActivity" />
 
         <activity android:name="com.microsoft.identity.client.BrowserTabActivity">

msal/src/androidTest/AndroidManifest.xml

@@ -37,6 +37,7 @@
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.microsoft.identity.client.exception.MsalClientException;
 import com.microsoft.identity.client.exception.MsalException;
 import com.microsoft.identity.client.internal.MsalUtils;
 import com.microsoft.identity.common.adal.internal.AuthenticationSettings;
@@ -75,7 +76,7 @@ public final class PublicClientApplicationTest {
     private Context mAppContext;
     private static final String CLIENT_ID = "client-id";
     private static final String[] SCOPE = {"scope1", "scope2"};
-    public static final String TEST_AUTHORITY = "msauth://com.microsoft.identity.client.sample.local/signature";
+    public static final String TEST_REDIRECT_URI = "msauth://com.microsoft.identity.client.sample.local/signature";
 
     @Before
     public void setUp() {
@@ -217,20 +218,21 @@ public void onError(MsalException exception) {
      * Verify correct exception is thrown if callback is not provided.
      */
     @Test(expected = IllegalArgumentException.class)
-    public void testCallBackEmpty() throws PackageManager.NameNotFoundException {
+    public void testCallBackEmpty() throws PackageManager.NameNotFoundException, MsalClientException {
         final Context context = new MockContext(mAppContext);
         mockPackageManagerWithClientId(context, null, CLIENT_ID);
         mockHasCustomTabRedirect(context);
         mockPackageManagerWithDefaultFlag(context);
 
         final PublicClientApplicationConfiguration config = PublicClientApplicationConfigurationFactory.initializeConfiguration(context);
-        config.mRedirectUri = TEST_AUTHORITY;
-        final PublicClientApplication application = new PublicClientApplication(config, CLIENT_ID, null);
+        config.setRedirectUri(TEST_REDIRECT_URI);
+        config.setClientId(CLIENT_ID);
+        final PublicClientApplication application = new PublicClientApplication(config);
         application.acquireToken(getActivity(context), SCOPE, null);
     }
 
     @Test(expected = IllegalStateException.class)
-    public void testInternetPermissionMissing() throws PackageManager.NameNotFoundException {
+    public void testInternetPermissionMissing() throws PackageManager.NameNotFoundException, MsalClientException {
         final Context context = new MockContext(mAppContext);
         final PackageManager packageManager = context.getPackageManager();
         mockPackageManagerWithClientId(context, null, CLIENT_ID);
@@ -241,10 +243,10 @@ public void testInternetPermissionMissing() throws PackageManager.NameNotFoundEx
                 Mockito.refEq(mAppContext.getPackageName()))).thenReturn(PackageManager.PERMISSION_DENIED);
 
         PublicClientApplicationConfiguration config = PublicClientApplicationConfigurationFactory.initializeConfiguration(context);
-        config.mTelemetryConfiguration = null;
-        config.mRedirectUri = TEST_AUTHORITY;
+        config.setRedirectUri(TEST_REDIRECT_URI);
+        config.setClientId(CLIENT_ID);
 
-        new PublicClientApplication(config, CLIENT_ID, null);
+        new PublicClientApplication(config);
     }
 
     @Test
@@ -300,14 +302,15 @@ public void testB2cAuthorityNotInTrustedList() throws PackageManager.NameNotFoun
     }
 
     @Test
-    public void testSecretKeysAreSet() throws NoSuchAlgorithmException, InvalidKeySpecException {
+    public void testSecretKeysAreSet() throws NoSuchAlgorithmException, InvalidKeySpecException, MsalClientException {
         final Context context = new MockContext(mAppContext);
         mockHasCustomTabRedirect(context);
         mockPackageManagerWithDefaultFlag(context);
 
         final PublicClientApplicationConfiguration config = PublicClientApplicationConfigurationFactory.initializeConfiguration(context);
-        config.mRedirectUri = TEST_AUTHORITY;
-        final PublicClientApplication pca = new PublicClientApplication(config, CLIENT_ID, null);
+        config.setRedirectUri(TEST_REDIRECT_URI);
+        config.setClientId(CLIENT_ID);
+        final PublicClientApplication pca = new PublicClientApplication(config);
         final PublicClientApplicationConfiguration appConfig = pca.getConfiguration();
 
         SecretKeyFactory keyFactory = SecretKeyFactory