Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MSAL Java/MSALRuntime integration #590

Merged
merged 36 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
e9a44d5
Add IBroker implementation for MSALRuntime
Avery-Dunn Oct 23, 2022
31aa38d
Merge branches 'avdunn/msalruntime-broker' and 'dev' of https://githu…
Avery-Dunn Dec 15, 2022
8a8df73
Remove dll used during testing
Avery-Dunn Dec 19, 2022
5b8e235
Integrate broker steps to relevant flows in PublicClientApplication
Avery-Dunn Dec 20, 2022
ade0717
Add logic to cancel MsalRuntimeFutures
Avery-Dunn Jan 4, 2023
77e9304
Expand javadocs and exception handling
Avery-Dunn Jan 5, 2023
45b4a40
Address code review comments
Avery-Dunn Jan 5, 2023
3df9af2
Simplify future chaining, address code review comments
Avery-Dunn Jan 5, 2023
2fd56ec
Reorganize future chaining, fix testing issues
Avery-Dunn Jan 11, 2023
fdf9ef7
Adjust how broker availability is checked
Avery-Dunn Jan 12, 2023
9152677
Create automated test
Avery-Dunn Jan 12, 2023
dc79a19
Adjust startup logic
Avery-Dunn Jan 12, 2023
ab4f576
Correct version number for interop
Avery-Dunn Jan 18, 2023
a518eda
Correct broker versioning
Avery-Dunn Jan 18, 2023
40da5b0
Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentica…
Avery-Dunn Jan 24, 2023
9349e7e
Move broker tests to MSAL Java package
Avery-Dunn Jan 24, 2023
b95362b
Remove usage of msal4j-brokers from msal4j
Avery-Dunn Jan 26, 2023
f684388
Add missing SLFJ dependency
Avery-Dunn Jan 30, 2023
0ba0522
Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentica…
Avery-Dunn Jan 30, 2023
8e73565
Use newest msal4j
Avery-Dunn Jan 30, 2023
de9c85b
Bump javamsalruntime version number
Avery-Dunn Jan 31, 2023
79fab10
Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentica…
Avery-Dunn Jan 31, 2023
1e336b1
Version changes for 1.14.0-beta release (#589)
Avery-Dunn Jan 31, 2023
596f134
Add missing pom info needed by sonatype
Avery-Dunn Jan 31, 2023
5ae3186
Merge remote-tracking branch 'origin/avdunn/msalruntime-broker' into …
Avery-Dunn Jan 31, 2023
0a39518
APIs for toggling MSALRuntime's logging (#608)
Avery-Dunn Jun 14, 2023
b27c81b
Add support for POP tokens to MSAL Java and MSAL Java Brokers (#639)
Avery-Dunn Jun 19, 2023
8c647a8
Fix silent issue
Avery-Dunn Jun 20, 2023
c778aa0
Merge branch 'avdunn/msalruntime-broker' of https://github.com/AzureA…
Avery-Dunn Jun 20, 2023
f638f61
Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentica…
Avery-Dunn Jun 20, 2023
6fc2c6c
Ensure correlation ID is never null
Avery-Dunn Oct 8, 2023
d627b7a
Broker fixes and feedback (#733)
Avery-Dunn Oct 20, 2023
b551e70
Version changes for msal4j-brokers 1.0.3-beta and msal4j 1.14.3-beta …
Avery-Dunn Oct 25, 2023
d30509c
Merge branch 'avdunn/msalruntime-broker' of https://github.com/AzureA…
Avery-Dunn Oct 26, 2023
27c3fee
Release 1.14.0/1.0.0 version changes (#736)
Avery-Dunn Oct 26, 2023
961092a
Merge branch 'dev' into avdunn/msalruntime-broker
Avery-Dunn Oct 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
Version 1.13.11
Version 1.14.0
=============
- Hotfix for internal docs generation issue (#705)
- GA release of MSAL Java Brokers package
- Add support for acquiring bearer and proof-of-possession tokens using WAM as the broker (#590)
- Default throttling time for password grant requests lowered to 5 seconds (#721)
- Fix internal docs generation issue (#705)

Version 1.14.1-beta
=============
- Add proof-of-possession token support
- Add MSALRuntime logging support

Version 1.14.0-beta
=============
- Add IBroker interface
- Add app-level parameter for enabling the use of auth brokers

Version 1.13.10
=============
Expand Down
4 changes: 4 additions & 0 deletions msal4j-brokers/changelog.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Version 1.0.0
=============
- Initial release
- Provides the API and dependencies needed to acquire tokens via WAM
73 changes: 67 additions & 6 deletions msal4j-brokers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.microsoft.azure</groupId>
<artifactId>msal4j-brokers</artifactId>
<version>0.0.1</version>
<version>1.0.0</version>
<packaging>jar</packaging>
<name>msal4j-brokers</name>
<description>
Microsoft Authentication Library for Java - Brokers helps you integrate with the broker
on windows machine to secure Access tokens and refresh tokens.
Microsoft Authentication Library for Java - Brokers is a companion package for MSAL Java that allows easy integration with authentication brokers
</description>
<url>https://github.com/AzureAD/microsoft-authentication-library-for-java</url>
<licenses>
Expand All @@ -22,22 +21,85 @@
<scm>
<url>https://github.com/AzureAD/microsoft-authentication-library-for-java</url>
</scm>
<developers>
<developer>
<id>ms</id>
<name>Microsoft Corporation</name>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<!-- https://mvnrepository.com/artifact/com.microsoft.azure/msal4j -->
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>msal4j</artifactId>
<version>1.13.2</version>
<version>1.14.0</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>javamsalruntime</artifactId>
<version>0.13.10</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>7.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-api</artifactId>
<version>3.14.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
<version>3.14.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-support</artifactId>
<version>3.14.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.22.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.3.5</version>
<scope>test</scope>
</dependency>
</dependencies>

<!-- force https -->
Expand All @@ -60,7 +122,6 @@
</pluginRepository>
</pluginRepositories>
<build>
<sourceDirectory>${project.build.directory}/delombok</sourceDirectory>
<plugins>
<plugin>
<groupId>org.projectlombok</groupId>
Expand Down
Loading