Merge branch 'dev' into sagonzal/addClientAssertion

sgonzalezMSFT · sgonzalezMSFT · commit 13d987004a63 · 2019-10-30T17:40:56.000-07:00
diff --git a/src/integrationtest/java/com.microsoft.aad.msal4j/AcquireTokenSilentIT.java b/src/integrationtest/java/com.microsoft.aad.msal4j/AcquireTokenSilentIT.java
@@ -56,7 +56,7 @@ public void acquireTokenSilent_LabAuthority_TokenNotRefreshed() throws Exception
         String password = labUserProvider.getUserPassword(labResponse.getUser());
         String labAuthority = TestConstants.MICROSOFT_AUTHORITY_HOST + labResponse.getUser().getTenantId();
 
-        PublicClientApplication pca = new PublicClientApplication.Builder(
+        PublicClientApplication pca = PublicClientApplication.builder(
                 labResponse.getAppId()).
                 authority(labAuthority).
                 build();
@@ -90,7 +90,7 @@ public void acquireTokenSilent_ForceRefresh() throws Exception {
                 false);
         String password = labUserProvider.getUserPassword(labResponse.getUser());
 
-        PublicClientApplication pca = new PublicClientApplication.Builder(
+        PublicClientApplication pca = PublicClientApplication.builder(
                 labResponse.getAppId()).
                 authority(TestConstants.ORGANIZATIONS_AUTHORITY).
                 build();
@@ -167,11 +167,9 @@ public void acquireTokenSilent_usingTenantSpecificAuthority_returnCachedAt() thr
                 NationalCloud.AZURE_CLOUD,
                 false);
         String tenantSpecificAuthority = TestConstants.MICROSOFT_AUTHORITY_HOST + labResponse.getUser().getTenantId();
-
         acquireTokenSilent_returnCachedTokens(tenantSpecificAuthority);
     }
 
-
     @Test
     public void acquireTokenSilent_ConfidentialClient_acquireTokenSilent() throws Exception{
 
@@ -236,7 +234,7 @@ private void acquireTokenSilent_returnCachedTokens(String authority) throws Exce
                 false);
         String password = labUserProvider.getUserPassword(labResponse.getUser());
 
-        PublicClientApplication pca = new PublicClientApplication.Builder(
+        PublicClientApplication pca = PublicClientApplication.builder(
                 labResponse.getAppId()).
                 authority(authority).
                 build();
@@ -267,7 +265,7 @@ private IPublicClientApplication getPublicClientApplicationWithTokensInCache()
                 false);
         String password = labUserProvider.getUserPassword(labResponse.getUser());
 
