[Hotfix 24.2.1] Wire ClientDataInfo through AcquireTokenResult (#3109), Fixes AB#3604499#3118
Merged
fadidurah merged 4 commits intoMay 16, 2026
Conversation
Propagate the parsed x-ms-clientdata (token endpoint) and clientdata query parameter (authorize endpoint) data from the response handlers through TokenResult, MicrosoftStsAuthorizationResult, and ultimately onto AcquireTokenResult so callers can access server-side telemetry (error, sub-error, account type, cloud instance, data boundary). [AB#3604499](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3604499) --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
github-actions
Bot
changed the title
wzhipan
approved these changes
May 16, 2026
…i/hotfix-24.2.1-wire-clientdata # Conflicts: # changelog.txt # common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerResult.java # common/src/test/java/com/microsoft/identity/common/internal/request/MsalBrokerResultAdapterTests.kt # common4j/src/test/com/microsoft/identity/common/java/result/AcquireTokenResultTest.java
Updated changelog to include new version details and patches.
Updated changelog with new entries and version 24.2.0 details.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Cherry-picks #3109 (squash commit
26de108) ontoworking/release/24.2.1for the 24.2.1 hotfix.Propagates the parsed
x-ms-clientdata(token endpoint) andclientdataquery parameter (authorize endpoint) data from the response handlers throughTokenResult,MicrosoftStsAuthorizationResult, and ultimately ontoAcquireTokenResultso callers can access server-side telemetry (error, sub-error, account type, cloud instance, data boundary). All propagation is gated behind theENABLE_SERVER_CLIENT_DATA_TELEMETRYflight.Conflict resolution notes
The hotfix branch does not contain the onboarding-blob feature (PR #3088 / #3111) that landed on
devalongside #3109. To keep this hotfix scoped to ClientDataInfo only, the following PR-side additions were dropped during cherry-pick:BrokerResult.ONBOARDING_BLOBconstant (kept onlyCLIENT_DATA_INFO)MsalBrokerResultAdapterTests.testOnboardingBlob_*testsAcquireTokenResultTest.onboardingBlob_*testsvNextchangelog entries unrelated to Wire ClientDataInfo through AcquireTokenResult, Fixes AB#3604499 #3109All
ClientDataInfoplumbing from #3109 is preserved unchanged.AB#3604499