Skip to content

Commit be48497

Browse files
kevinchaletkevinchalet
committed
Update the solution to target OpenIddict 7.0
1 parent 0cf61f1 commit be48497

File tree

7 files changed

+151
-62
lines changed

7 files changed

+151
-62
lines changed

‎Directory.Packages.props‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@
3232
<PackageVersion Include="Microsoft.AspNet.Web.Optimization.WebForms" Version="1.1.3" />
3333
<PackageVersion Include="Microsoft.AspNet.WebApi.Owin" Version="5.3.0" />
3434
<PackageVersion Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="4.1.0" />
35-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.14" />
36-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
37-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="2.1.1" />
38-
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
35+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.3.0" />
36+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
37+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
3938
<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.14.0" />
4039
<PackageVersion Include="Microsoft.Owin.Diagnostics" Version="4.2.2" />
4140
<PackageVersion Include="Microsoft.Owin.Host.HttpListener" Version="4.2.2" />
@@ -44,11 +43,11 @@
4443
<PackageVersion Include="Microsoft.Owin.Security.Cookies" Version="4.2.2" />
4544
<PackageVersion Include="Microsoft.Owin.Security.OAuth" Version="4.2.2" />
4645
<PackageVersion Include="Microsoft.Web.Infrastructure" Version="2.0.1" />
47-
<PackageVersion Include="OpenIddict.Client.SystemIntegration" Version="6.4.0" />
48-
<PackageVersion Include="OpenIddict.Client.SystemNetHttp" Version="6.4.0" />
49-
<PackageVersion Include="OpenIddict.EntityFramework" Version="6.4.0" />
50-
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="6.4.0" />
51-
<PackageVersion Include="OpenIddict.Owin" Version="6.4.0" />
46+
<PackageVersion Include="OpenIddict.Client.SystemIntegration" Version="7.0.0" />
47+
<PackageVersion Include="OpenIddict.Client.SystemNetHttp" Version="7.0.0" />
48+
<PackageVersion Include="OpenIddict.EntityFramework" Version="7.0.0" />
49+
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="7.0.0" />
50+
<PackageVersion Include="OpenIddict.Owin" Version="7.0.0" />
5251
<PackageVersion Include="WebGrease" Version="1.6.0" />
5352
</ItemGroup>
5453

@@ -85,15 +84,15 @@
8584
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
8685
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.6" />
8786
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
88-
<PackageVersion Include="OpenIddict.Abstractions" Version="6.4.0" />
89-
<PackageVersion Include="OpenIddict.AspNetCore" Version="6.4.0" />
90-
<PackageVersion Include="OpenIddict.Client.SystemIntegration" Version="6.4.0" />
91-
<PackageVersion Include="OpenIddict.Client.SystemNetHttp" Version="6.4.0" />
92-
<PackageVersion Include="OpenIddict.Client.WebIntegration" Version="6.4.0" />
93-
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="6.4.0" />
94-
<PackageVersion Include="OpenIddict.Quartz" Version="6.4.0" />
95-
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="6.4.0" />
96-
<PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="6.4.0" />
87+
<PackageVersion Include="OpenIddict.Abstractions" Version="7.0.0" />
88+
<PackageVersion Include="OpenIddict.AspNetCore" Version="7.0.0" />
89+
<PackageVersion Include="OpenIddict.Client.SystemIntegration" Version="7.0.0" />
90+
<PackageVersion Include="OpenIddict.Client.SystemNetHttp" Version="7.0.0" />
91+
<PackageVersion Include="OpenIddict.Client.WebIntegration" Version="7.0.0" />
92+
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="7.0.0" />
93+
<PackageVersion Include="OpenIddict.Quartz" Version="7.0.0" />
94+
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.0.0" />
95+
<PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="7.0.0" />
9796
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.14.0" />
9897
<PackageVersion Include="Spectre.Console" Version="0.50.0" />
9998
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />

‎samples/Contruum/Contruum.Server/Startup.cs‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Globalization;
22
using System.Text.Json;
3+
using System.Text.Json.Nodes;
34
using Contruum.Server.Models;
45
using Microsoft.AspNetCore.Authentication.Cookies;
56
using Microsoft.EntityFrameworkCore;
@@ -95,44 +96,44 @@ public void ConfigureServices(IServiceCollection services)
9596
.EnableEndSessionEndpointPassthrough();
9697

