Add wrapper for SetDataProtectionProvider (#630)

Author: twsouthwick

samples/AuthRemoteIdentity/AuthRemoteIdentityCore/Program.cs

@@ -20,6 +20,7 @@
 using Microsoft.Owin;
 using Microsoft.Owin.Extensions;
 using Microsoft.Owin.Security.Cookies;
+using Microsoft.Owin.Security.DataProtection;
 using Microsoft.Owin.Security.Interop;
 using MvcApp;
 using MvcApp.Models;

samples/AuthRemoteIdentity/AuthRemoteIdentityFramework/Web.config

@@ -241,6 +241,12 @@
         <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
       </dependentAssembly>
     </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Xml" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
   <system.codedom>
     <compilers>

samples/Directory.Packages.props

@@ -45,7 +45,7 @@
     <PackageVersion Include="Microsoft.jQuery.Unobtrusive.Validation" Version="3.2.11" />
     <PackageVersion Include="Microsoft.Owin.Host.SystemWeb" Version="4.2.2" />
     <PackageVersion Include="Microsoft.Owin.Security.Cookies" Version="4.2.2" />
-    <PackageVersion Include="Microsoft.Owin.Security.Interop" Version="2.1.38" />
+    <PackageVersion Include="Microsoft.Owin.Security.Interop" Version="2.3.0" />
     <PackageVersion Include="Microsoft.Owin.Security.OAuth" Version="4.2.2" />
     <PackageVersion Include="Microsoft.Web.Infrastructure" Version="2.0.1" />
     <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />

src/Directory.Packages.props

@@ -20,6 +20,7 @@
     <PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
     <PackageVersion Include="Microsoft.Owin" Version="4.2.3" />
     <PackageVersion Include="Microsoft.Owin.Security" Version="4.2.3" />
+    <PackageVersion Include="Microsoft.Owin.Security.Interop" Version="2.3.0" />
     <PackageVersion Include="Owin" Version="1.0.0" />
   </ItemGroup>
 

src/Microsoft.AspNetCore.SystemWebAdapters.Owin/AppBuilderExtensions.cs

@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.Owin.Security.Interop;
+using Owin;
+
+using AspNetCoreDataProtectionProvider = Microsoft.AspNetCore.DataProtection.IDataProtectionProvider;
+
+namespace Microsoft.Owin.Security.DataProtection;
+
+public static class AppBuilderDataProtectionExtensions
+{
+    public static void SetDataProtectionProvider(this IAppBuilder app, AspNetCoreDataProtectionProvider dataProtectionProvider)
+    {
+        ArgumentNullException.ThrowIfNull(app);
+        ArgumentNullException.ThrowIfNull(dataProtectionProvider);
+
+        app.SetDataProtectionProvider(new DataProtectionProviderShim(dataProtectionProvider));
+    }
+
+    private sealed class DataProtectionProviderShim(AspNetCoreDataProtectionProvider other) : IDataProtectionProvider
+    {
+        public IDataProtector Create(params string[] purposes) => new DataProtectorShim(other.CreateProtector(purposes));
+    }
+}

src/Microsoft.AspNetCore.SystemWebAdapters.Owin/Microsoft.AspNetCore.SystemWebAdapters.Owin.csproj

@@ -10,6 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Owin" />
     <PackageReference Include="Microsoft.Owin.Security" />
+    <PackageReference Include="Microsoft.Owin.Security.Interop" />
     <PackageReference Include="Microsoft.AspNetCore.Owin" />
   </ItemGroup>
 

src/Microsoft.AspNetCore.SystemWebAdapters.Owin/OwinBuilder.cs

@@ -1,11 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Owin.Builder;
 using Microsoft.Owin.BuilderProperties;
+using Microsoft.Owin.Security.DataProtection;
 using Owin;
 
 namespace Microsoft.AspNetCore.SystemWebAdapters;
@@ -25,8 +27,18 @@ public static AppFunc Build(AppFunc defaultApp, Action<IAppBuilder, IServiceProv
 
         owinAppProperties.AppName = env.ApplicationName;
 
+        AddAspNetCoreDefaults(owinAppBuilder, services);
+
         configure(owinAppBuilder, services);
 
         return owinAppBuilder.Build();
     }
+
+    private static void AddAspNetCoreDefaults(AppBuilder app, IServiceProvider services)
+    {
+        if (!app.Properties.ContainsKey("security.DataProtectionProvider") && services.GetService<DataProtection.IDataProtectionProvider>() is { } dataProtectionProvider)
+        {
+            app.SetDataProtectionProvider(dataProtectionProvider);
+        }
+    }
 }