Merge branch 'dev'

pom.xml

@@ -17,10 +17,10 @@
   <properties>
     <scm.branch>master</scm.branch>
     <maven.version>3.1.1</maven.version>
-    <adal.version>1.1.10</adal.version>
-    <android.platform.maven.plugin>18</android.platform.maven.plugin>
+    <adal.version>1.1.11</adal.version>
+    <android.platform.maven.plugin>21</android.platform.maven.plugin>
     <android.version>[4.1.1.4,)</android.version>
-    <android.support.version>[18,)</android.support.version>
+    <android.support.version>[21,)</android.support.version>
     <android.support.name>support-v4</android.support.name>
     <gson.name>gson</gson.name>
     <gson.version>2.3.1</gson.version>

samples/hello/AndroidManifest.xml

@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

samples/hello/pom.xml

@@ -13,7 +13,7 @@
   <packaging>apk</packaging>
   <name>Hello App for Demo</name>
   <properties>
-    <android.support.version>[18,)</android.support.version>
+    <android.support.version>[21,)</android.support.version>
   </properties>
   <dependencies>
     <dependency>

samples/hello/project.properties

@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-21
 android.library.reference.1=../../src

src/AndroidManifest.xml

@@ -6,11 +6,10 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21" />
 
     <application
-        android:allowBackup="true"
-        android:theme="@style/AppTheme" >
+        android:allowBackup="true">
         <activity android:name="com.microsoft.aad.adal.AuthenticationActivity" >
         </activity>
     </application>

src/pom.xml

@@ -4,16 +4,16 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microsoft.aad</groupId>
   <artifactId>adal</artifactId>
-  <version>1.1.10</version>
+  <version>1.1.11</version>
   <packaging>aar</packaging>
   <name>adal</name>
   <properties>
     <scm.branch>master</scm.branch>
     <maven.version>3.1.1</maven.version>
-    <adal.version>1.1.10</adal.version>
-    <android.platform.maven.plugin>18</android.platform.maven.plugin>
+    <adal.version>1.1.11</adal.version>
+    <android.platform.maven.plugin>21</android.platform.maven.plugin>
     <android.version>[4.1.1.4,)</android.version>
-    <android.support.version>[18,)</android.support.version>
+    <android.support.version>[21,)</android.support.version>
     <android.support.name>support-v4</android.support.name>
     <gson.name>gson</gson.name>
     <gson.version>2.3.1</gson.version>
@@ -167,7 +167,7 @@
           <resourceDirectory>${project.basedir}/res</resourceDirectory>
           <nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
           <sdk>
-            <platform>18</platform>
+            <platform>21</platform>
           </sdk>
           <dexCoreLibrary>true</dexCoreLibrary>
           <deleteConflictingFiles>true</deleteConflictingFiles>

src/project.properties

@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-21
 android.library=true

src/src/com/microsoft/aad/adal/AuthenticationActivity.java

@@ -28,8 +28,10 @@
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
+import java.security.PrivateKey;
 import java.security.UnrecoverableEntryException;
 import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
 import java.security.spec.InvalidKeySpecException;
 import java.util.UUID;
 
@@ -41,20 +43,26 @@
 import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
 import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
+import android.security.KeyChain;
+import android.security.KeyChainAliasCallback;
+import android.security.KeyChainException;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.Window;
 import android.view.inputmethod.InputMethodManager;
+import android.webkit.ClientCertRequest;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
 import android.webkit.WebView;
