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

Add support for both current and legacy B2C authority formats #594

Merged
merged 2 commits into from
Feb 16, 2023

Conversation

Avery-Dunn
Copy link
Collaborator

@Avery-Dunn Avery-Dunn commented Feb 9, 2023

Originally, MSALs needed B2C URLs to contain 'tfp' in the path to identify them as B2C authorities, so they needed to look like: https://<some host>/tfp/<tenant>/<policy>

However, some recent changes to B2C should ensure that all URLs have 'b2cloginc.com' as part of the host, so current B2C authorities should look like: https://<something>.b2clogin.com/<tenant>/<policy>

This PR adds support for the newer format, while retaining support for the legacy format until we're either confident that all customers have been moved to the new format (due to future potential Azure requirements) or we're able to make a breaking change (i.e., we're releasing MSAL Java 2.0)

*
* MSAL Java also supports a legacy B2C authority format, which looks like: https://<host>/tfp/<tenant>/<policy>
*
* However, MSAL Java will eventually stop supporting the legacy format. See here for information on how to migrate to the new format: https://aka.ms/msal4j-b2c
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice documentation!

public final static String B2C_AUTHORITY = "https://msidlabb2c.b2clogin.com/tfp/msidlabb2c.onmicrosoft.com/";
public final static String B2C_AUTHORITY_URL = "https://msidlabb2c.b2clogin.com/msidlabb2c.onmicrosoft.com/";
public final static String B2C_AUTHORITY = "https://msidlabb2c.b2clogin.com/msidlabb2c.onmicrosoft.com/";
public final static String B2C_AUTHORITY_LEGACY_FORMAT = "https://msidlabb2c.b2clogin.com/tfp/msidlabb2c.onmicrosoft.com/";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did legacy urls have ".b2clogin.com" in them? If not, we should modify this value so the execution goes to the place where tfp is checked.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like older B2C URLs could have it, since this constant has been unchanged since the original commit for it back in 2019:

public final static String B2C_AUTHORITY = "https://msidlabb2c.b2clogin.com/tfp/msidlabb2c.onmicrosoft.com/";

I think they just weren't guaranteed to have it, which is why the original B2C_MICROSOFTLOGIN_AUTHORITY used 'login.microsoftonline.com':

public final static String B2C_MICROSOFTLOGIN_AUTHORITY = "https://login.microsoftonline.com/tfp/msidlabb2c.onmicrosoft.com/";

Unfortunately it seems like ID labs updated some URLs so the old B2C_MICROSOFTLOGIN_AUTHORITY doesn't work anymore (you fixed that when you were updating the regional formats in #574), so I don't think there's a way for us to test a non-'b2clogin.com' URL.

Copy link
Contributor

@siddhijain siddhijain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Change the legacy test constant so it actually tests the tfp condition.
  2. Move the constant out of the try catch block.
    Rest everything looks good.

Copy link
Contributor

@siddhijain siddhijain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to merge once the tests pass.

@Avery-Dunn Avery-Dunn merged commit 92eace8 into dev Feb 16, 2023
@siddhijain siddhijain deleted the avdunn/b2c-format-update branch February 21, 2023 17:25
Avery-Dunn added a commit that referenced this pull request May 3, 2023
* Add README

* plugins for GPG signing

* more plugins to fix failing tests

* add azure-pipelines to build

* Add a source file

* change class modifier for javadocs

* Removing developer tag

* library version update to fix security vulnerability

* Updated jackson-databind version

* Updated versions for hotfix release.

* expose instanceDiscovery flag

* updated comments

* updated b2c authority url for tests

* address PR comments + more tests

* missed update for regional endpoint

* separated b2c and adfs tests

* Revert unintentional commit

* Revert unintentional commit

* Fix Issue 572

* Fixed failing test

* update regional endpoints

* Updating release numbers for beta release

* update versions for release

* remove unintentional commit

* Add IBroker implementation for MSALRuntime (#563)

* 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

* Revert "Add IBroker implementation for MSALRuntime (#563)" (#588)

This reverts commit aacb439.

* 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 <bogavril@microsoft.com>

---------

Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>

* 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

* Get main branch in sync with dev branch

* Manually resolve differences between main and dev branches

* Manually resolve differences between main and dev branches

---------

Co-authored-by: siddhijain <siddhijain@microsoft.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: Dickson Mwendia <64727760+Dickson-Mwendia@users.noreply.github.com>
Avery-Dunn added a commit that referenced this pull request Jun 19, 2023
* 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 <bogavril@microsoft.com>

---------

Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>

* 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 <bogavril@microsoft.com>

* Update msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/InteractiveRequestParameters.java

Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>

* 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 <siddhijain@microsoft.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: Dickson Mwendia <64727760+Dickson-Mwendia@users.noreply.github.com>
Co-authored-by: Tamas Csizmadia <tamas@me.com>
Avery-Dunn added a commit that referenced this pull request Oct 26, 2023
* 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 <bogavril@microsoft.com>

---------

Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>

* 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 <bogavril@microsoft.com>

* Update msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/InteractiveRequestParameters.java

Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>

* 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 <siddhijain@microsoft.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: Dickson Mwendia <64727760+Dickson-Mwendia@users.noreply.github.com>
Co-authored-by: Tamas Csizmadia <tamas@me.com>

* 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] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Delete contributing.md (#667)

Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Create Contributing.md (#668)

Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* 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 <remery@denmartech.com>

* 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) <alexander.kulyakhtin_ext@novartis.com>

* Ensure correlation ID is never null

* Rename MsalRuntimeBroker and add builder pattern for better API consistency

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ric Emery <ric.emery@gmail.com>
Co-authored-by: Ric Emery <remery@denmartech.com>
Co-authored-by: Maximilian Pfeffer <admin@maxpfeffer.de>
Co-authored-by: akulyakhtin <akulyakhtin@gmail.com>
Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>

* 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] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Delete contributing.md (#667)

Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Create Contributing.md (#668)

Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* 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 <remery@denmartech.com>

* 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) <alexander.kulyakhtin_ext@novartis.com>

* Version changes for 1.14.0 msal4j and 1.0.0 msal4j-brokers

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ric Emery <ric.emery@gmail.com>
Co-authored-by: Ric Emery <remery@denmartech.com>
Co-authored-by: Maximilian Pfeffer <admin@maxpfeffer.de>
Co-authored-by: akulyakhtin <akulyakhtin@gmail.com>
Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: siddhijain <siddhijain@microsoft.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: Dickson Mwendia <64727760+Dickson-Mwendia@users.noreply.github.com>
Co-authored-by: Tamas Csizmadia <tamas@me.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ric Emery <ric.emery@gmail.com>
Co-authored-by: Ric Emery <remery@denmartech.com>
Co-authored-by: Maximilian Pfeffer <admin@maxpfeffer.de>
Co-authored-by: akulyakhtin <akulyakhtin@gmail.com>
Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>
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) <alexander.kulyakhtin_ext@novartis.com>

* 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 <bogavril@microsoft.com>

---------

Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>

* 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 <bogavril@microsoft.com>

* Update msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/InteractiveRequestParameters.java

Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>

* 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 <siddhijain@microsoft.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: Dickson Mwendia <64727760+Dickson-Mwendia@users.noreply.github.com>
Co-authored-by: Tamas Csizmadia <tamas@me.com>

* 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] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Delete contributing.md (#667)

Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Create Contributing.md (#668)

Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* 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 <remery@denmartech.com>

* 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) <alexander.kulyakhtin_ext@novartis.com>

* Ensure correlation ID is never null

* Rename MsalRuntimeBroker and add builder pattern for better API consistency

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ric Emery <ric.emery@gmail.com>
Co-authored-by: Ric Emery <remery@denmartech.com>
Co-authored-by: Maximilian Pfeffer <admin@maxpfeffer.de>
Co-authored-by: akulyakhtin <akulyakhtin@gmail.com>
Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>

* 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] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Delete contributing.md (#667)

Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Create Contributing.md (#668)

Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* 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 <remery@denmartech.com>

* 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) <alexander.kulyakhtin_ext@novartis.com>

* Version changes for 1.14.0 msal4j and 1.0.0 msal4j-brokers

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ric Emery <ric.emery@gmail.com>
Co-authored-by: Ric Emery <remery@denmartech.com>
Co-authored-by: Maximilian Pfeffer <admin@maxpfeffer.de>
Co-authored-by: akulyakhtin <akulyakhtin@gmail.com>
Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: siddhijain <siddhijain@microsoft.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: Dickson Mwendia <64727760+Dickson-Mwendia@users.noreply.github.com>
Co-authored-by: Tamas Csizmadia <tamas@me.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ric Emery <ric.emery@gmail.com>
Co-authored-by: Ric Emery <remery@denmartech.com>
Co-authored-by: Maximilian Pfeffer <admin@maxpfeffer.de>
Co-authored-by: akulyakhtin <akulyakhtin@gmail.com>
Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>

* 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] <support@github.com>
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] <support@github.com>
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] <support@github.com>
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] <support@github.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: akulyakhtin <akulyakhtin@gmail.com>
Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>
Co-authored-by: siddhijain <siddhijain@microsoft.com>
Co-authored-by: Dickson Mwendia <64727760+Dickson-Mwendia@users.noreply.github.com>
Co-authored-by: Tamas Csizmadia <tamas@me.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ric Emery <ric.emery@gmail.com>
Co-authored-by: Ric Emery <remery@denmartech.com>
Co-authored-by: Maximilian Pfeffer <admin@maxpfeffer.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants