Skip to content

Commit 3a5fdb6

Browse files
jennyf19jennyf19
authored
Merge pull request #335 from Azure-Samples/jennyf/0.1.1
update to 0.1.1-preview and use ClaimConstants
2 parents 0eaaf9f + 8a6acd8 commit 3a5fdb6

File tree

17 files changed

+38
-39
lines changed

17 files changed

+38
-39
lines changed

‎1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>
2727
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
28-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
29-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
28+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
29+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
3030
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
3131
</ItemGroup>
3232

‎1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
22-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
21+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
22+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
2323
</ItemGroup>
2424

2525
</Project>

‎1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
22-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
21+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
22+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
2323
</ItemGroup>
2424

2525
</Project>

‎1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
22-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
21+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
22+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
2323
</ItemGroup>
2424

2525
</Project>

‎1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
22-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
21+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
22+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
2323
</ItemGroup>
2424

2525
</Project>

‎2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
<ItemGroup>
2121
<PackageReference Include="Microsoft.Graph" Version="1.21.0" />
22-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
23-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
22+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
23+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
2424
</ItemGroup>
2525

2626
</Project>

‎2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<ItemGroup>
2121
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1" />
2222
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="3.0.1" />
23-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
24-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
23+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
24+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
2525
</ItemGroup>
2626

2727
</Project>

‎2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.1" />
2323
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1" />
2424
<PackageReference Include="Microsoft.Graph" Version="1.20.0" />
25-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
26-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
25+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
26+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
2727
</ItemGroup>
2828

2929
</Project>

‎2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
22-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
21+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
22+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
2323
</ItemGroup>
2424

2525
</Project>

‎3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
<ItemGroup>
2121
<PackageReference Include="Microsoft.Graph" Version="1.12.0" />
22-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
23-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
22+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
23+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
2424
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
2525
</ItemGroup>
2626

‎4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<ItemGroup>
2525
<PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.1" />
2626
<PackageReference Include="Microsoft.Graph" Version="1.16.0" />
27-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
28-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
27+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
28+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
2929
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
3030
</ItemGroup>
3131

‎4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
10+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
1111
</ItemGroup>
1212

1313
</Project>

‎4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<ItemGroup>
2525
<PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.1" />
2626
<PackageReference Include="Microsoft.Graph" Version="1.16.0" />
27-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
28-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
27+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
28+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
2929
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
3030
</ItemGroup>
3131

‎4-WebApp-your-API/4-2-B2C/TodoListService/AuthorizationPolicies/ScopesRequirement.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
using Microsoft.AspNetCore.Authorization;
2-
using Microsoft.AspNetCore.Authorization.Infrastructure;
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
using Microsoft.AspNetCore.Authorization;
35
using Microsoft.Identity.Web;
4-
using System;
56
using System.Linq;
67
using System.Security.Claims;
78
using System.Threading.Tasks;
@@ -27,19 +28,17 @@ public ScopesRequirement(params string[] acceptedScopes)
2728
protected override Task HandleRequirementAsync(AuthorizationHandlerContext context,
2829
ScopesRequirement requirement)
2930
{
30-
string scope = "http://schemas.microsoft.com/identity/claims/scope";
31-
string scp = "scp";
3231
// If there are no scopes, do not process
33-
if (!context.User.Claims.Any(x => x.Type == scope)
34-
&& !context.User.Claims.Any(y => y.Type == scp))
32+
if (!context.User.Claims.Any(x => x.Type == ClaimConstants.Scope)
33+
&& !context.User.Claims.Any(y => y.Type == ClaimConstants.Scp))
3534
{
3635
return Task.CompletedTask;
3736
}
3837

39-
Claim scopeClaim = context?.User?.FindFirst(scp);
38+
Claim scopeClaim = context?.User?.FindFirst(ClaimConstants.Scp);
4039

4140
if (scopeClaim == null)
42-
scopeClaim = context?.User?.FindFirst(scope);
41+
scopeClaim = context?.User?.FindFirst(ClaimConstants.Scope);
4342

4443
if (scopeClaim != null && scopeClaim.Value.Split(' ').Intersect(requirement._acceptedScopes).Any())
4544
{

‎4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
10+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
1111
</ItemGroup>
1212

1313
</Project>

‎5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
<ItemGroup>
2121
<PackageReference Include="Microsoft.Graph" Version="1.21.0" />
22-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
23-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
22+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
23+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
2424
</ItemGroup>
2525

2626
</Project>

‎5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
<ItemGroup>
2121
<PackageReference Include="Microsoft.Graph" Version="1.21.0" />
22-
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.0-preview" />
23-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.0-preview" />
22+
<PackageReference Include="Microsoft.Identity.Web" Version="0.1.1-preview" />
23+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="0.1.1-preview" />
2424
</ItemGroup>
2525

2626
</Project>

0 commit comments

Comments
 (0)