9798
// Register the custom event handler responsible for populating userinfo responses.
98-
options.AddEventHandler<HandleUserInfoRequestContext>(options => options.UseInlineHandler(context =>
99+
options.AddEventHandler<HandleUserInfoRequestContext>(options => options.UseInlineHandler(static context =>
99100
{
100-
if (context.Principal.HasScope(Scopes.Profile))
101+
if (context.AccessTokenPrincipal.HasScope(Scopes.Profile))
101102
{
102-
context.GivenName = context.Principal.GetClaim(Claims.GivenName);
103-
context.FamilyName = context.Principal.GetClaim(Claims.FamilyName);
104-
context.BirthDate = context.Principal.GetClaim(Claims.Birthdate);
105-
context.Profile = context.Principal.GetClaim(Claims.Profile);
106-
context.PreferredUsername = context.Principal.GetClaim(Claims.PreferredUsername);
107-
context.Website = context.Principal.GetClaim(Claims.Website);
108-
109-
context.Claims[Claims.Name] = context.Principal.GetClaim(Claims.Name);
110-
context.Claims[Claims.Gender] = context.Principal.GetClaim(Claims.Gender);
111-
context.Claims[Claims.MiddleName] = context.Principal.GetClaim(Claims.MiddleName);
112-
context.Claims[Claims.Nickname] = context.Principal.GetClaim(Claims.Nickname);
113-
context.Claims[Claims.Picture] = context.Principal.GetClaim(Claims.Picture);
114-
context.Claims[Claims.Locale] = context.Principal.GetClaim(Claims.Locale);
115-
context.Claims[Claims.Zoneinfo] = context.Principal.GetClaim(Claims.Zoneinfo);
103+
context.GivenName = context.AccessTokenPrincipal.GetClaim(Claims.GivenName);
104+
context.FamilyName = context.AccessTokenPrincipal.GetClaim(Claims.FamilyName);
105+
context.BirthDate = context.AccessTokenPrincipal.GetClaim(Claims.Birthdate);
106+
context.Profile = context.AccessTokenPrincipal.GetClaim(Claims.Profile);
107+
context.PreferredUsername = context.AccessTokenPrincipal.GetClaim(Claims.PreferredUsername);
108+
context.Website = context.AccessTokenPrincipal.GetClaim(Claims.Website);
109+
110+
context.Claims[Claims.Name] = context.AccessTokenPrincipal.GetClaim(Claims.Name);
111+
context.Claims[Claims.Gender] = context.AccessTokenPrincipal.GetClaim(Claims.Gender);
112+
context.Claims[Claims.MiddleName] = context.AccessTokenPrincipal.GetClaim(Claims.MiddleName);
113+
context.Claims[Claims.Nickname] = context.AccessTokenPrincipal.GetClaim(Claims.Nickname);
114+
context.Claims[Claims.Picture] = context.AccessTokenPrincipal.GetClaim(Claims.Picture);
115+
context.Claims[Claims.Locale] = context.AccessTokenPrincipal.GetClaim(Claims.Locale);
116+
context.Claims[Claims.Zoneinfo] = context.AccessTokenPrincipal.GetClaim(Claims.Zoneinfo);
116117
context.Claims[Claims.UpdatedAt] = long.Parse(
117-
context.Principal.GetClaim(Claims.UpdatedAt)!,
118+
context.AccessTokenPrincipal.GetClaim(Claims.UpdatedAt)!,
118119
NumberStyles.Number, CultureInfo.InvariantCulture);
119120
}
120121

121-
if (context.Principal.HasScope(Scopes.Email))
122+
if (context.AccessTokenPrincipal.HasScope(Scopes.Email))
122123
{
123-
context.Email = context.Principal.GetClaim(Claims.Email);
124+
context.Email = context.AccessTokenPrincipal.GetClaim(Claims.Email);
124125
context.EmailVerified = false;
125126
}
126127

127-
if (context.Principal.HasScope(Scopes.Phone))
128+
if (context.AccessTokenPrincipal.HasScope(Scopes.Phone))
128129
{
129-
context.PhoneNumber = context.Principal.GetClaim(Claims.PhoneNumber);
130+
context.PhoneNumber = context.AccessTokenPrincipal.GetClaim(Claims.PhoneNumber);
130131
context.PhoneNumberVerified = false;
131132
}
132133

133-
if (context.Principal.HasScope(Scopes.Address))
134+
if (context.AccessTokenPrincipal.HasScope(Scopes.Address))
134135
{
135-
context.Address = JsonSerializer.Deserialize<JsonElement>(context.Principal.GetClaim(Claims.Address)!);
136+
context.Address = JsonNode.Parse(context.AccessTokenPrincipal.GetClaim(Claims.Address)!)!.AsObject();
136137
}
137138

138139
return default;

‎samples/Fornax/Fornax.Client/Fornax.Client.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<ItemGroup>
99
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
1010
<PackageReference Include="Microsoft.Extensions.Hosting" />
11-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" />
1211
<PackageReference Include="OpenIddict.Client.SystemIntegration" />
1312
<PackageReference Include="OpenIddict.Client.SystemNetHttp" />
1413
<PackageReference Include="OpenIddict.EntityFrameworkCore" />

‎samples/Fornax/Fornax.Client/InteractiveService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ namespace Fornax.Client;
77

88
public class InteractiveService : BackgroundService
99
{
10-
private readonly IApplicationLifetime _lifetime;
10+
private readonly IHostApplicationLifetime _lifetime;
1111
private readonly OpenIddictClientService _service;
1212

1313
public InteractiveService(
14-
IApplicationLifetime lifetime,
14+
IHostApplicationLifetime lifetime,
1515
OpenIddictClientService service)
1616
{
1717
_lifetime = lifetime;

‎samples/Fornax/Fornax.Server/Web.config‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
<bindingRedirect oldVersion="0.0.0.0-2.1.23.0" newVersion="2.1.23.0" />
8484
</dependentAssembly>
8585
<dependentAssembly>
86-
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" />
87-
<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
86+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" culture="neutral" publicKeyToken="adb9793829ddae60" />
87+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
8888
</dependentAssembly>
8989
<dependentAssembly>
9090
<assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" />
@@ -111,16 +111,16 @@
111111
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
112112
</dependentAssembly>
113113
<dependentAssembly>
114-
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" />
115-
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
114+
<assemblyIdentity name="System.Buffers" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
115+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
116116
</dependentAssembly>
117117
<dependentAssembly>
118118
<assemblyIdentity name="System.Memory" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
119119
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
120120
</dependentAssembly>
121121
<dependentAssembly>
122-
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" />
123-
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
122+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
123+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
124124
</dependentAssembly>
125125
<dependentAssembly>
126126
<assemblyIdentity name="System.Runtime.WindowsRuntime" publicKeyToken="b77a5c561934e089" culture="neutral" />
@@ -161,6 +161,36 @@
161161
<bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
162162
</dependentAssembly>
163163
</assemblyBinding>
164+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
165+
<dependentAssembly>
166+
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
167+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
168+
</dependentAssembly>
169+
</assemblyBinding>
170+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
171+
<dependentAssembly>
172+
<assemblyIdentity name="Microsoft.Extensions.Http" publicKeyToken="adb9793829ddae60" culture="neutral" />
173+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
174+
</dependentAssembly>
175+
</assemblyBinding>
176+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
177+
<dependentAssembly>
178+
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
179+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
180+
</dependentAssembly>
181+
</assemblyBinding>
182+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
183+
<dependentAssembly>
184+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
185+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
186+
</dependentAssembly>
187+
</assemblyBinding>
188+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
189+
<dependentAssembly>
190+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
191+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
192+
</dependentAssembly>
193+
</assemblyBinding>
164194
</runtime>
165195
<system.codedom>
166196
<compilers>

‎samples/Mortis/Mortis.Client/Web.config‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<bindingRedirect oldVersion="0.0.0.0-2.1.23.0" newVersion="2.1.23.0" />
3737
</dependentAssembly>
3838
<dependentAssembly>
39-
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
40-
<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
39+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" culture="neutral" publicKeyToken="adb9793829ddae60" />
40+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
4141
</dependentAssembly>
4242
<dependentAssembly>
4343
<assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -56,16 +56,16 @@
5656
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
5757
</dependentAssembly>
5858
<dependentAssembly>
59-
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
60-
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
59+
<assemblyIdentity name="System.Buffers" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
60+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
6161
</dependentAssembly>
6262
<dependentAssembly>
6363
<assemblyIdentity name="System.Memory" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
6464
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
6565
</dependentAssembly>
6666
<dependentAssembly>
67-
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
68-
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
67+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
68+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
6969
</dependentAssembly>
7070
<dependentAssembly>
7171
<assemblyIdentity name="System.Runtime.WindowsRuntime" publicKeyToken="b77a5c561934e089" culture="neutral" />
@@ -98,6 +98,36 @@
9898
<bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
9999
</dependentAssembly>
100100
</assemblyBinding>
101+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
102+
<dependentAssembly>
103+
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
104+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
105+
</dependentAssembly>
106+
</assemblyBinding>
107+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
108+
<dependentAssembly>
109+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
110+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
111+
</dependentAssembly>
112+
</assemblyBinding>
113+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
114+
<dependentAssembly>
115+
<assemblyIdentity name="Microsoft.Extensions.Http" publicKeyToken="adb9793829ddae60" culture="neutral" />
116+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
117+
</dependentAssembly>
118+
</assemblyBinding>
119+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
120+
<dependentAssembly>
121+
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
122+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
123+
</dependentAssembly>
124+
</assemblyBinding>
125+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
126+
<dependentAssembly>
127+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
128+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
129+
</dependentAssembly>
130+
</assemblyBinding>
101131
</runtime>
102132
<system.codedom>
103133
<compilers>

0 commit comments

Comments
 (0)