Skip to content

added support for v2.0 #17

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

added support for v2.0 #17

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c8c172
added support for v2.0
aremo-ms Mar 31, 2022
9c3ef22
added issuer validator. Had to update versions for all projects to av…
aremo-ms Apr 8, 2022
9e3e35a
removed redundant method
aremo-ms Apr 8, 2022
242e57b
refactoring
aremo-ms Apr 11, 2022
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
14 changes: 14 additions & 0 deletions Microsoft.Identity.Web.Aspnet/CommonUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,20 @@ public static string EnsureAuthorityIsV2(string authority)
return authority;
}

/// <summary>
/// Create valid issuers both for V1.0 and V2.0
/// </summary>
/// <param name="webApiConfig"></param>
/// <returns></returns>
public static List<string> BuildValidIssuers(JwtBearerOptions webApiConfig)
{
return new List<string>
{
$"{EnsureTrailingSlash(webApiConfig.AADInstance)}{webApiConfig.TenantId}",
$"{EnsureTrailingSlash(webApiConfig.AADInstance)}{webApiConfig.TenantId}/v2.0"
};
}

public static string EnsureTrailingSlash(string value)
{
if (value == null)
Expand Down
6 changes: 5 additions & 1 deletion Microsoft.Identity.Web.Aspnet/MicrosoftIdentityWebApiAuthorizationBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using Microsoft.IdentityModel.Tokens;
using Microsoft.Owin.Security.ActiveDirectory;
using Owin;
using System;
using System.Collections.Generic;

namespace Microsoft.Identity.Web.Aspnet
{
Expand All @@ -17,10 +19,12 @@ public static void ProtectWebApiWithMicrosoftIdentity(this IAppBuilder app, JwtB
new WindowsAzureActiveDirectoryBearerAuthenticationOptions
{
Tenant = webApiConfig.TenantId,

TokenValidationParameters = new TokenValidationParameters
{
SaveSigninToken = true,
ValidAudiences = webApiConfig.ValidAudiences
ValidAudiences = webApiConfig.ValidAudiences,
ValidIssuers = CommonUtil.BuildValidIssuers(webApiConfig)
Copy link
Contributor

@jmprieur jmprieur Mar 31, 2022

Choose a reason for hiding this comment

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

Did you consider using ValidateIssuer instead ? (and set it to the AadIssuerValidator)?
https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/blob/039d09b7bc4c1671e1c4093d5a62d307c2f96935/src/Microsoft.IdentityModel.Validators/AadIssuerValidator/AadIssuerValidator.cs#L155-L156

Same for the other PR, btw

Copy link
Author

@aremo-ms aremo-ms Mar 31, 2022

Choose a reason for hiding this comment

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

@jmprieur Thank you, I will check it

Copy link
Contributor

@kalyankrishna1 kalyankrishna1 Mar 31, 2022

Choose a reason for hiding this comment

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

thats what he will do next

Copy link
Author

@aremo-ms aremo-ms Apr 8, 2022

Choose a reason for hiding this comment

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

@jmprieur done proposed change

}
});
}
Expand Down
2 changes: 1 addition & 1 deletion TodoListService/TodoListService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>False</UseIIS>
<UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>9184</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
Expand Down