Skip to content
This repository was archived by the owner on Jan 24, 2025. It is now read-only.

Commit 6aa132d

Browse files
damianhdamianh
authored
Merge pull request #212 from damianh/dh/duende-identitymodel-7
Using Duende.IdentityModel and update package references.
2 parents d80fa66 + b5d4f72 commit 6aa132d

35 files changed

+64
-54
lines changed

‎Directory.Build.targets

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project>
22
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0'">
33
<FrameworkVersionRuntime>8.0.0</FrameworkVersionRuntime>
4-
<FrameworkVersionTesting>8.0.8</FrameworkVersionTesting>
5-
<WilsonVersion>7.1.2</WilsonVersion> <!-- Used in samples -->
4+
<FrameworkVersionTesting>8.0.11</FrameworkVersionTesting>
5+
<WilsonVersion>8.0.1</WilsonVersion>
66
<YarpVersion>2.1.0</YarpVersion>
7-
<IdentityServerVersion>7.0.6</IdentityServerVersion>
7+
<IdentityServerVersion>7.1.0-preview.1</IdentityServerVersion>
88
</PropertyGroup>
99

1010
<ItemGroup>
@@ -13,9 +13,10 @@
1313
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1414

1515
<!-- runtime -->
16-
<PackageReference Update="IdentityModel" Version="7.0.0" />
17-
<PackageReference Update="Duende.AccessTokenManagement.OpenIdConnect" Version="3.0.0" />
18-
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(FrameworkVersionRuntime)" />
16+
<PackageReference Update="Duende.IdentityModel" Version="7.0.0" />
17+
<PackageReference Update="Duende.AccessTokenManagement.OpenIdConnect" Version="3.1.0-preview.1" />
18+
<!-- Need this version because so 'Microsoft.Extensions.Caching.Memory' is at least 8.0.1 that addresses known high severity vulnerability -->
19+
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
1920
<PackageReference Update="Microsoft.Extensions.Http" Version="$(FrameworkVersionRuntime)" />
2021
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly" Version="$(FrameworkVersionRuntime)" />
2122
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(FrameworkVersionRuntime)" />
@@ -24,7 +25,7 @@
2425
<PackageReference Update="Yarp.ReverseProxy" Version="$(YarpVersion)" />
2526

2627
<!-- samples -->
27-
<PackageReference Update="Serilog.AspNetCore" Version="8.0.2" />
28+
<PackageReference Update="Serilog.AspNetCore" Version="8.0.3" />
2829
<PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="$(WilsonVersion)" />
2930
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="$(WilsonVersion)" />
3031

@@ -38,14 +39,14 @@
3839
<PackageReference Update="Duende.IdentityServer" Version="$(IdentityServerVersion)" />
3940

4041
<PackageReference Update="CsQuery.NETStandard" Version="1.3.6.1" />
41-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.1" />
42-
<PackageReference Update="xunit" Version="2.4.2" />
43-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5">
42+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.12.0" />
43+
<PackageReference Update="xunit" Version="2.9.2" />
44+
<PackageReference Update="xunit.runner.visualstudio" Version="2.8.2">
4445
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4546
<PrivateAssets>all</PrivateAssets>
4647
</PackageReference>
4748
<PackageReference Update="FluentAssertions" Version="6.7.0" />
48-
<PackageReference Update="coverlet.collector" Version="3.1.2">
49+
<PackageReference Update="coverlet.collector" Version="6.0.0">
4950
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5051
<PrivateAssets>all</PrivateAssets>
5152
</PackageReference>

‎Duende.Bff.v3.ncrunchsolution

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<SolutionConfiguration>
2+
<Settings>
3+
<AllowParallelTestExecution>True</AllowParallelTestExecution>
4+
<EnableRDI>True</EnableRDI>
5+
<RdiConfigured>True</RdiConfigured>
6+
<SolutionConfigured>True</SolutionConfigured>
7+
</Settings>
8+
</SolutionConfiguration>