@@ -642,6 +650,29 @@ public void setPKeyAuthStatus(boolean status) {
         public void postRunnable(Runnable item) {
             mWebView.post(item);            
         }
+
+        @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+        @Override
+        public void onReceivedClientCertRequest (WebView view, final ClientCertRequest request){
+            Logger.v(TAG + "onReceivedClientCertRequest", "onReceivedClientCertRequest");
+            KeyChain.choosePrivateKeyAlias(AuthenticationActivity.this, new KeyChainAliasCallback() {
+
+                @Override
+                public void alias(String alias) {
+                    try {
+                    	final X509Certificate[] certChain = KeyChain.getCertificateChain(
+                                getApplicationContext(), alias);
+                    	final PrivateKey privateKey = KeyChain.getPrivateKey(mCallingContext, alias);
+                        request.proceed(privateKey, certChain);
+
+                    } catch (KeyChainException e) {
+                        Log.e(TAG, "KeyChain exception", e);
+                    } catch (InterruptedException e) {
+                        Log.e(TAG, "InterruptedException exception", e);
+                    }
+                }
+            }, request.getKeyTypes(), request.getPrincipals(), request.getHost(), request.getPort(), null);
+        }
     }
 
     /**

src/src/com/microsoft/aad/adal/AuthenticationContext.java

@@ -1924,6 +1924,6 @@ public static String getVersionName() {
         // Package manager does not report for ADAL
         // AndroidManifest files are not merged, so it is returning hard coded
         // value
-        return "1.1.10";
+        return "1.1.11";
     }
 }

src/src/com/microsoft/aad/adal/BasicWebViewClient.java

@@ -68,8 +68,7 @@ public BasicWebViewClient(Context appContext, String redirect, String queryParam
 
     public abstract void setPKeyAuthStatus(boolean status);
 
-    public abstract void postRunnable(Runnable item);
-
+    public abstract void postRunnable(Runnable item);    
 
     @Override
     public void onReceivedHttpAuthRequest(WebView view, final HttpAuthHandler handler,
@@ -144,6 +143,7 @@ public void onPageFinished(WebView view, String url) {
 
     @Override
     public void onPageStarted(WebView view, String url, Bitmap favicon) {
+    	Logger.v(TAG + "onPageStarted", "page is started with the url " + url);
         super.onPageStarted(view, url, favicon);
         showSpinner(true);
     }

src/src/com/microsoft/aad/adal/BrokerProxy.java

@@ -21,6 +21,9 @@
 import java.io.IOException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.List;
 
 import android.accounts.Account;
@@ -299,9 +302,22 @@ private AuthenticationResult getResultFromBrokerResponse(Bundle bundleResult) {
 
             // IDtoken is not present in the current broker user model
             UserInfo userinfo = UserInfo.getUserInfoFromBrokerResult(bundleResult);
+            final String tenantId = bundleResult.getString(AuthenticationConstants.Broker.ACCOUNT_USERINFO_TENANTID, "");
+
+            final Date expires;
+            if (bundleResult.getLong(AuthenticationConstants.Broker.ACCOUNT_EXPIREDATE) == 0) {
+            	Logger.v(TAG, "Broker doesn't return expire date, set it current date plus one hour");
+            	final Calendar currentTime = new GregorianCalendar();
+            	currentTime.add(Calendar.SECOND, AuthenticationConstants.DEFAULT_EXPIRATION_TIME_SEC);;
+            	expires = currentTime.getTime(); 
+            }
+            else {
+            	expires = new Date(bundleResult.getLong(AuthenticationConstants.Broker.ACCOUNT_EXPIREDATE));
+            }
+
             AuthenticationResult result = new AuthenticationResult(
-                    bundleResult.getString(AccountManager.KEY_AUTHTOKEN), "", null, false,
-                    userinfo, "", "");
+                    bundleResult.getString(AccountManager.KEY_AUTHTOKEN), "", expires, false,
+                    userinfo, tenantId, "");
             return result;
         }
     }

tests/Functional/src/com/microsoft/aad/adal/test/AuthenticationContextTest.java

@@ -381,6 +381,7 @@ public void testAcquireToken_userId() throws ClassNotFoundException, IllegalArgu
         FileMockContext mockContext = new FileMockContext(getContext());
         final AuthenticationContext context = getAuthenticationContext(mockContext,
                 "https://login.windows.net/common", false, null);
+        setConnectionAvailable(context, true);
         final MockActivity testActivity = new MockActivity();
         final CountDownLatch signal = new CountDownLatch(1);
         MockAuthenticationCallback callback = new MockAuthenticationCallback(signal);
@@ -416,6 +417,7 @@ public void testEmptyRedirect() throws ClassNotFoundException, IllegalArgumentEx
         FileMockContext mockContext = new FileMockContext(getContext());
         final AuthenticationContext context = getAuthenticationContext(mockContext,
                 "https://login.windows.net/common", false, null);
+        setConnectionAvailable(context, true);
         final MockActivity testActivity = new MockActivity();
         final CountDownLatch signal = new CountDownLatch(1);
         MockAuthenticationCallback callback = new MockAuthenticationCallback(signal);
@@ -441,6 +443,7 @@ public void testPrompt() throws IllegalArgumentException, NoSuchFieldException,
         FileMockContext mockContext = new FileMockContext(getContext());
         final AuthenticationContext context = getAuthenticationContext(mockContext,
                 "https://login.windows.net/common", false, null);
+        setConnectionAvailable(context, true);
         final MockActivity testActivity = new MockActivity();
         final CountDownLatch signal = new CountDownLatch(1);
         MockAuthenticationCallback callback = new MockAuthenticationCallback(signal);
@@ -484,6 +487,7 @@ public void testExtraParams() throws IllegalArgumentException, NoSuchFieldExcept
         FileMockContext mockContext = new FileMockContext(getContext());
         final AuthenticationContext context = getAuthenticationContext(mockContext,
                 "https://login.windows.net/common", false, null);
+        setConnectionAvailable(context, true);
         final MockActivity testActivity = new MockActivity();
         final CountDownLatch signal = new CountDownLatch(1);
         String expected = "&extraParam=1";
@@ -806,6 +810,7 @@ public void testAcquireTokenValidateAuthorityReturnsValid() throws InterruptedEx
         FileMockContext mockContext = new FileMockContext(getContext());
         AuthenticationContext context = new AuthenticationContext(mockContext, VALID_AUTHORITY,
                 true);
+        setConnectionAvailable(context, true);
         final CountDownLatch signal = new CountDownLatch(1);
         MockActivity testActivity = new MockActivity();
         testActivity.mSignal = signal;
@@ -832,6 +837,7 @@ public void testCorrelationId_InDiscovery() throws InterruptedException,
         FileMockContext mockContext = new FileMockContext(getContext());
         AuthenticationContext context = getAuthenticationContext(mockContext, VALID_AUTHORITY,
                 true, null);
+        setConnectionAvailable(context, true);
         final CountDownLatch signal = new CountDownLatch(1);
         UUID correlationId = UUID.randomUUID();
         MockActivity testActivity = new MockActivity();
@@ -921,6 +927,7 @@ public void testAcquireTokenWithoutValidation() throws InterruptedException,
         FileMockContext mockContext = new FileMockContext(getContext());
         final AuthenticationContext context = getAuthenticationContext(mockContext,
                 VALID_AUTHORITY, false, null);
+        setConnectionAvailable(context, true);
         final MockActivity testActivity = new MockActivity();
         final CountDownLatch signal = new CountDownLatch(1);
         testActivity.mSignal = signal;
@@ -1798,7 +1805,7 @@ public void testAcquireTokenMultiResourceToken_UserId() throws InterruptedExcept
 
         clearCache(context);
     }
-
+ 
     @SmallTest
     public void testAcquireTokenMultiResource_ADFSIssue() throws InterruptedException,
             IllegalArgumentException, NoSuchFieldException, IllegalAccessException,