feat: extract entra tenant id from payload claims in id-token #3229
+10
−1
Conversation
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
tuunit
reviewed
Oct 28, 2025
tuunit
reviewed
Oct 28, 2025
Changed claim extraction from 'iss' to 'tid' with fallback.
tuunit
changed the title
Co-authored-by: Jan Larwig <jan@larwig.com>
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.
Changed claim extraction from 'iss' to 'tid' with fallback.
Proposed fix to resolve this issue: #2939
Description
Added retrieval of "tid" claim and return if available. Left the original logic in place as fallback.
Motivation and Context
Entra tokens already provide the Tenant ID value in "tid" claim. It would be simpler to get the tid value rather than trying to parse the Tenant ID from issuer url which requires handling different issuer url formats. The url format currently only supports com cloud so it will fail for all sovereign cloud tokens.
#2939
How Has This Been Tested?
I have not tested this. Submitting the fix to fast-track resolution of the issue since there are quite a few people reporting it and asking for update.
Checklist: