Feedback - server

Author: ilonatommy

src/Components/Components/src/IEndpointHtmlRenderer.cs

@@ -1,7 +1,4 @@
 #nullable enable
-Microsoft.AspNetCore.Components.IEndpointHtmlRenderer
-Microsoft.AspNetCore.Components.IEndpointHtmlRenderer.SetNotFoundResponse() -> void
 Microsoft.AspNetCore.Components.NavigationManager.NotFoundEvent -> System.EventHandler<System.EventArgs!>!
-Microsoft.AspNetCore.Components.Routing.IHostEnvironmentNavigationManager.Initialize(string! baseUri, string! uri, Microsoft.AspNetCore.Components.IEndpointHtmlRenderer! renderer) -> void
 virtual Microsoft.AspNetCore.Components.NavigationManager.NotFound() -> void
 virtual Microsoft.AspNetCore.Components.NavigationManager.NotFoundCore() -> void

src/Components/Components/src/PublicAPI.Unshipped.txt

@@ -15,12 +15,4 @@ public interface IHostEnvironmentNavigationManager
     /// <param name="baseUri">The base URI.</param>
     /// <param name="uri">The absolute URI.</param>
     void Initialize(string baseUri, string uri);
-
-    /// <summary>
-    /// Initializes the <see cref="NavigationManager" />.
-    /// </summary>
-    /// <param name="baseUri">The base URI.</param>
-    /// <param name="uri">The absolute URI.</param>
-    /// <param name="renderer">The renderer.</param>
-    void Initialize(string baseUri, string uri, IEndpointHtmlRenderer renderer);
 }

src/Components/Components/src/Routing/IHostEnvironmentNavigationManager.cs

@@ -7,24 +7,11 @@ namespace Microsoft.AspNetCore.Components.Endpoints;
 
 internal sealed class HttpNavigationManager : NavigationManager, IHostEnvironmentNavigationManager
 {
-    private IEndpointHtmlRenderer? _renderer;
-
     void IHostEnvironmentNavigationManager.Initialize(string baseUri, string uri) => Initialize(baseUri, uri);
 
-    void IHostEnvironmentNavigationManager.Initialize(string baseUri, string uri, IEndpointHtmlRenderer? renderer)
-    {
-        Initialize(baseUri, uri);
-        _renderer = renderer;
-    }
-
     protected override void NavigateToCore(string uri, NavigationOptions options)
     {
         var absoluteUriString = ToAbsoluteUri(uri).AbsoluteUri;
         throw new NavigationException(absoluteUriString);
     }
-
-    protected override void NotFoundCore()
-    {
-        _renderer?.SetNotFoundResponse();
-    }
 }

src/Components/Endpoints/src/DependencyInjection/HttpNavigationManager.cs

@@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Components.Endpoints;
 /// output with prerendering markers so the content can later switch into interactive mode when used with
 /// blazor.*.js. It also deals with initializing the standard component DI services once per request.
 /// </summary>
-internal partial class EndpointHtmlRenderer : StaticHtmlRenderer, IComponentPrerenderer, IEndpointHtmlRenderer
+internal partial class EndpointHtmlRenderer : StaticHtmlRenderer, IComponentPrerenderer
 {
     private readonly IServiceProvider _services;
     private readonly RazorComponentsServiceOptions _options;
@@ -77,7 +77,15 @@ internal async Task InitializeStandardComponentServicesAsync(
         IFormCollection? form = null)
     {
         var navigationManager = (IHostEnvironmentNavigationManager)httpContext.RequestServices.GetRequiredService<NavigationManager>();
-        navigationManager?.Initialize(GetContextBaseUri(httpContext.Request), GetFullUri(httpContext.Request), this);
+        navigationManager?.Initialize(GetContextBaseUri(httpContext.Request), GetFullUri(httpContext.Request));
+
+        if (navigationManager is HttpNavigationManager httpNavigationManager)
+        {
+            httpNavigationManager.NotFoundEvent += (sender, args) =>
+            {
+                SetNotFoundResponse();
+            };
+        }
 
         var authenticationStateProvider = httpContext.RequestServices.GetService<AuthenticationStateProvider>();
         if (authenticationStateProvider is IHostEnvironmentAuthenticationStateProvider hostEnvironmentAuthenticationStateProvider)

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

@@ -513,11 +513,6 @@ class FakeNavigationManager : NavigationManager, IHostEnvironmentNavigationManag
         public new void Initialize(string baseUri, string uri)
             => base.Initialize(baseUri, uri);
 
-#nullable enable
-        public void Initialize(string baseUri, string uri, IEndpointHtmlRenderer? renderer = null)
-            => base.Initialize(baseUri, uri);
-#nullable disable
-
         protected override void NavigateToCore(string uri, NavigationOptions options)
         {
             // Equivalent to what RemoteNavigationManager would do

src/Components/Endpoints/test/RazorComponentResultTest.cs

@@ -45,18 +45,6 @@ public RemoteNavigationManager(ILogger<RemoteNavigationManager> logger)
         NotifyLocationChanged(isInterceptedLink: false);
     }
 
-    /// <summary>
-    /// Initializes the <see cref="NavigationManager" />.
-    /// </summary>
-    /// <param name="baseUri">The base URI.</param>
-    /// <param name="uri">The absolute URI.</param>
-    /// <param name="renderer">The optional renderer.</param>
-    public void Initialize(string baseUri, string uri, IEndpointHtmlRenderer? renderer = null)
-    {
-        base.Initialize(baseUri, uri);
-        NotifyLocationChanged(isInterceptedLink: false);
-    }
-
     /// <summary>
     /// Initializes the <see cref="RemoteNavigationManager"/>.
     /// </summary>