HTTPClient default timeouts (#264)

* Add default timeouts for DefaultHttpClient

* Handle 'stay signed in' confirmation page in DeviceCodeIT tests

* Small best-practices changes

Author: Avery-Dunn

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

@@ -46,7 +46,7 @@ public void DeviceCodeFlowADTest(String environment) throws Exception {
         build();
 
         Consumer<DeviceCode> deviceCodeConsumer = (DeviceCode deviceCode) -> {
-            runAutomatedDeviceCodeFlow(deviceCode, user);
+            runAutomatedDeviceCodeFlow(deviceCode, user, environment);
         };
 
         IAuthenticationResult result = pca.acquireToken(DeviceCodeFlowParameters
@@ -70,7 +70,7 @@ public void DeviceCodeFlowADFSv2019Test(String environment) throws Exception {
                 build();
 
         Consumer<DeviceCode> deviceCodeConsumer = (DeviceCode deviceCode) -> {
-            runAutomatedDeviceCodeFlow(deviceCode, user);
+            runAutomatedDeviceCodeFlow(deviceCode, user, environment);
         };
 
         IAuthenticationResult result = pca.acquireToken(DeviceCodeFlowParameters
@@ -83,7 +83,7 @@ public void DeviceCodeFlowADFSv2019Test(String environment) throws Exception {
         Assert.assertFalse(Strings.isNullOrEmpty(result.accessToken()));
     }
 
-    private void runAutomatedDeviceCodeFlow(DeviceCode deviceCode, User user){
+    private void runAutomatedDeviceCodeFlow(DeviceCode deviceCode, User user, String environment){
         boolean isRunningLocally = true;//!Strings.isNullOrEmpty(
                 //System.getenv(TestConstants.LOCAL_FLAG_ENV_VAR));
 
@@ -123,6 +123,15 @@ private void runAutomatedDeviceCodeFlow(DeviceCode deviceCode, User user){
             } else {
                 SeleniumExtensions.performADLogin(seleniumDriver, user);
             }
+
+            if (environment.equals(AzureEnvironment.AZURE) && !isADFS2019) {
+                //Login flow for azurecloud environment has an extra "Stay signed in?" page after authentication
+                continueBtn = SeleniumExtensions.waitForElementToBeVisibleAndEnable(
+                        seleniumDriver,
+                        new By.ById(continueButtonId));
+                continueBtn.click();
+            }
+
         } catch(Exception e){
             if(!isRunningLocally){
                 SeleniumExtensions.takeScreenShot(seleniumDriver);

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

@@ -15,6 +15,8 @@ class DefaultHttpClient implements IHttpClient {
 
     private final Proxy proxy;
     private final SSLSocketFactory sslSocketFactory;
+    public int DEFAULTCONNECTIONTIMEOUT = 3000;
+    public int DEFAULTREADTIMEOUT = 5000;
 
     DefaultHttpClient(Proxy proxy, SSLSocketFactory sslSocketFactory){
         this.proxy = proxy;
@@ -76,6 +78,9 @@ private HttpsURLConnection openConnection(final URL finalURL)
             connection.setSSLSocketFactory(sslSocketFactory);
         }
 
+        connection.setConnectTimeout(DEFAULTCONNECTIONTIMEOUT);
+        connection.setReadTimeout(DEFAULTREADTIMEOUT);
+
         return connection;
     }
 

src/test/java/com/microsoft/aad/msal4j/DefaultHttpClientTest.java

@@ -44,6 +44,9 @@ public void ValidNotOkHttpResponse() throws Exception {
 
         EasyMock.expect(mockCon.getHeaderFields()).andReturn(expectedHeaders).times(1);
 
+        mockCon.setReadTimeout(0);
+        mockCon.setConnectTimeout(0);
+
         DefaultHttpClient httpClient =
                 PowerMock.createPartialMock(DefaultHttpClient.class, "openConnection");