‎migrations/UserSessionDb/UserSessionDb.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<PrivateAssets>all</PrivateAssets>
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
</PackageReference>
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.9" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.9" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎samples/Apis/Api.DPoP/Api.DPoP.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="IdentityModel" />
8+
<PackageReference Include="Duende.IdentityModel" />
99
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
1010
<PackageReference Include="Serilog.AspNetCore" />
1111
</ItemGroup>

‎samples/Apis/Api.DPoP/DPoP/DPoPExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using IdentityModel;
1+
using Duende.IdentityModel;
22
using Microsoft.AspNetCore.Authentication;
33
using Microsoft.AspNetCore.Http;
44
using Microsoft.IdentityModel.Tokens;

‎samples/Apis/Api.DPoP/DPoP/DPoPJwtBearerEvents.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using IdentityModel;
1+
using Duende.IdentityModel;
22
using Microsoft.AspNetCore.Authentication.JwtBearer;
33
using Microsoft.AspNetCore.Http;
44
using Microsoft.Extensions.Options;
55
using Microsoft.Net.Http.Headers;
66
using System.Text;
77
using System.Threading.Tasks;
8-
using static IdentityModel.OidcConstants;
8+
using static Duende.IdentityModel.OidcConstants;
99

1010
namespace Api.DPoP;
1111

‎samples/Apis/Api.DPoP/DPoP/DPoPProofValidator.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using IdentityModel;
1+
using Duende.IdentityModel;
22
using Microsoft.AspNetCore.DataProtection;
33
using Microsoft.Extensions.Logging;
44
using Microsoft.Extensions.Options;

‎samples/Apis/Api.Isolated/Api.Isolated.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="IdentityModel" />
8+
<PackageReference Include="Duende.IdentityModel" />
99
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
1010
<PackageReference Include="Serilog.AspNetCore" />
1111
</ItemGroup>

‎samples/Apis/Api/Api.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="IdentityModel" />
8+
<PackageReference Include="Duende.IdentityModel" />
99
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
1010
<PackageReference Include="Serilog.AspNetCore" />
1111
</ItemGroup>

‎samples/IdentityServer/Config.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44

55
using Duende.IdentityServer.Models;
6-
using IdentityModel;
6+
using Duende.IdentityModel;
77

