Merge branch 'develop' into Stable

Author: BobbyWeber

ChangeLog.md

@@ -1,3 +1,21 @@
+# Version 1.8.00
+
+### Bug fixes
+-  Invoking MAS User lockSession API without screen lock activated [DE377125]
+
+### New features
+- Refactor logout implementation, new com.ca.mas.foundation.MASUser#logout(boolean, com.ca.mas.foundation.MASCallback<java.lang.Void>) interface is added, the new logout interface was added the 'force' parameter, a boolean value. If set to True, the SDK will clear local tokens no matter the logout call to the server success or not. [US510647]
+- Android P Support [US527906]
+    - Refactor Unit Test to avoid using Bouncy Castle and Keystore Daemon
+    - Avoid using non-sdk interface for Android P
+    - Default to use MASSecureStorageDataSource for Android P
+- Configurable option for id_token validation signature [US514785] 
+- Refactor SDK to use JobIntentService instead of IntentService for background services [US532557]
+    - android.permission.WAKE_LOCK is required.
+
+### Deprecated Interface
+- com.ca.mas.foundation.MASUser#logout(com.ca.mas.foundation.MASCallback<java.lang.Void>) is deprecated, use com.ca.mas.foundation.MASUser#logout(boolean, com.ca.mas.foundation.MASCallback<java.lang.Void>) instead.
+
 # Version 1.7.10
 
 ### New features

README.md

