Make DefaultAntiforgeryStateProvider shared source

Author: javiercn

src/Components/Endpoints/src/DependencyInjection/RazorComponentsServiceCollectionExtensions.cs

@@ -64,7 +64,7 @@ public static IRazorComponentsBuilder AddRazorComponents(this IServiceCollection
         services.TryAddScoped<IFormValueSupplier, DefaultFormValuesSupplier>();
         services.TryAddEnumerable(ServiceDescriptor.Scoped<CascadingModelBindingProvider, CascadingQueryModelBindingProvider>());
         services.TryAddEnumerable(ServiceDescriptor.Scoped<CascadingModelBindingProvider, CascadingFormModelBindingProvider>());
-        services.TryAddScoped<AntiforgeryStateProvider, EndpointAntiforgeryStateProvider>();
+        services.TryAddScoped<DefaultAntiforgeryStateProvider, EndpointAntiforgeryStateProvider>();
         return new DefaultRazorComponentsBuilder(services);
     }
 

src/Components/Endpoints/src/Forms/EndpointAntiforgeryStateProvider.cs

@@ -7,7 +7,7 @@
 
 namespace Microsoft.AspNetCore.Components.Endpoints.Forms;
 
-internal class EndpointAntiforgeryStateProvider(IAntiforgery antiforgery, PersistentComponentState state) : AntiforgeryStateProvider(state)
+internal class EndpointAntiforgeryStateProvider(IAntiforgery antiforgery, PersistentComponentState state) : DefaultAntiforgeryStateProvider(state)
 {
     private HttpContext? _context;
 

src/Components/Endpoints/src/Microsoft.AspNetCore.Components.Endpoints.csproj

@@ -35,6 +35,7 @@
     <Compile Include="$(RepoRoot)src\Shared\Components\ProtectedPrerenderComponentApplicationStore.cs" LinkBase="DependencyInjection" />
     <Compile Include="$(RepoRoot)src\Shared\ClosedGenericMatcher\ClosedGenericMatcher.cs" LinkBase="Binding" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\CacheHeaderSettings.cs" Link="Shared\CacheHeaderSettings.cs" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\DefaultAntiforgeryStateProvider.cs" LinkBase="Forms" />
 
     <Compile Include="$(SharedSourceRoot)PropertyHelper\**\*.cs" />
 

src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs

@@ -89,7 +89,7 @@ internal static async Task InitializeStandardComponentServicesAsync(
             formData.SetFormData(handler, new FormCollectionReadOnlyDictionary(form));
         }
 
-        if (httpContext.RequestServices.GetService<AntiforgeryStateProvider>() is EndpointAntiforgeryStateProvider antiforgery)
+        if (httpContext.RequestServices.GetService<DefaultAntiforgeryStateProvider>() is EndpointAntiforgeryStateProvider antiforgery)
         {
             antiforgery.SetRequestContext(httpContext);
         }

src/Components/Endpoints/test/EndpointHtmlRendererTest.cs

@@ -1301,7 +1301,7 @@ private static ServiceCollection CreateDefaultServiceCollection()
         services.AddAntiforgery();
         services.AddSingleton<ComponentStatePersistenceManager>();
         services.AddSingleton<PersistentComponentState>(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State);
-        services.AddSingleton<AntiforgeryStateProvider, EndpointAntiforgeryStateProvider>();
+        services.AddSingleton<DefaultAntiforgeryStateProvider, EndpointAntiforgeryStateProvider>();
 
         return services;
     }

src/Components/Endpoints/test/RazorComponentResultExecutorTest.cs

