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.

Sign up for GitHub

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

Setting the correlation id for token request command #2413

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
+1 −0
Open

Setting the correlation id for token request command #2413

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02adf30
Setting the correlation id for token request command
SaurabhMSFT May 23, 2024
b2741b1
Set correlation ID instead of app version
SammyO May 29, 2024
7d889bc
Merge branch 'dev' into saugautam/corr
fadidurah May 30, 2024
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
1 change: 1 addition & 0 deletions common4j/src/main/com/microsoft/identity/common/java/controllers/BaseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,7 @@ protected TokenResult performSilentTokenRequest(
((MicrosoftTokenRequest) refreshTokenRequest).setClaims(parameters.getClaimsRequestJson());
((MicrosoftTokenRequest) refreshTokenRequest).setClientAppName(parameters.getApplicationName());
((MicrosoftTokenRequest) refreshTokenRequest).setClientAppVersion(parameters.getApplicationVersion());
((MicrosoftTokenRequest) refreshTokenRequest).setClientAppVersion(parameters.getCorrelationId());
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@SammyO @shahzaibj @fadidurah Discussion from the old PR in below screenshot.
image

Copy link
Contributor

Choose a reason for hiding this comment

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

Why are we setting correlation id as client app version?

Copy link
Contributor

Choose a reason for hiding this comment

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

That's a mistake, let me update this as Saurabh is OOO.

Copy link
Contributor

Choose a reason for hiding this comment

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

Updated. @shahzaibj please re-review. Specifically:

  • if the correlation ID in the parameter object isn't set, this will explicitly set the correlation ID in the request to null. Is that a problem? Is there another place in the code that checks whether the correlation ID is null and if so sets it to something (e.g. the API layer)?
  • are there other unwanted side-effects of this change?

Copy link
Contributor

Choose a reason for hiding this comment

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

@SaurabhMSFT did you test this? In my tests the request is not an instance of MicrosoftTokenRequest, so this code is not executed.


//NOTE: this should be moved to the strategy; however requires a larger refactor
if (parameters.getSdkType() == SdkType.ADAL) {
Expand Down
Loading