Simplify settings by just providing the callback

Author: javiercn

src/Components/Server/src/Builder/ServerComponentsEndpointOptions.cs

@@ -11,14 +11,9 @@ namespace Microsoft.AspNetCore.Components.Server;
 /// </summary>
 public class ServerComponentsEndpointOptions
 {
-    /// <summary>
-    /// Gets or sets a value that indicates whether compression is enabled for the WebSocket connections.
-    /// </summary>
-    public bool EnableWebSocketCompression { get; set; } = true;
-
     /// <summary>
     /// Gets or sets the <c>frame-ancestors</c> <c>Content-Security-Policy</c> to set in the
-    /// <see cref="HttpResponse"/> when <see cref="EnableWebSocketCompression" /> is enabled.
+    /// <see cref="HttpResponse"/> when <see cref="ConfigureConnectionOptions" /> is set.
     /// </summary>
     /// <remarks>
     /// <para>Setting this value to <see langword="null" /> will prevent the policy from being
@@ -39,8 +34,11 @@ public class ServerComponentsEndpointOptions
 
     /// <summary>
     /// Gets or sets a callback to configure the underlying <see cref="HttpConnectionDispatcherOptions"/>.
-    /// If set, <see cref="ContentSecurityFrameAncestorPolicy"/> will be applied independent of the value of
-    /// <see cref="EnableWebSocketCompression"/>.
+    /// By default, a policy that enables compression and sets a Content Security Policy for the frame ancestors
+    /// defined in <see cref="ContentSecurityFrameAncestorPolicy"/> will be applied.
     /// </summary>
-    public Action<HttpConnectionDispatcherOptions> ConfigureConnectionOptions { get; set; }
+    public Action<HttpConnectionDispatcherOptions> ConfigureConnectionOptions { get; set; } = EnableCompressionDefaults;
+
+    private static WebSocketAcceptContext EnableCompressionDefaults(HttpContext context) =>
+        new() { DangerousEnableCompression = true };
 }

src/Components/Server/src/Builder/ServerRazorComponentsEndpointConventionBuilderExtensions.cs

@@ -38,7 +38,7 @@ public static RazorComponentsEndpointConventionBuilder AddInteractiveServerRende
 
         ComponentEndpointConventionBuilderHelper.AddRenderMode(builder, new InternalServerRenderMode(options));
 
-        if ((options.EnableWebSocketCompression || options.ConfigureConnectionOptions is not null) && options.ContentSecurityFrameAncestorPolicy != null)
+        if (options.ConfigureConnectionOptions is not null && options.ContentSecurityFrameAncestorPolicy != null)
         {
             builder.AddEndpointFilter(new RequireCspFilter(options.ContentSecurityFrameAncestorPolicy));
         }

src/Components/Server/src/DependencyInjection/ServerRazorComponentsBuilderExtensions.cs

@@ -65,20 +65,9 @@ public override IEnumerable<RouteEndpointBuilder> GetEndpointBuilders(
             }
 
             var endpointRouteBuilder = new EndpointRouteBuilder(Services, applicationBuilder);
-            if (renderMode is InternalServerRenderMode { Options: var configureOptions } &&
-                configureOptions != null)
+            if (renderMode is InternalServerRenderMode { Options.ConfigureConnectionOptions: { } configureConnection })
             {
-                if (configureOptions.ConfigureConnectionOptions != null)
-                {
-                    endpointRouteBuilder.MapBlazorHub("/_blazor", configureOptions.ConfigureConnectionOptions);
-                }
-                else if (configureOptions.EnableWebSocketCompression)
-                {
-                    endpointRouteBuilder.MapBlazorHub("/_blazor", options =>
-                    {
-                        options.WebSockets.WebSocketAcceptContextFactory = EnableCompressionDefaults;
-                    });
-                }
+                endpointRouteBuilder.MapBlazorHub("/_blazor", configureOptions.ConfigureConnectionOptions);
             }
             else
             {
@@ -88,9 +77,6 @@ public override IEnumerable<RouteEndpointBuilder> GetEndpointBuilders(
             return endpointRouteBuilder.GetEndpoints();
         }
 
-        private static WebSocketAcceptContext EnableCompressionDefaults(HttpContext context) =>
-            new() { DangerousEnableCompression = true };
-
         public override bool Supports(IComponentRenderMode renderMode)
         {
             return renderMode switch