Merge pull request #240 from AzureAD/dev

Release 1.6.3

Author: sangonzal

README.md

@@ -15,9 +15,9 @@ The ADAL for Java library enables Java applications to authenticate with Azure A
 You can find the steps for installation and basic usage documented in the [ADAL4J Basics Wiki](https://github.com/AzureAD/azure-activedirectory-library-for-java/wiki/ADAL4J-Basics).
 
 ## Versions
-Current version - 1.6.2
+Current version - 1.6.3
 
-Minimum recommended version - 1.6.2
+Minimum recommended version - 1.6.3
 
 From version 1.3.0 support for handling Conditional Access claims challenge was added. You can read about CA [here](https://go.microsoft.com/fwlink/?linkid=855860) and refer this [sample](https://github.com/AzureAD/azure-activedirectory-library-for-java/tree/dev/src/samples/web-app-samples-for-adal4j) to handle it.
 

changelog.txt

@@ -1,3 +1,7 @@
+Version 1.6.3
+=============
+- added client headers to user realm request
+
 Version 1.6.2
 =============
 - updated oauth2-oidc-sdk to 5.63.4

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>adal4j</artifactId>
-	<version>1.6.2</version>
+	<version>1.6.3</version>
 	<packaging>jar</packaging>
 	<name>adal4j</name>
 	<description>

src/main/java/com/microsoft/aad/adal4j/AcquireTokenCallable.java

@@ -129,8 +129,10 @@ private AdalOAuthAuthorizationGrant processPasswordGrant(
                 .getAuthorizationGrant();
 
         UserDiscoveryResponse userDiscoveryResponse = UserDiscoveryRequest.execute(
-                context.authenticationAuthority.getUserRealmEndpoint(grant
-                        .getUsername()), context.proxy, context.sslSocketFactory);
+                context.authenticationAuthority.getUserRealmEndpoint(grant.getUsername()),
+                this.headers.getReadonlyHeaderMap(),
+                context.proxy, 
+                context.sslSocketFactory);
         if (userDiscoveryResponse.isAccountFederated()) {
             WSTrustResponse response = WSTrustRequest.execute(
                     userDiscoveryResponse.getFederationMetadataUrl(),
@@ -163,8 +165,11 @@ AuthorizationGrant getAuthorizationGrantIntegrated(String userName) throws Excep
                 getUserRealmEndpoint(URLEncoder.encode(userName, "UTF-8"));
 
         // Get the realm information
-        UserDiscoveryResponse userRealmResponse =
-                UserDiscoveryRequest.execute(userRealmEndpoint, context.proxy, context.sslSocketFactory);
+        UserDiscoveryResponse userRealmResponse = UserDiscoveryRequest.execute(
+                userRealmEndpoint, 
+                this.headers.getReadonlyHeaderMap(), 
+                context.proxy, 
+                context.sslSocketFactory);
 
         if (userRealmResponse.isAccountFederated() &&
                 "WSTrust".equalsIgnoreCase(userRealmResponse.getFederationProtocol())) {

src/main/java/com/microsoft/aad/adal4j/UserDiscoveryRequest.java

@@ -43,10 +43,12 @@ class UserDiscoveryRequest {
 
     }
 
-    static UserDiscoveryResponse execute(final String uri, final Proxy proxy,
-            final SSLSocketFactory sslSocketFactory) throws Exception {
-
-        String response = HttpHelper.executeHttpGet(log, uri, HEADERS, proxy,
+    static UserDiscoveryResponse execute(final String uri, final Map<String, String> clientDataHeaders,
+            final Proxy proxy, final SSLSocketFactory sslSocketFactory) throws Exception {
+            
+        HashMap<String, String> headers = new HashMap<>(HEADERS);
+        headers.putAll(clientDataHeaders);
+        String response = HttpHelper.executeHttpGet(log, uri, headers, proxy,
                 sslSocketFactory);
         return JsonHelper.convertJsonToObject(response,
                 UserDiscoveryResponse.class);

src/samples/public-client-app-sample/pom.xml

@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>adal4j</artifactId>
-			<version>1.6.2</version>
+			<version>1.6.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.nimbusds</groupId>

src/samples/public-client-device-code-sample/pom.xml

@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>adal4j</artifactId>
-            <version>1.6.2</version>
+            <version>1.6.3</version>
         </dependency>
         <dependency>
             <groupId>com.nimbusds</groupId>

src/samples/web-app-samples-for-adal4j/pom.xml

@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>adal4j</artifactId>
-			<version>1.6.2</version>
+			<version>1.6.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.nimbusds</groupId>

src/test/java/com/microsoft/aad/adal4j/AuthenticationContextTest.java

@@ -39,6 +39,7 @@
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 import java.util.Date;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -153,7 +154,10 @@ public void testAcquireToken_Username_Password() throws Exception {
 
 		PowerMock.mockStatic(UserDiscoveryRequest.class);
 		EasyMock.expect(
-				UserDiscoveryRequest.execute(EasyMock.isA(String.class), EasyMock.isNull(Proxy.class),
+				UserDiscoveryRequest.execute(
+						EasyMock.isA(String.class), 
+						EasyMock.isA(Map.class),
+						EasyMock.isNull(Proxy.class),
 						EasyMock.isNull(SSLSocketFactory.class))).andReturn(response);
 
 		PowerMock.replay(ctx, response, UserDiscoveryRequest.class);

src/test/java/com/microsoft/aad/adal4j/OAuthRequestValidationTest.java

@@ -125,7 +125,7 @@ private String getRSAjwt() throws NoSuchAlgorithmException, JOSEException {
         // RSA signatures require a public and private RSA key pair, the public key
         // must be made known to the JWS recipient in order to verify the signatures
         KeyPairGenerator keyGenerator = KeyPairGenerator.getInstance("RSA");
-        keyGenerator.initialize(1024);
+        keyGenerator.initialize(2048);
 
         KeyPair kp = keyGenerator.genKeyPair();
         RSAPublicKey publicKey = (RSAPublicKey)kp.getPublic();