Skip to content

Commit 8f00ea0

Browse files
Avery-DunnsiddhijainbgavrilMSDickson-Mwendiatcsizmadia
authored
MSAL Java/MSALRuntime integration (#590)
* Add IBroker implementation for MSALRuntime * Remove dll used during testing * Integrate broker steps to relevant flows in PublicClientApplication * Add logic to cancel MsalRuntimeFutures * Expand javadocs and exception handling * Address code review comments * Simplify future chaining, address code review comments * Reorganize future chaining, fix testing issues * Adjust how broker availability is checked * Create automated test * Adjust startup logic * Correct version number for interop * Correct broker versioning * Move broker tests to MSAL Java package * Remove usage of msal4j-brokers from msal4j * Add missing SLFJ dependency * Use newest msal4j * Bump javamsalruntime version number * Version changes for 1.14.0-beta release (#589) * Add missing pom info needed by sonatype * APIs for toggling MSALRuntime's logging (#608) * Add APIs for toggling MSALRuntime's logging systems * Rename logging methods to be more clear * Add support for POP tokens to MSAL Java and MSAL Java Brokers (#639) * Version changes for 1.14.0-beta release * regional endpoint change to always use login.microsoft.com * Add support for both current and legacy B2C authority formats (#594) * Add support for both current and legacy B2C authority formats * Fix B2C format test * add 2 seconds timeout while calling IMDS * Fix failing tests * Fix failing tests * delete commented out code * Use the dedicated admin consent endpoint instead of a query parameter (#599) * updated versions for release * update condition to throw exception * added test for invalid authority * Add tests for a CIAM user and reduce test code duplication (#603) * Add tests for a CIAM user and reduce code duplication in several test files * Revert changed method name * Attempt to resolve credscan flag * Resolve credscan issues * Address code review comments * Use default scope * expose extraQueryParameters * expose extraQueryParameters * ExtraQueryParameters tests * retrigger the tests * Updated an existing test case to check added parameters * Replace exception with warning * version updates for release * update json-smart version * Updated json-smart version Updated json-smart version to a 'bug-free' version * version updates for release * Initial commit * add CIAM authority file * revert authority validation changes * Fix failing tests * Fix failing tests * remove commented out line * remove unnecessary code * update exception message for device code flow * add refresh_in logic * resolve build issues + address PR comments * update tests * updated org-json version to resolve Dependabot alert * Better redirect URI error handling and dependency upgrade (#633) * Better error handling for redirect URIs * Update oauth2-oidc-sdk dependency * Address review comments Co-authored-by: Bogdan Gavril <[email protected]> --------- Co-authored-by: Bogdan Gavril <[email protected]> * Version updates for 1.13.8 release (#634) * Version updates for 1.13.8 release * Update changelog.txt * Point to MSAL Java reference docs onboarded to Microsoft Learn * Add support for POP tokens to MSAL Java and MSAL Java Brokers * Send extraQueryParameters to interop's AuthParameters * Avoid exposing new PopParameters class, change API to match design doc * Update msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/InteractiveRequestParameters.java Co-authored-by: Bogdan Gavril <[email protected]> * Update msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/InteractiveRequestParameters.java Co-authored-by: Bogdan Gavril <[email protected]> * Update change log URl in README.md (#649) Replaced broken link in change log reference with msal4j-sdk/changelog.txt * Issue 447 * Feedback incorporation * enum for os type * Use enum for HTTP methods * Add broker tests, address PR review comments * Improve PoP tests * Address code review comments * Version updates * Re-add extraQueryParameters support --------- Co-authored-by: siddhijain <[email protected]> Co-authored-by: Bogdan Gavril <[email protected]> Co-authored-by: Dickson Mwendia <[email protected]> Co-authored-by: Tamas Csizmadia <[email protected]> * Fix silent issue * Ensure correlation ID is never null * Broker fixes and feedback (#733) * Delete codeql.yml * Test framework update (#672) * Initial working tests * Remove CIAM extra query parameter * Fix failing tests * Remove duplicate unit tests * Remove duplicate unit tests * Update tests with mocking to use Mockito * Remove testng and powermock, add junit and mockito * Remove AbstractMsalTests and PowerMockTestCase * Fix mistaken null check * Properly scope dependency * Update CIAM tests (#673) * Bump guava from 31.1-jre to 32.0.0-jre in /msal4j-sdk (#671) Bumps [guava](https://github.com/google/guava) from 31.1-jre to 32.0.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Avery-Dunn <[email protected]> * Delete contributing.md (#667) Co-authored-by: Avery-Dunn <[email protected]> * Create Contributing.md (#668) Co-authored-by: Avery-Dunn <[email protected]> * Version changes for 1.13.9 (#674) * Add space between command and arguments when executing linux command to open browser. Refs #682 (#683) Co-authored-by: Ric Emery <[email protected]> * Assorted fixes (#684) * Remove default timeouts and improve exception messages * Fix NPE for on-prem ADFS scenario * Log MSAL message but re-throw exception * Update vulnerable test dependency * Issue-679: Fix for Account Cache; .contains() was not possible and you had to iterate through all elements as workaround. (#681) * Version changes for 1.13.10 (#685) * Move changelog * Move changelog to root * Update issue templates (#707) * Re-add lombok source line (#705) * Version changes for release 1.13.11 (#714) * Update bug report * Delete .github/ISSUE_TEMPLATE/bug_report.md * Update bug_report.yaml * Create FeatureRequest.yaml * Update FeatureRequest.yaml * Set default throttling time to 5 sec (#721) Co-authored-by: Kulyakhtin, Alexander (Ext) <[email protected]> * Ensure correlation ID is never null * Rename MsalRuntimeBroker and add builder pattern for better API consistency --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Bogdan Gavril <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ric Emery <[email protected]> Co-authored-by: Ric Emery <[email protected]> Co-authored-by: Maximilian Pfeffer <[email protected]> Co-authored-by: akulyakhtin <[email protected]> Co-authored-by: Kulyakhtin, Alexander (Ext) <[email protected]> * Version changes for msal4j-brokers 1.0.3-beta and msal4j 1.14.3-beta (#734) * Ensure correlation ID is never null * Version changes for msal4j-brokers 1.0.3-beta and msal4j 1.14.3-beta * Ensure that builder values for supported OS's are used * Release 1.14.0/1.0.0 version changes (#736) * Delete codeql.yml * Test framework update (#672) * Initial working tests * Remove CIAM extra query parameter * Fix failing tests * Remove duplicate unit tests * Remove duplicate unit tests * Update tests with mocking to use Mockito * Remove testng and powermock, add junit and mockito * Remove AbstractMsalTests and PowerMockTestCase * Fix mistaken null check * Properly scope dependency * Update CIAM tests (#673) * Bump guava from 31.1-jre to 32.0.0-jre in /msal4j-sdk (#671) Bumps [guava](https://github.com/google/guava) from 31.1-jre to 32.0.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Avery-Dunn <[email protected]> * Delete contributing.md (#667) Co-authored-by: Avery-Dunn <[email protected]> * Create Contributing.md (#668) Co-authored-by: Avery-Dunn <[email protected]> * Version changes for 1.13.9 (#674) * Add space between command and arguments when executing linux command to open browser. Refs #682 (#683) Co-authored-by: Ric Emery <[email protected]> * Assorted fixes (#684) * Remove default timeouts and improve exception messages * Fix NPE for on-prem ADFS scenario * Log MSAL message but re-throw exception * Update vulnerable test dependency * Issue-679: Fix for Account Cache; .contains() was not possible and you had to iterate through all elements as workaround. (#681) * Version changes for 1.13.10 (#685) * Move changelog * Move changelog to root * Update issue templates (#707) * Re-add lombok source line (#705) * Version changes for release 1.13.11 (#714) * Update bug report * Delete .github/ISSUE_TEMPLATE/bug_report.md * Update bug_report.yaml * Create FeatureRequest.yaml * Update FeatureRequest.yaml * Set default throttling time to 5 sec (#721) Co-authored-by: Kulyakhtin, Alexander (Ext) <[email protected]> * Version changes for 1.14.0 msal4j and 1.0.0 msal4j-brokers --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Bogdan Gavril <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ric Emery <[email protected]> Co-authored-by: Ric Emery <[email protected]> Co-authored-by: Maximilian Pfeffer <[email protected]> Co-authored-by: akulyakhtin <[email protected]> Co-authored-by: Kulyakhtin, Alexander (Ext) <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: siddhijain <[email protected]> Co-authored-by: Bogdan Gavril <[email protected]> Co-authored-by: Dickson Mwendia <[email protected]> Co-authored-by: Tamas Csizmadia <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ric Emery <[email protected]> Co-authored-by: Ric Emery <[email protected]> Co-authored-by: Maximilian Pfeffer <[email protected]> Co-authored-by: akulyakhtin <[email protected]> Co-authored-by: Kulyakhtin, Alexander (Ext) <[email protected]>
1 parent 39eb7d8 commit 8f00ea0

28 files changed

+1443
-79
lines changed

‎changelog.txt‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
1-
Version 1.13.11
1+
Version 1.14.0
22
=============
3-
- Hotfix for internal docs generation issue (#705)
3+
- GA release of MSAL Java Brokers package
4+
- Add support for acquiring bearer and proof-of-possession tokens using WAM as the broker (#590)
5+
- Default throttling time for password grant requests lowered to 5 seconds (#721)
6+
- Fix internal docs generation issue (#705)
7+
8+
Version 1.14.1-beta
9+
=============
10+
- Add proof-of-possession token support
11+
- Add MSALRuntime logging support
12+
13+
Version 1.14.0-beta
14+
=============
15+
- Add IBroker interface
16+
- Add app-level parameter for enabling the use of auth brokers
417

518
Version 1.13.10
619
=============

‎msal4j-brokers/changelog.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Version 1.0.0
2+
=============
3+
- Initial release
4+
- Provides the API and dependencies needed to acquire tokens via WAM

‎msal4j-brokers/pom.xml‎

Lines changed: 67 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.microsoft.azure</groupId>
77
<artifactId>msal4j-brokers</artifactId>
8-
<version>0.0.1</version>
8+
<version>1.0.0</version>
99
<packaging>jar</packaging>
1010
<name>msal4j-brokers</name>
1111
<description>
12-
Microsoft Authentication Library for Java - Brokers helps you integrate with the broker
13-
on windows machine to secure Access tokens and refresh tokens.
12+
Microsoft Authentication Library for Java - Brokers is a companion package for MSAL Java that allows easy integration with authentication brokers
1413
</description>
1514
<url>https://github.com/AzureAD/microsoft-authentication-library-for-java</url>
1615
<licenses>
@@ -22,22 +21,85 @@
2221
<scm>
2322
<url>https://github.com/AzureAD/microsoft-authentication-library-for-java</url>
2423
</scm>
24+
<developers>
25+
<developer>
26+
<id>ms</id>
27+
<name>Microsoft Corporation</name>
28+
</developer>
29+
</developers>
2530
<properties>
2631
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2732
</properties>
2833
<dependencies>
29-
<!-- https://mvnrepository.com/artifact/com.microsoft.azure/msal4j -->
3034
<dependency>
3135
<groupId>com.microsoft.azure</groupId>
3236
<artifactId>msal4j</artifactId>
33-
<version>1.13.2</version>
37+
<version>1.14.0</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>com.microsoft.azure</groupId>
41+
<artifactId>javamsalruntime</artifactId>
42+
<version>0.13.10</version>
3443
</dependency>
3544
<dependency>
3645
<groupId>org.projectlombok</groupId>
3746
<artifactId>lombok</artifactId>
3847
<version>1.18.6</version>
3948
<scope>provided</scope>
4049
</dependency>
50+
<dependency>
51+
<groupId>org.testng</groupId>
52+
<artifactId>testng</artifactId>
53+
<version>7.1.0</version>
54+
<scope>test</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.slf4j</groupId>
58+
<artifactId>slf4j-api</artifactId>
59+
<version>1.7.36</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>ch.qos.logback</groupId>
63+
<artifactId>logback-classic</artifactId>
64+
<version>1.2.3</version>
65+
<scope>test</scope>
66+
</dependency>
67+
<dependency>
68+
<groupId>commons-io</groupId>
69+
<artifactId>commons-io</artifactId>
70+
<version>2.11.0</version>
71+
<scope>test</scope>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.seleniumhq.selenium</groupId>
75+
<artifactId>selenium-api</artifactId>
76+
<version>3.14.0</version>
77+
<scope>test</scope>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.seleniumhq.selenium</groupId>
81+
<artifactId>selenium-chrome-driver</artifactId>
82+
<version>3.14.0</version>
83+
<scope>test</scope>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.seleniumhq.selenium</groupId>
87+
<artifactId>selenium-support</artifactId>
88+
<version>3.14.0</version>
89+
<scope>test</scope>
90+
</dependency>
91+
<dependency>
92+
<groupId>com.azure</groupId>
93+
<artifactId>azure-core</artifactId>
94+
<version>1.22.0</version>
95+
<scope>test</scope>
96+
</dependency>
97+
<dependency>
98+
<groupId>com.azure</groupId>
99+
<artifactId>azure-security-keyvault-secrets</artifactId>
100+
<version>4.3.5</version>
101+
<scope>test</scope>
102+
</dependency>
41103
</dependencies>
42104

43105
<!-- force https -->
@@ -60,7 +122,6 @@
60122
</pluginRepository>
61123
</pluginRepositories>
62124
<build>
63-
<sourceDirectory>${project.build.directory}/delombok</sourceDirectory>
64125
<plugins>
65126
<plugin>
66127
<groupId>org.projectlombok</groupId>

0 commit comments

Comments
 (0)