Skip to content

Fix Instance/Tenant Parsing for V2 Authority #2954

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

Merged
sruke merged 6 commits into from
Jul 31, 2024
Merged

Fix Instance/Tenant Parsing for V2 Authority #2954

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d52ba4
Fix Tenant Parsing for V2 Authority
jackj-msft Jul 26, 2024
99b3d68
Consolidate line endings
jackj-msft Jul 26, 2024
12b60c5
Keep existing indexTenant check
jackj-msft Jul 26, 2024
9d28f2a
Put back the comment
jackj-msft Jul 26, 2024
de60bb9
use 'is' syntax for null checking
jackj-msft Jul 26, 2024
8bd3f6b
Merge branch 'master' into master
jennyf19 Jul 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
Prev Previous commit
Next Next commit
use 'is' syntax for null checking
  • Loading branch information
@jackj-msft
jackj-msft committed Jul 26, 2024
commit de60bb98eadd6687b35720ccf3368048c0fbc342
2 changes: 1 addition & 1 deletion src/Microsoft.Identity.Web.TokenAcquisition/MergedOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ internal static void UpdateMergedOptionsFromMicrosoftIdentityOptions(MicrosoftId
mergedOptions.TimeProvider = microsoftIdentityOptions.TimeProvider;
#endif
#if NET9_0_OR_GREATER
if (microsoftIdentityOptions.AdditionalAuthorizationParameters != null)
if (microsoftIdentityOptions.AdditionalAuthorizationParameters is not null)
{
foreach (var parameter in microsoftIdentityOptions.AdditionalAuthorizationParameters)
{
Expand Down