88
namespace IdentityServerHost
99
{

‎samples/IdentityServer/IdentityServer.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="Duende.IdentityServer" />
10+
<PackageReference Include="Duende.IdentityModel" />
1011
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
1112
</ItemGroup>
1213

‎samples/IdentityServer/Pages/Account/Logout/Index.cshtml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Duende.IdentityServer.Events;
22
using Duende.IdentityServer.Extensions;
33
using Duende.IdentityServer.Services;
4-
using IdentityModel;
4+
using Duende.IdentityModel;
55
using Microsoft.AspNetCore.Authentication;
66
using Microsoft.AspNetCore.Authorization;
77
using Microsoft.AspNetCore.Mvc;

‎samples/IdentityServer/Pages/Consent/Index.cshtml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Duende.IdentityServer.Models;
44
using Duende.IdentityServer.Services;
55
using Duende.IdentityServer.Validation;
6-
using IdentityModel;
6+
using Duende.IdentityModel;
77
using Microsoft.AspNetCore.Authorization;
88
using Microsoft.AspNetCore.Mvc;
99
using Microsoft.AspNetCore.Mvc.RazorPages;

‎samples/IdentityServer/Pages/Diagnostics/ViewModel.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// See LICENSE in the project root for license information.
33

44

5-
using IdentityModel;
5+
using Duende.IdentityModel;
66
using Microsoft.AspNetCore.Authentication;
77
using System.Text;
88
using System.Text.Json;

‎samples/IdentityServer/Pages/ExternalLogin/Callback.cshtml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Duende.IdentityServer.Events;
44
using Duende.IdentityServer.Services;
55
using Duende.IdentityServer.Test;
6-
using IdentityModel;
6+
using Duende.IdentityModel;
77
using Microsoft.AspNetCore.Authentication;
88
using Microsoft.AspNetCore.Authorization;
99
using Microsoft.AspNetCore.Mvc;

‎samples/IdentityServer/Pages/TestUsers.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// See LICENSE in the project root for license information.
33

44

5-
using IdentityModel;
5+
using Duende.IdentityModel;
66
using System.Security.Claims;
77
using System.Text.Json;
88
using Duende.IdentityServer;

‎samples/IdentityServer/TokenExchangeGrantValidator.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Duende.IdentityServer.Models;
22
using Duende.IdentityServer.Validation;
3-
using IdentityModel;
3+
using Duende.IdentityModel;
44

55
namespace IdentityServerHost;
66

‎samples/JS8.EF/JS8.EF.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
<ItemGroup>
88
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.4" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
1111
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
1212
</ItemGroup>
1313

‎samples/JS8/ImpersonationAccessTokenRetriever.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using System.Net.Http;
55
using System.Threading.Tasks;
66
using Duende.Bff;
7-
using IdentityModel;
8-
using IdentityModel.Client;
7+
using Duende.IdentityModel;
8+
using Duende.IdentityModel.Client;
99
using Microsoft.Extensions.Logging;
1010

1111
namespace Host8;

‎src/Duende.Bff.Blazor.Client/Duende.Bff.Blazor.Client.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" />
1818
<PackageReference Include="Microsoft.Extensions.Http" />
1919
<!-- Explicitly taking this version so that we don't pull in vulnerable old versions. -->
20-
<PackageReference Include="System.Text.Json" Version="8.0.4" />
20+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/Duende.Bff.Blazor/BffServerAuthenticationStateProvider.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Diagnostics;
55
using System.Security.Claims;
66
using Duende.Bff.Blazor.Client;
7-
using IdentityModel;
7+
using Duende.IdentityModel;
88
using Microsoft.AspNetCore.Components;
99
using Microsoft.AspNetCore.Components.Authorization;
1010
using Microsoft.AspNetCore.Components.Server;

‎src/Duende.Bff.Yarp/AccessTokenRequestTransform.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Threading.Tasks;
77
using Duende.AccessTokenManagement;
88
using Duende.Bff.Logging;
9-
using IdentityModel;
9+
using Duende.IdentityModel;
1010
using Microsoft.Extensions.Logging;
1111
using Yarp.ReverseProxy.Transforms;
1212

‎src/Duende.Bff/EndpointServices/BackchannelLogout/DefaultBackchannelLogoutService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Duende Software. All rights reserved.
22
// See LICENSE in the project root for license information.
33

4-
using IdentityModel;
4+
using Duende.IdentityModel;
55
using Microsoft.AspNetCore.Authentication;
66
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
77
using Microsoft.AspNetCore.Http;

‎src/Duende.Bff/EndpointServices/Logout/DefaultLogoutService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// See LICENSE in the project root for license information.
33

44
using Duende.AccessTokenManagement.OpenIdConnect;
5-
using IdentityModel;
5+
using Duende.IdentityModel;
66
using Microsoft.AspNetCore.Authentication;
77
using Microsoft.AspNetCore.Http;
88
using Microsoft.Extensions.Logging;

‎src/Duende.Bff/EndpointServices/SilentLogin/DefaultSilentLoginCallbackService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Duende Software. All rights reserved.
22
// See LICENSE in the project root for license information.
33

4-
using IdentityModel;
4+
using Duende.IdentityModel;
55
using Microsoft.AspNetCore.Authentication;
66
using Microsoft.AspNetCore.Http;
77
using Microsoft.Extensions.Logging;

‎src/Duende.Bff/EndpointServices/User/DefaultClaimsService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Duende Software. All rights reserved.
22
// See LICENSE in the project root for license information.
33

4-
using IdentityModel;
4+
using Duende.IdentityModel;
55
using Microsoft.AspNetCore.Authentication;
66
using Microsoft.AspNetCore.Http;
77
using Microsoft.IdentityModel.Protocols.OpenIdConnect;

‎src/Duende.Bff/Extensions/AuthenticationTicketExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Duende Software. All rights reserved.
22
// See LICENSE in the project root for license information.
33

4-
using IdentityModel;
4+
using Duende.IdentityModel;
55
using Microsoft.AspNetCore.Authentication;
66
using Microsoft.AspNetCore.DataProtection;
77
using Microsoft.Extensions.Logging;

‎src/Duende.Bff/Extensions/HttpContextExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Threading.Tasks;
77
using Duende.AccessTokenManagement;
88
using Duende.AccessTokenManagement.OpenIdConnect;
9-
using IdentityModel;
9+
using Duende.IdentityModel;
1010
using Microsoft.AspNetCore.Authentication;
1111
using Microsoft.AspNetCore.Http;
1212

‎src/Duende.Bff/General/DefaultAccessTokenRetriever.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55
using System.Threading.Tasks;
66
using Duende.Bff.Logging;
7-
using IdentityModel;
7+
using Duende.IdentityModel;
88
using Microsoft.AspNetCore.Authentication;
99
using Microsoft.Extensions.Logging;
1010

‎src/Duende.Bff/SessionManagement/Configuration/PostConfigureApplicationCookieRevokeRefreshToken.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Duende Software. All rights reserved.
22
// See LICENSE in the project root for license information.
33

4-
using IdentityModel;
4+
using Duende.IdentityModel;
55
using Microsoft.AspNetCore.Authentication;
66
using Microsoft.AspNetCore.Authentication.Cookies;
77
using Microsoft.Extensions.Logging;

‎src/Duende.Bff/SessionManagement/TicketStore/ServerSideTicketStore.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Collections.Generic;
77
using System.Threading;
88
using System.Threading.Tasks;
9-
using IdentityModel;
9+
using Duende.IdentityModel;
1010
using Microsoft.AspNetCore.Authentication;
1111
using Microsoft.AspNetCore.DataProtection;
1212
using Microsoft.Extensions.Logging;

‎test/Duende.Bff.Blazor.Client.UnitTests/Duende.Bff.Blazor.Client.UnitTests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -12,11 +12,11 @@
1212
<ItemGroup>
1313
<PackageReference Include="coverlet.collector" Version="6.0.0" />
1414
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.8.0" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1616
<PackageReference Include="NSubstitute" Version="5.1.0" />
1717
<PackageReference Include="Shouldly" Version="4.2.1" />
18-
<PackageReference Include="xunit" Version="2.5.3" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
18+
<PackageReference Include="xunit" />
19+
<PackageReference Include="xunit.runner.visualstudio" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎test/Duende.Bff.Blazor.UnitTests/Duende.Bff.Blazor.UnitTests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -10,12 +10,12 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" Version="6.0.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
13+
<PackageReference Include="coverlet.collector" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1515
<PackageReference Include="NSubstitute" Version="5.1.0" />
1616
<PackageReference Include="Shouldly" Version="4.2.1" />
17-
<PackageReference Include="xunit" Version="2.5.3" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
17+
<PackageReference Include="xunit" />
18+
<PackageReference Include="xunit.runner.visualstudio" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎test/Duende.Bff.Tests/Endpoints/RemoteEndpointTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ public async Task test_dpop()
393393
opts.DPoPJsonWebKey = jwk;
394394
});
395395
};
396-
BffHost.InitializeAsync().Wait();
396+
await BffHost.InitializeAsync();
397397

398398
var req = new HttpRequestMessage(HttpMethod.Get, BffHost.Url("/api_client/test"));
399399
req.Headers.Add("x-csrf", "1");

‎test/Duende.Bff.Tests/TestHosts/IdentityServerHost.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Duende.IdentityServer;
77
using Duende.IdentityServer.Models;
88
using Duende.IdentityServer.Services;
9-
using IdentityModel;
9+
using Duende.IdentityModel;
1010
using Microsoft.AspNetCore.Authentication;
1111
using Microsoft.AspNetCore.Builder;
1212
using Microsoft.Extensions.DependencyInjection;

0 commit comments

Comments
 (0)