MSAL Java/MSALRuntime integration #590
Merged
+1,443
−79
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…b.com/AzureAD/microsoft-authentication-library-for-java into avdunn/msalruntime-broker
…tion-library-for-java into avdunn/msalruntime-broker
…tion-library-for-java into avdunn/msalruntime-broker
…tion-library-for-java into avdunn/msalruntime-broker
…avdunn/msalruntime-broker
* Add APIs for toggling MSALRuntime's logging systems * Rename logging methods to be more clear
* 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]>
…D/microsoft-authentication-library-for-java into avdunn/msalruntime-broker # Conflicts: # msal4j-brokers/pom.xml
…tion-library-for-java into avdunn/msalruntime-broker # Conflicts: # msal4j-sdk/README.md # msal4j-sdk/bnd.bnd # msal4j-sdk/changelog.txt # msal4j-sdk/pom.xml # msal4j-sdk/src/samples/msal-b2c-web-sample/pom.xml # msal4j-sdk/src/samples/msal-obo-sample/pom.xml # msal4j-sdk/src/samples/msal-web-sample/pom.xml
|
Is this PR still required? Are we making any changes here? |
This was a PR to help organize the MSALRuntime integration, to make it easier to see all the changes and leave comments while it's still in beta. It's been open longer than expected due to some delays in internal testing. |
* 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]>
…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
…D/microsoft-authentication-library-for-java into avdunn/msalruntime-broker # Conflicts: # msal4j-brokers/src/main/java/com/microsoft/aad/msal4jbrokers/Broker.java
* 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]>
Avery-Dunn
added a commit
that referenced
this pull request
Mar 25, 2024
* 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]> * 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]> * Version changes for 1.14.0 msal4j * Bump org.json:json in /msal4j-sdk/src/samples/msal-obo-sample (#740) Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.json:json in /msal4j-sdk/src/samples/msal-b2c-web-sample (#739) Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.json:json in /msal4j-sdk/src/samples/msal-web-sample (#737) Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Version updates for 1.14.4-beta release --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Bogdan Gavril <[email protected]> Co-authored-by: akulyakhtin <[email protected]> Co-authored-by: Kulyakhtin, Alexander (Ext) <[email protected]> Co-authored-by: siddhijain <[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]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
During beta testing of the MSAL Java/MSALRuntime integration the 'avdunn/msalruntime-broker' branch will act as the 'dev' branch, and is what will be used to build beta releases.
This PR is meant to make it easier to compare changes to the dev branch, and should not be merged in until we're ready to move the msal4j-broker changes out of beta.