-        PublicClientApplication pca = new PublicClientApplication.Builder(
+        PublicClientApplication pca = PublicClientApplication.builder(
                 labResponse.getAppId()).
                 authority(TestConstants.ORGANIZATIONS_AUTHORITY).
                 build();
diff --git a/src/integrationtest/java/com.microsoft.aad.msal4j/ClientCredentialsIT.java b/src/integrationtest/java/com.microsoft.aad.msal4j/ClientCredentialsIT.java
@@ -59,7 +59,7 @@ public void acquireTokenClientCredentials_ClientAssertion() throws Exception{
     }
 
     private void assertAcquireTokenCommon(String clientId, IClientCredential credential) throws Exception{
-        ConfidentialClientApplication cca = new ConfidentialClientApplication.Builder(
+        ConfidentialClientApplication cca = ConfidentialClientApplication.builder(
                 clientId, credential).
                 authority(TestConstants.MICROSOFT_AUTHORITY).
                 build();
diff --git a/src/integrationtest/java/com.microsoft.aad.msal4j/DeviceCodeIT.java b/src/integrationtest/java/com.microsoft.aad.msal4j/DeviceCodeIT.java
@@ -42,7 +42,7 @@ public void DeviceCodeFlowTest() throws Exception {
                 false);
         labUserProvider.getUserPassword(labResponse.getUser());
 
-        PublicClientApplication pca = new PublicClientApplication.Builder(
+        PublicClientApplication pca = PublicClientApplication.builder(
                 labResponse.getAppId()).
                 authority(TestConstants.ORGANIZATIONS_AUTHORITY).
                 build();
diff --git a/src/integrationtest/java/com.microsoft.aad.msal4j/NationalCloudIT.java b/src/integrationtest/java/com.microsoft.aad.msal4j/NationalCloudIT.java
@@ -41,7 +41,7 @@ private void assertAcquireTokenCommon(NationalCloud cloud) throws Exception{
                 false);
         String password = labUserProvider.getUserPassword(labResponse.getUser());
 
-        PublicClientApplication pca = new PublicClientApplication.Builder(
+        PublicClientApplication pca = PublicClientApplication.builder(
                 labResponse.getAppId()).
                 authority(TestConstants.ORGANIZATIONS_AUTHORITY).
                 build();
diff --git a/src/integrationtest/java/com.microsoft.aad.msal4j/RefreshTokenIT.java b/src/integrationtest/java/com.microsoft.aad.msal4j/RefreshTokenIT.java
@@ -26,7 +26,7 @@ public void setUp() throws Exception {
                 NationalCloud.AZURE_CLOUD,
                 false);
         String password = labUserProvider.getUserPassword(labResponse.getUser());
-        pca = new PublicClientApplication.Builder(
+        pca = PublicClientApplication.builder(
                 labResponse.getAppId()).
                 authority(TestConstants.ORGANIZATIONS_AUTHORITY).
                 build();
diff --git a/src/integrationtest/java/com.microsoft.aad.msal4j/TokenCacheIT.java b/src/integrationtest/java/com.microsoft.aad.msal4j/TokenCacheIT.java
@@ -30,7 +30,7 @@ public void singleAccountInCache_RemoveAccountTest() throws Exception {
                 false);
         String password = labUserProvider.getUserPassword(labResponse.getUser());
 
-        PublicClientApplication pca = new PublicClientApplication.Builder(
+        PublicClientApplication pca = PublicClientApplication.builder(
                 labResponse.getAppId()).
                 authority(TestConstants.ORGANIZATIONS_AUTHORITY).
                 build();
@@ -62,7 +62,7 @@ public void twoAccountsInCache_RemoveAccountTest() throws Exception{
                 false);
         String password = labUserProvider.getUserPassword(labResponse1.getUser());
 
-        PublicClientApplication pca = new PublicClientApplication.Builder(
+        PublicClientApplication pca = PublicClientApplication.builder(
                 labResponse1.getAppId()).
                 authority(TestConstants.ORGANIZATIONS_AUTHORITY).
                 build();
@@ -125,7 +125,7 @@ public void twoAccountsInCache_SameUserDifferentTenants_RemoveAccountTest() thro
         ITokenCacheAccessAspect persistenceAspect = new TokenPersistence(dataToInitCache);
 
         // acquire tokens for home tenant, and serialize cache
-        PublicClientApplication pca = new PublicClientApplication.Builder(
+        PublicClientApplication pca = PublicClientApplication.builder(
                 labResponse.getAppId()).
                 authority(TestConstants.ORGANIZATIONS_AUTHORITY)
                 .setTokenCacheAccessAspect(persistenceAspect)
@@ -141,7 +141,7 @@ public void twoAccountsInCache_SameUserDifferentTenants_RemoveAccountTest() thro
         String guestTenantAuthority = TestConstants.MICROSOFT_AUTHORITY_HOST + labResponse.getUser().getTenantId();
 
         // initialize pca with tenant where user is guest, deserialize cache, and acquire second token
-        PublicClientApplication pca2 = new PublicClientApplication.Builder(
+        PublicClientApplication pca2 = PublicClientApplication.builder(
                 labResponse.getAppId()).
                 authority(guestTenantAuthority).
                 setTokenCacheAccessAspect(persistenceAspect).
diff --git a/src/integrationtest/java/com.microsoft.aad.msal4j/UsernamePasswordIT.java b/src/integrationtest/java/com.microsoft.aad.msal4j/UsernamePasswordIT.java
@@ -75,7 +75,7 @@ public void acquireTokenWithUsernamePassword_ADFSv2() throws Exception{
 
     public void assertAcquireTokenCommon(LabResponse labResponse, String password)
             throws Exception{
-        PublicClientApplication pca = new PublicClientApplication.Builder(
+        PublicClientApplication pca = PublicClientApplication.builder(
                 labResponse.getAppId()).
                 authority(TestConstants.ORGANIZATIONS_AUTHORITY).
                 build();
@@ -103,7 +103,7 @@ public void acquireTokenWithUsernamePassword_B2C_CustomAuthority() throws Except
         String b2CAppId = "e3b9ad76-9763-4827-b088-80c7a7888f79";
         String password = labUserProvider.getUserPassword(labResponse.getUser());
 
-        PublicClientApplication pca = new PublicClientApplication.Builder(
+        PublicClientApplication pca = PublicClientApplication.builder(
                 b2CAppId).
                 b2cAuthority(TestConstants.B2C_AUTHORITY_ROPC).
                 build();
@@ -129,7 +129,7 @@ public void acquireTokenWithUsernamePassword_B2C_LoginMicrosoftOnline() throws E
         String b2CAppId = "e3b9ad76-9763-4827-b088-80c7a7888f79";
         String password = labUserProvider.getUserPassword(labResponse.getUser());
 
-        PublicClientApplication pca = new PublicClientApplication.Builder(
+        PublicClientApplication pca = PublicClientApplication.builder(
                 b2CAppId).
                 b2cAuthority(TestConstants.B2C_MICROSOFTLOGIN_ROPC).
                 build();
diff --git a/src/main/java/com/microsoft/aad/msal4j/ConfidentialClientApplication.java b/src/main/java/com/microsoft/aad/msal4j/ConfidentialClientApplication.java
@@ -111,14 +111,7 @@ public static class Builder extends ClientApplicationBase.Builder<Builder> {
 
         private IClientCredential clientCredential;
 
-        /**
-         * Constructor to create instance of Builder of ConfidentialClientApplication
-         *
-         * @param clientId         Client ID (Application ID) of the application as registered
-         *                         in the application registration portal (portal.azure.com)
-         * @param clientCredential The client credential to use for token acquisition.
-         */
-        Builder(String clientId, IClientCredential clientCredential) {
+        private Builder(String clientId, IClientCredential clientCredential) {
             super(clientId);
             this.clientCredential = clientCredential;
         }
diff --git a/src/main/java/com/microsoft/aad/msal4j/PublicClientApplication.java b/src/main/java/com/microsoft/aad/msal4j/PublicClientApplication.java
@@ -97,13 +97,7 @@ public static Builder builder(String clientId) {
 
     public static class Builder extends ClientApplicationBase.Builder<Builder> {
 
-        /**
-         * Constructor to create instance of Builder of PublicClientApplication
-         *
-         * @param clientId Client ID (Application ID) of the application as registered
-         *                 in the application registration portal (portal.azure.com)
-         */
-        Builder(String clientId) {
+        private Builder(String clientId) {
             super(clientId);
         }
 
diff --git a/src/test/java/com/microsoft/aad/msal4j/CacheFormatTests.java b/src/test/java/com/microsoft/aad/msal4j/CacheFormatTests.java
@@ -126,7 +126,7 @@ public void tokenCacheEntitiesFormatTest(String folder) throws URISyntaxExceptio
 
         String tokenResponse = getTokenResponse(folder);
 
-        PublicClientApplication app = new PublicClientApplication.Builder(CLIENT_ID).build();
+        PublicClientApplication app = PublicClientApplication.builder(CLIENT_ID).build();
 
         AuthorizationCodeParameters parameters =
                 AuthorizationCodeParameters.builder
diff --git a/src/test/java/com/microsoft/aad/msal4j/ConfidentialClientApplicationTest.java b/src/test/java/com/microsoft/aad/msal4j/ConfidentialClientApplicationTest.java
@@ -35,7 +35,7 @@ public class ConfidentialClientApplicationTest extends PowerMockTestCase {
     public void testAcquireTokenAuthCode_ClientCredential() throws Exception {
         app = PowerMock.createPartialMock(ConfidentialClientApplication.class,
                 new String[] { "acquireTokenCommon" },
-                new ConfidentialClientApplication.Builder(TestConfiguration.AAD_CLIENT_ID,
+                ConfidentialClientApplication.builder(TestConfiguration.AAD_CLIENT_ID,
                 ClientCredentialFactory.createFromSecret(TestConfiguration.AAD_CLIENT_SECRET))
                         .authority(TestConfiguration.AAD_TENANT_ENDPOINT)
         );
@@ -82,7 +82,7 @@ public void testAcquireTokenAuthCode_KeyCredential() throws Exception {
 
         app = PowerMock.createPartialMock(ConfidentialClientApplication.class,
                 new String[] { "acquireTokenCommon" },
-                new ConfidentialClientApplication.Builder(TestConfiguration.AAD_CLIENT_ID, clientCredential)
+                ConfidentialClientApplication.builder(TestConfiguration.AAD_CLIENT_ID, clientCredential)
                         .authority(TestConfiguration.AAD_TENANT_ENDPOINT));
 
         PowerMock.expectPrivate(app, "acquireTokenCommon",
@@ -127,7 +127,7 @@ public void testAcquireToken_KeyCred() throws Exception {
 
         app = PowerMock.createPartialMock(ConfidentialClientApplication.class,
                 new String[] { "acquireTokenCommon" },
-                new ConfidentialClientApplication.Builder(TestConfiguration.AAD_CLIENT_ID, clientCredential)
+                ConfidentialClientApplication.builder(TestConfiguration.AAD_CLIENT_ID, clientCredential)
                         .authority(TestConfiguration.AAD_TENANT_ENDPOINT));
 
         PowerMock.expectPrivate(app, "acquireTokenCommon",
diff --git a/src/test/java/com/microsoft/aad/msal4j/DeviceCodeFlowTest.java b/src/test/java/com/microsoft/aad/msal4j/DeviceCodeFlowTest.java
@@ -63,7 +63,7 @@ public static Map<String, String> getQueryMap(String query)
     public void deviceCodeFlowTest() throws Exception {
         app = PowerMock.createPartialMock(PublicClientApplication.class,
                 new String[] { "acquireTokenCommon" },
-                new PublicClientApplication.Builder(TestConfiguration.AAD_CLIENT_ID)
+                PublicClientApplication.builder(TestConfiguration.AAD_CLIENT_ID)
                         .authority(TestConfiguration.AAD_TENANT_ENDPOINT));
 
         Capture<MsalRequest> capturedMsalRequest = Capture.newInstance();
@@ -158,7 +158,7 @@ public void deviceCodeFlowTest() throws Exception {
 //    public void executeAcquireDeviceCode_AdfsAuthorityUsed_IllegalArgumentExceptionThrown()
 //            throws Exception {
 //
-//        app = new PublicClientApplication.Builder("client_id")
+//        app = PublicClientApplication.builder("client_id")
 //                .authority(ADFS_TENANT_ENDPOINT)
 //                .validateAuthority(false).build();
 //
@@ -173,7 +173,7 @@ public void deviceCodeFlowTest() throws Exception {
     public void executeAcquireDeviceCode_B2CAuthorityUsed_IllegalArgumentExceptionThrown()
             throws Exception {
 
-        app = new PublicClientApplication.Builder("client_id")
+        app = PublicClientApplication.builder("client_id")
                 .b2cAuthority(TestConfiguration.B2C_AUTHORITY)
                 .validateAuthority(false).build();
 
@@ -195,7 +195,7 @@ public void executeAcquireDeviceCode_AuthenticaionPendingErrorReturned_Authentic
 
         Consumer<DeviceCode> deviceCodeConsumer = (DeviceCode deviceCode) -> { };
 
-        app = new PublicClientApplication.Builder("client_id")
+        app = PublicClientApplication.builder("client_id")
                 .authority(AAD_TENANT_ENDPOINT)
                 .validateAuthority(false)
                 .build();
diff --git a/src/test/java/com/microsoft/aad/msal4j/OAuthRequestValidationTest.java b/src/test/java/com/microsoft/aad/msal4j/OAuthRequestValidationTest.java
@@ -141,7 +141,7 @@ private String getRSAjwt() throws NoSuchAlgorithmException, JOSEException {
     @Test
     public void oAuthRequest_for_acquireTokenByUserAssertion() throws Exception {
         ConfidentialClientApplication app =
-                new ConfidentialClientApplication.Builder(CLIENT_ID, ClientCredentialFactory.createFromSecret(CLIENT_SECRET))
+                ConfidentialClientApplication.builder(CLIENT_ID, ClientCredentialFactory.createFromSecret(CLIENT_SECRET))
                         .authority(AUTHORITY)
                         .validateAuthority(false).build();
 
@@ -210,7 +210,7 @@ public void oAuthRequest_for_acquireTokenByAsymmetricKeyCredential() throws Exce
 
             IClientCredential clientCredential = ClientCredentialFactory.createFromCertificate(key, cert);
 
-            ConfidentialClientApplication app = new ConfidentialClientApplication.Builder(CLIENT_ID, clientCredential)
+            ConfidentialClientApplication app = ConfidentialClientApplication.builder(CLIENT_ID, clientCredential)
                     .authority(AUTHORITY)
                     .validateAuthority(false).build();
 
@@ -260,7 +260,7 @@ public void oAuthRequest_for_acquireTokenByClientAssertion() throws Exception {
                     .getCertificate(alias);
 
             ConfidentialClientApplication app =
-                    new ConfidentialClientApplication.Builder(CLIENT_ID, ClientCredentialFactory.createFromCertificate(key, cert))
+                    ConfidentialClientApplication.builder(CLIENT_ID, ClientCredentialFactory.createFromCertificate(key, cert))
                             .authority(AUTHORITY)
                             .validateAuthority(false)
                             .build();
diff --git a/src/test/java/com/microsoft/aad/msal4j/PublicClientApplicationTest.java b/src/test/java/com/microsoft/aad/msal4j/PublicClientApplicationTest.java
@@ -29,7 +29,7 @@ public class PublicClientApplicationTest extends PowerMockTestCase {
     public void testAcquireToken_Username_Password() throws Exception {
         app = PowerMock.createPartialMock(PublicClientApplication.class,
                 new String[] { "acquireTokenCommon" },
-                new PublicClientApplication.Builder(TestConfiguration.AAD_CLIENT_ID)
+                PublicClientApplication.builder(TestConfiguration.AAD_CLIENT_ID)
                         .authority(TestConfiguration.AAD_TENANT_ENDPOINT));
 
         PowerMock.expectPrivate(app, "acquireTokenCommon",
diff --git a/src/test/java/com/microsoft/aad/msal4j/TelemetryTests.java b/src/test/java/com/microsoft/aad/msal4j/TelemetryTests.java
@@ -41,7 +41,7 @@ private void cleanUp(){
 
     @Test
     public void telemetryConsumerRegistration_ConsumerNotNullTest(){
-        PublicClientApplication app = new PublicClientApplication.Builder("a1b2c3")
+        PublicClientApplication app = PublicClientApplication.builder("a1b2c3")
                 .telemetryConsumer(new MyTelemetryConsumer().telemetryConsumer)
                 .build();
 
diff --git a/src/test/java/com/microsoft/aad/msal4j/TokenRequestTest.java b/src/test/java/com/microsoft/aad/msal4j/TokenRequestTest.java
@@ -107,7 +107,7 @@ public void executeOAuthRequest_SCBadRequestErrorInvalidGrant_SubErrorFilteredSe
     }
 
     private TokenRequest createMockedTokenRequest() throws URISyntaxException, MalformedURLException {
-        PublicClientApplication app = new PublicClientApplication.Builder("id").build();
+        PublicClientApplication app = PublicClientApplication.builder("id").build();
 
         AuthorizationCodeParameters parameters = AuthorizationCodeParameters
                 .builder("code", new URI("http://my.redirect.com"))
@@ -138,7 +138,7 @@ private TokenRequest createMockedTokenRequest() throws URISyntaxException, Malfo
     public void testConstructor() throws MalformedURLException,
             URISyntaxException {
 
-        PublicClientApplication app = new PublicClientApplication.Builder("id").build();
+        PublicClientApplication app = PublicClientApplication.builder("id").build();
 
         AuthorizationCodeParameters parameters = AuthorizationCodeParameters
                 .builder("code", new URI("http://my.redirect.com"))
@@ -164,7 +164,7 @@ public void testConstructor() throws MalformedURLException,
     public void testToOAuthRequestNonEmptyCorrelationId()
             throws MalformedURLException, SerializeException, URISyntaxException {
 
-        PublicClientApplication app = new PublicClientApplication.Builder("id").build();
+        PublicClientApplication app = PublicClientApplication.builder("id").build();
 
         AuthorizationCodeParameters parameters = AuthorizationCodeParameters
                 .builder("code", new URI("http://my.redirect.com"))
@@ -197,7 +197,7 @@ public void testToOAuthRequestNullCorrelationId_NullClientAuth()
             throws MalformedURLException, SerializeException,
             URISyntaxException {
 
-        PublicClientApplication app = new PublicClientApplication.Builder("id").build();
+        PublicClientApplication app = PublicClientApplication.builder("id").build();
 
         AuthorizationCodeParameters parameters = AuthorizationCodeParameters
                 .builder("code", new URI("http://my.redirect.com"))
@@ -225,7 +225,7 @@ public void testToOAuthRequestNullCorrelationId_NullClientAuth()
     public void testExecuteOAuth_Success() throws SerializeException, ParseException, MsalException,
             IOException, URISyntaxException {
 
-        PublicClientApplication app = new PublicClientApplication.Builder("id").build();
+        PublicClientApplication app = PublicClientApplication.builder("id").build();
 
         AuthorizationCodeParameters parameters = AuthorizationCodeParameters
                 .builder("code", new URI("http://my.redirect.com"))
@@ -291,7 +291,7 @@ public void testExecuteOAuth_Success() throws SerializeException, ParseException
     public void testExecuteOAuth_Failure() throws SerializeException,
             ParseException, MsalException, IOException, URISyntaxException {
 
-        PublicClientApplication app = new PublicClientApplication.Builder("id").build();
+        PublicClientApplication app = PublicClientApplication.builder("id").build();
 
         AuthorizationCodeParameters parameters = AuthorizationCodeParameters
                 .builder("code", new URI("http://my.redirect.com"))

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public void acquireTokenClientCredentials_ClientAssertion() throws Exception{`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`private void assertAcquireTokenCommon(String clientId, IClientCredential credential) throws Exception{`
`62`		`- ConfidentialClientApplication cca = new ConfidentialClientApplication.Builder(`
	`62`	`+ ConfidentialClientApplication cca = ConfidentialClientApplication.builder(`
`63`	`63`	`clientId, credential).`
`64`	`64`	`authority(TestConstants.MICROSOFT_AUTHORITY).`
`65`	`65`	`build();`