@@ -417,7 +417,7 @@ public static DefaultHttpContext GetTestHttpContext(string environmentName = nul
             .AddSingleton<FormDataProvider, HttpContextFormDataProvider>()
             .AddSingleton<ComponentStatePersistenceManager>()
             .AddSingleton<PersistentComponentState>(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State)
-            .AddSingleton<AntiforgeryStateProvider, EndpointAntiforgeryStateProvider>()
+            .AddSingleton<DefaultAntiforgeryStateProvider, EndpointAntiforgeryStateProvider>()
             .AddLogging();
 
         var result = new DefaultHttpContext { RequestServices = serviceCollection.BuildServiceProvider() };

src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs

@@ -69,7 +69,7 @@ public static IServerSideBlazorBuilder AddServerSideBlazor(this IServiceCollecti
         services.TryAddSingleton<ComponentParametersTypeCache>();
         services.TryAddSingleton<CircuitIdFactory>();
         services.TryAddScoped<IErrorBoundaryLogger, RemoteErrorBoundaryLogger>();
-        services.TryAddScoped<AntiforgeryStateProvider>();
+        services.TryAddScoped<AntiforgeryStateProvider, DefaultAntiforgeryStateProvider>();
 
         services.TryAddScoped(s => s.GetRequiredService<ICircuitAccessor>().Circuit);
         services.TryAddScoped<ICircuitAccessor, DefaultCircuitAccessor>();

src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj

@@ -64,6 +64,7 @@
     <Compile Include="$(ComponentsSharedSourceRoot)src\ElementReferenceJsonConverter.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\ComponentParametersTypeCache.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\RootComponentTypeCache.cs" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\DefaultAntiforgeryStateProvider.cs" LinkBase="Forms" />
 
     <Compile Include="..\..\Shared\src\BrowserNavigationManagerInterop.cs" />
     <Compile Include="..\..\Shared\src\JsonSerializerOptionsProvider.cs" />

src/Components/Shared/src/DefaultAntiforgeryStateProvider.cs

@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Components.Forms;
+
+internal class DefaultAntiforgeryStateProvider : AntiforgeryStateProvider, IDisposable
+{
+    private const string PersistenceKey = $"__internal__{nameof(AntiforgeryRequestToken)}";
+    private readonly PersistingComponentStateSubscription _subscription;
+    private readonly AntiforgeryRequestToken? _currentToken;
+
+    [UnconditionalSuppressMessage(
+    "Trimming",
+    "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code",
+    Justification = $"{nameof(DefaultAntiforgeryStateProvider)} uses the {nameof(PersistentComponentState)} APIs to deserialize the token, which are already annotated.")]
+    public DefaultAntiforgeryStateProvider(PersistentComponentState state)
+    {
+        // Automatically flow the Request token to server/wasm through
+        // persistent component state. This guarantees that the antiforgery
+        // token is available on the interactive components, even when they
+        // don't have access to the request.
+        _subscription = state.RegisterOnPersisting(() =>
+        {
+            state.PersistAsJson(PersistenceKey, _currentToken);
+            return Task.CompletedTask;
+        });
+
+        state.TryTakeFromJson(PersistenceKey, out _currentToken);
+    }
+
+    /// <inheritdoc />
+    public override AntiforgeryRequestToken? GetAntiforgeryToken() => _currentToken;
+
+    /// <inheritdoc />
+    public void Dispose() => _subscription.Dispose();
+}

src/Components/Web/src/Forms/AntiforgeryStateProvider.cs

@@ -1,48 +1,16 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
-
 namespace Microsoft.AspNetCore.Components.Forms;
 
 /// <summary>
 /// Provides access to the antiforgery token associated with the current session.
 /// </summary>
-public class AntiforgeryStateProvider : IDisposable
+public abstract class AntiforgeryStateProvider
 {
-    private const string PersistenceKey = $"__internal__{nameof(AntiforgeryRequestToken)}";
-    private readonly PersistingComponentStateSubscription _subscription;
-    private readonly AntiforgeryRequestToken? _currentToken;
-
-    /// <summary>
-    /// Initializes a new instance of <see cref="AntiforgeryStateProvider"/>.
-    /// </summary>
-    /// <param name="state">The <see cref="PersistentComponentState"/> associated with the current session.</param>
-    [UnconditionalSuppressMessage(
-    "Trimming",
-    "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code",
-    Justification = $"{nameof(AntiforgeryStateProvider)} uses the {nameof(PersistentComponentState)} APIs to deserialize the token, which are already annotated.")]
-    public AntiforgeryStateProvider(PersistentComponentState state)
-    {
-        // Automatically flow the Request token to server/wasm through
-        // persistent component state. This guarantees that the antiforgery
-        // token is available on the interactive components, even when they
-        // don't have access to the request.
-        _subscription = state.RegisterOnPersisting(() =>
-        {
-            state.PersistAsJson(PersistenceKey, _currentToken);
-            return Task.CompletedTask;
-        });
-
-        state.TryTakeFromJson(PersistenceKey, out _currentToken);
-    }
-
     /// <summary>
     /// Gets the current <see cref="AntiforgeryRequestToken"/> if available.
     /// </summary>
     /// <returns>The current <see cref="AntiforgeryRequestToken"/> if available.</returns>
-    public virtual AntiforgeryRequestToken? GetAntiforgeryToken() => _currentToken;
-
-    /// <inheritdoc />
-    public void Dispose() => _subscription.Dispose();
+    public abstract AntiforgeryRequestToken? GetAntiforgeryToken();
 }