Skip to content

Commit 0cb4713

Browse files
kevinchaletkevinchalet
committed
Bump Katana to 4.2.3 and use the new IAppBuilder.GetDefaultCookieManager() extension
1 parent 99fca3f commit 0cb4713

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

‎Directory.Packages.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="8.12.0" />
4040
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.12.0" />
4141
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.3.0" />
42-
<PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" />
42+
<PackageVersion Include="Microsoft.Owin.Security" Version="4.2.3" />
4343
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" />
4444
<PackageVersion Include="MongoDB.Bson" Version="3.4.0" />
4545
<PackageVersion Include="MongoDB.Driver" Version="3.4.0" />
@@ -55,7 +55,7 @@
5555
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.6.0" />
5656
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.3.0" />
5757
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
58-
<PackageVersion Include="Microsoft.Owin.Testing" Version="4.2.2" />
58+
<PackageVersion Include="Microsoft.Owin.Testing" Version="4.2.3" />
5959
<PackageVersion Include="Moq" Version="4.18.4" />
6060
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
6161

@@ -85,9 +85,9 @@
8585
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.3.0" />
8686
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
8787
<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.14.0" />
88-
<PackageVersion Include="Microsoft.Owin.Host.SystemWeb" Version="4.2.2" />
89-
<PackageVersion Include="Microsoft.Owin.Security.Cookies" Version="4.2.2" />
90-
<PackageVersion Include="Microsoft.Owin.Security.OAuth" Version="4.2.2" />
88+
<PackageVersion Include="Microsoft.Owin.Host.SystemWeb" Version="4.2.3" />
89+
<PackageVersion Include="Microsoft.Owin.Security.Cookies" Version="4.2.3" />
90+
<PackageVersion Include="Microsoft.Owin.Security.OAuth" Version="4.2.3" />
9191
<PackageVersion Include="Microsoft.Web.Infrastructure" Version="2.0.1" />
9292
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
9393
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.14.0" />

‎sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5656
<dependentAssembly>
5757
<assemblyIdentity name="Microsoft.Owin" culture="neutral" publicKeyToken="31bf3856ad364e35" />
58-
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
58+
<bindingRedirect oldVersion="0.0.0.0-4.2.3.0" newVersion="4.2.3.0" />
5959
</dependentAssembly>
6060
</assemblyBinding>
6161
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

‎sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,25 @@
6161
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
6262
<dependentAssembly>
6363
<assemblyIdentity name="Microsoft.Owin" culture="neutral" publicKeyToken="31bf3856ad364e35" />
64-
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
64+
<bindingRedirect oldVersion="0.0.0.0-4.2.3.0" newVersion="4.2.3.0" />
6565
</dependentAssembly>
6666
</assemblyBinding>
6767
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
6868
<dependentAssembly>
6969
<assemblyIdentity name="Microsoft.Owin.Security" culture="neutral" publicKeyToken="31bf3856ad364e35" />
70-
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
70+
<bindingRedirect oldVersion="0.0.0.0-4.2.3.0" newVersion="4.2.3.0" />
7171
</dependentAssembly>
7272
</assemblyBinding>
7373
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
7474
<dependentAssembly>
7575
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" culture="neutral" publicKeyToken="31bf3856ad364e35" />
76-
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
76+
<bindingRedirect oldVersion="0.0.0.0-4.2.3.0" newVersion="4.2.3.0" />
7777
</dependentAssembly>
7878
</assemblyBinding>
7979
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8080
<dependentAssembly>
8181
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" culture="neutral" publicKeyToken="31bf3856ad364e35" />
82-
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
82+
<bindingRedirect oldVersion="0.0.0.0-4.2.3.0" newVersion="4.2.3.0" />
8383
</dependentAssembly>
8484
</assemblyBinding>
8585
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

‎src/OpenIddict.Client.Owin/OpenIddictClientOwinConfiguration.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ public void PostConfigure(string? name, OpenIddictClientOwinOptions options)
5454
options.CookieManager ??= _provider.GetService<IAppBuilder>() switch
5555
{
5656
// See https://github.com/aspnet/AspNetKatana/pull/486 for more information.
57-
IAppBuilder builder when builder.Properties.TryGetValue("infrastructure.CookieManager",
58-
out object? property) && property is ICookieManager manager => manager,
57+
IAppBuilder builder => builder.GetDefaultCookieManager(),
5958

6059
_ => new CookieManager()
6160
};
@@ -69,9 +68,9 @@ IAppBuilder builder when builder.Properties.TryGetValue("infrastructure.CookieMa
6968
{
7069
foreach (var (provider, registrations) in _provider.GetRequiredService<IOptionsMonitor<OpenIddictClientOptions>>()
7170
.CurrentValue.Registrations
72-
.Where(registration => !string.IsNullOrEmpty(registration.ProviderName))
73-
.GroupBy(registration => registration.ProviderName)
74-
.Select(group => (ProviderName: group.Key, Registrations: group.ToList())))
71+
.Where(static registration => !string.IsNullOrEmpty(registration.ProviderName))
72+
.GroupBy(static registration => registration.ProviderName)
73+
.Select(static group => (ProviderName: group.Key, Registrations: group.ToList())))
7574
{
7675
// If an explicit mapping was already added, don't overwrite it.
7776
if (options.ForwardedAuthenticationTypes.Exists(type =>

0 commit comments

Comments
 (0)