-
Notifications
You must be signed in to change notification settings - Fork 328
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
Fix for claims and client capabilities JSON merge bug in net6 #4452
Merged
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
bgavrilMS
approved these changes
Dec 4, 2023
github-actions
bot
requested review from
bgavrilMS,
neha-bhargava,
pmaytak and
trwalke
December 4, 2023 22:59
pmaytak
requested changes
Dec 5, 2023
tests/Microsoft.Identity.Test.Unit/CoreTests/OAuth2Tests/ClaimsTest.cs
Outdated
Show resolved
Hide resolved
tests/Microsoft.Identity.Test.Unit/CoreTests/OAuth2Tests/ClaimsTest.cs
Outdated
Show resolved
Hide resolved
bgavrilMS
approved these changes
Dec 5, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approve, but I agree with Peter's comment
pmaytak
approved these changes
Dec 5, 2023
pmaytak
changed the title
fix for json merge bug in net6
fix for claims and client capabilities JSON merge bug in net6
Dec 5, 2023
gladjohn
changed the title
fix for claims and client capabilities JSON merge bug in net6
Fix for claims and client capabilities JSON merge bug in net6
Dec 6, 2023
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.
Fixes : #4447
Identified a bug in MSAL's JSON merging logic affecting applications targeting .NET 6 and above. JSON objects with properties of the same name but different structures are not merged correctly, leading to data loss
problem : After merging, xms_cc is lost, retaining only the nbf property.
fix : This fix ensures that JSON merging is performed correctly, avoiding data loss when properties have the same name but different structures. The implementation considers various value kinds (objects, arrays) and recursively merges nested structures. It addresses the identified issue and provides a reliable merging mechanism for JSON objects.
Testing : Unit tests and manual verification that we pass capabilities now in net6.
Other notes : Unit tests also has coverage for net48 that uses newtonsoft code path, and we do not have this issue in that code path