@@ -40,12 +40,12 @@ For more information about our mobile products see the [developer website][mas.c
 Edit your build.gradle file and add below dependency:
 ```gradle
     dependencies {
-        implementation 'com.ca:mas-foundation:1.6.10'
+        implementation 'com.ca:mas-foundation:1.8.00'
 
-        implementation 'com.ca:mas-connecta:1.6.10' // (Optional) Only required when using mas connecta
-        implementation 'com.ca:mas-storage:1.6.10' // (Optional) Only required when using mas storage
-        implementation 'com.ca:mas-identity-management:1.6.10' // (Optional) Only required when using mas identity management
-        implementation 'com.ca:masui:1.6.10' // (Optional) Only required when using MASUI Template. The MAS UI library provides sample user interfaces for Login, OTP, Social Login, and Enterprise Browser.
+        implementation 'com.ca:mas-connecta:1.8.00' // (Optional) Only required when using mas connecta
+        implementation 'com.ca:mas-storage:1.8.00' // (Optional) Only required when using mas storage
+        implementation 'com.ca:mas-identity-management:1.8.00' // (Optional) Only required when using mas identity management
+        implementation 'com.ca:masui:1.8.00' // (Optional) Only required when using MASUI Template. The MAS UI library provides sample user interfaces for Login, OTP, Social Login, and Enterprise Browser.
 
         implementation 'org.bouncycastle:bcpkix-jdk15on:1.55' // (Optional) Only required when you want to support Android 4.1.x
     }

build.gradle

@@ -29,16 +29,16 @@ allprojects {
 }
 
 ext {
-    supportLibsVersion = '27.1.1'
+    supportLibsVersion = '28.0.0-rc01'
     appAuthVersion = '0.7.0'
-    buildToolsVersion = '27.0.3'
-    compileSdkVersion = 27
+    buildToolsVersion = '28.0.0'
+    compileSdkVersion = 28
     gcm = '12.0.1'
     minSdkVersion = 16
     nimbusJoseVersion = '5.9'
-    targetSdkVersion = 27
-    versionCode = 19
-    versionName = '1.7.10'
+    targetSdkVersion = 28
+    versionCode = 20
+    versionName = '1.8.00'
     zxingVersion = '3.3.0'
     testRunner = '1.0.1'
     testRules = '1.0.1'

mas-connecta/src/androidTest/AndroidManifest.xml

@@ -11,6 +11,20 @@
 
     <application android:allowBackup="true"
                  android:label="@string/app_name">
+        <service
+            android:name="com.ca.mas.core.storage.sharedstorage.MASAuthenticatorService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+
+            <meta-data
+                android:name="account.name"
+                android:resource="@string/acc_name" />
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/mastest" />
+        </service>
     </application>
 
 </manifest>

mas-foundation/build.gradle

@@ -63,6 +63,7 @@ dependencies {
 
     api "com.google.zxing:core:$rootProject.ext.zxingVersion"
     implementation "com.android.support:support-annotations:$rootProject.ext.supportLibsVersion"
+    implementation "com.android.support:support-compat:$rootProject.ext.supportLibsVersion"
     api "com.nimbusds:nimbus-jose-jwt:$rootProject.ext.nimbusJoseVersion"
 
     //For Android API 16 and 17
@@ -131,16 +132,8 @@ task javadoc(type: Javadoc) {
     println "Source: $source"
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
     println "Classpath: $source"
-    options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
     destinationDir = file("../docs/mas_foundation_javadoc/")
     failOnError false
-
-    include '**/*MAS*.java'
-    include '**/Device.java'
-    include '**/ScimUser.java'
-
-    exclude '**/MASTransformable.java'
-    exclude '**/MASResultReceiver.java'
 }
 
 //jcenter integration

mas-foundation/src/androidTest/AndroidManifest.xml

@@ -9,18 +9,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.ca.mas.foundation">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <!-- AMS Permission Start -->
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <!-- AMS Permission End -->
-
     <application android:allowBackup="true"
                  android:label="@string/app_name">
-        <service android:name="com.ca.mas.core.service.MssoService"
-                 android:exported="false">
-        </service>
 
         <!-- AMS Service -->
         <!-- AMS Service -->
@@ -29,18 +19,25 @@
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
             <meta-data android:name="account.name"
-                android:resource="@string/acc_name"/>
+                android:resource="@string/acc_name2"/>
             <meta-data
                 android:name="android.accounts.AccountAuthenticator"
                 android:resource="@xml/mastest" />
         </service>
 
-        <service android:name="com.ca.mas.core.storage.sharedstorage.MASAuthenticatorService">
+        <service
+            android:name="com.ca.mas.core.storage.sharedstorage.MASAuthenticatorService"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
-            <meta-data android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/massharedauthenticator" />
+
+            <meta-data
+                android:name="account.name"
+                android:resource="@string/acc_name" />
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/mastest" />
         </service>
 
     </application>

mas-foundation/src/androidTest/java/com/ca/mas/MASTestSuite.java

@@ -16,8 +16,8 @@
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-        CoreTestSuite.class,
         MASFoundationTestSuite.class,
+        CoreTestSuite.class,
 })
 
 public class MASTestSuite {

mas-foundation/src/androidTest/java/com/ca/mas/core/CoreTestSuite.java

@@ -10,7 +10,7 @@
 
 import com.ca.mas.core.datasource.AccountManagerStoreDataSourceTest;
 import com.ca.mas.core.datasource.KeystoreDataSourceTest;
-import com.ca.mas.core.datasource.SecureAccountManagerStoreDataSourceTest;
+import com.ca.mas.core.datasource.MASSecureStorageDataSourceTest;
 import com.ca.mas.core.storage.AccountManagerStorageTests;
 import com.ca.mas.core.storage.EncryptionProviderTests;
 import com.ca.mas.core.storage.KeyStoreStorageTests;
@@ -29,7 +29,7 @@
 
         AccountManagerStoreDataSourceTest.class,
         KeystoreDataSourceTest.class,
-        SecureAccountManagerStoreDataSourceTest.class,
+        MASSecureStorageDataSourceTest.class
 
 
 })

mas-foundation/src/androidTest/java/com/ca/mas/core/datasource/AccountManagerStoreDataSourceTest.java

@@ -12,7 +12,7 @@
 
 import com.ca.mas.AndroidVersionAwareTestRunner;
 import com.ca.mas.MASTestBase;
-import com.ca.mas.TargetApi;
+import com.ca.mas.MinTargetAPI;
 
 import org.json.JSONObject;
 import org.junit.After;
@@ -44,23 +44,23 @@ public void cleanupData() {
     }
 
     @Test
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+    @MinTargetAPI(Build.VERSION_CODES.JELLY_BEAN_MR2)
     public void testReadWriteString() {
         DataSource<String, String> d = (DataSource<String, String>) getDataSource(new StringDataConverter());
         d.put(KEY, VALUE);
         assertEquals(VALUE, d.get(KEY));
     }
 
     @Test
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+    @MinTargetAPI(Build.VERSION_CODES.JELLY_BEAN_MR2)
     public void testReadWriteByteArray() {
         DataSource<String, byte[]> d = (DataSource<String, byte[]>) getDataSource( null );
         d.put(KEY, VALUE.getBytes());
         assertEquals(VALUE, new String(d.get(KEY)));
     }
 
     @Test
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+    @MinTargetAPI(Build.VERSION_CODES.JELLY_BEAN_MR2)
     public void testReadWriteGeneric() {
         DataSource<String, Object> d = (DataSource<String, Object>) getDataSource(new DataConverter() {
             @Override
@@ -80,7 +80,7 @@ public Object convert(Object key, byte[] value) {
     }
 
     @Test
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+    @MinTargetAPI(Build.VERSION_CODES.JELLY_BEAN_MR2)
     public void testGetKeys() {
         DataSource<String, Object> d = (DataSource<String, Object>) getDataSource(null);
 
@@ -91,7 +91,7 @@ public void testGetKeys() {
     }
 
     @Test
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+    @MinTargetAPI(Build.VERSION_CODES.JELLY_BEAN_MR2)
     public void testRemove() {
         DataSource<String, Object> d = (DataSource<String, Object>) getDataSource(null);
         d.put(KEY, VALUE);

mas-foundation/src/androidTest/java/com/ca/mas/core/datasource/KeystoreDataSourceTest.java

@@ -8,9 +8,12 @@
 
 package com.ca.mas.core.datasource;
 
-import android.support.test.runner.AndroidJUnit4;
+import android.os.Build;
 
+import com.ca.mas.AndroidVersionAwareTestRunner;
 import com.ca.mas.MASTestBase;
+import com.ca.mas.MaxTargetAPI;
+import com.ca.mas.MinTargetAPI;
 
 import org.junit.After;
 import org.junit.Ignore;
@@ -22,7 +25,8 @@
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 
-@RunWith(AndroidJUnit4.class)
+@RunWith(AndroidVersionAwareTestRunner.class)
+@MaxTargetAPI(Build.VERSION_CODES.O_MR1)
 public class KeystoreDataSourceTest extends MASTestBase {
 
     private final String KEY = "KEY";
@@ -100,12 +104,4 @@ public void testKeyStoreUnlock() {
                 KeystoreDataSource.class, null, null);
         assertFalse(d.isReady());
     }
-
-
-
-
-
-
-
-
 }