Update src/Components/Server/src/Circuits/DefaultCircuitFactory.cs

Co-Authored-By: campersau <buchholz.bastian@googlemail.com>

Author: rynowak

src/Components/Server/src/Circuits/CircuitPrerenderer.cs

@@ -131,7 +131,7 @@ private CircuitHost GetOrCreateCircuitHost(HttpContext context, PrerenderingCanc
                 var result = _circuitFactory.CreateCircuitHost(
                     context,
                     client: new CircuitClientProxy(), // This creates an "offline" client.
-                    GetFullBaseUri(context.Request)
+                    GetFullBaseUri(context.Request),
                     GetFullUri(context.Request),
                     context.User);
 

src/Components/Server/src/Circuits/DefaultCircuitFactory.cs

@@ -14,6 +14,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.JSInterop;
+using System.Threading.Tasks;
 
 namespace Microsoft.AspNetCore.Components.Server.Circuits
 {
@@ -39,7 +40,7 @@ public override CircuitHost CreateCircuitHost(
             HttpContext httpContext,
             CircuitClientProxy client,
             string baseUri,
-            string uri
+            string uri,
             ClaimsPrincipal user)
         {
             var components = ResolveComponentMetadata(httpContext, client);
@@ -58,7 +59,7 @@ string uri
                 authenticationStateProvider.SetAuthenticationState(Task.FromResult(authenticationState));
             }
 
-            var navigationManaaer = (RemoteNavigationManager)scope.ServiceProvider.GetRequiredService<NavigationManager>();
+            var navigationManager = (RemoteNavigationManager)scope.ServiceProvider.GetRequiredService<NavigationManager>();
             var navigationInterception = (RemoteNavigationInterception)scope.ServiceProvider.GetRequiredService<INavigationInterception>();
             if (client.Connected)
             {

src/Components/Server/src/ComponentHub.cs

@@ -97,7 +97,7 @@ public string StartCircuit(string baseUri, string uri)
                 Context.GetHttpContext(),
                 circuitClient,
                 baseUri,
-                uri
+                uri,
                 Context.User);
 
             circuitHost.UnhandledException += CircuitHost_UnhandledException;

src/Components/Server/test/Circuits/CircuitPrerendererTest.cs

@@ -198,7 +198,7 @@ public override CircuitHost CreateCircuitHost(HttpContext httpContext, CircuitCl
                 serviceCollection.AddScoped<NavigationManager>(_ =>
                 {
                     var navigationManager = new RemoteNavigationManager(NullLogger<RemoteNavigationManager>.Instance);
-                    navigationManager.Initialize(baseUriAbsolute, uriAbsolute);
+                    navigationManager.Initialize(baseUri, uri);
                     return navigationManager;
                 });
                 var serviceScope = serviceCollection.BuildServiceProvider().CreateScope();

src/Components/test/testassets/BasicTestApp/PrerenderedRedirection.razor

@@ -1,5 +1,5 @@
 @page "/prerendered-redirection"
-@inject IUriHelper UriHelper
+@inject NavigationManager NavigationManager
 
 @{
     throw new InvalidOperationException("The rendering logic should never be executed");
@@ -8,9 +8,9 @@
 @code {
     protected override Task OnInitializedAsync()
     {
-        var uri = UriHelper.GetAbsoluteUri();
+        var uri = NavigationManager.Uri;
         var destination = uri.Substring(uri.IndexOf("?destination=") + 13);
-        UriHelper.NavigateTo(destination);
+        NavigationManager.NavigateTo(destination);
         return Task.CompletedTask;
     }
 }

src/Components/test/testassets/BasicTestApp/RouterTest/LongPage1.razor

@@ -1,12 +1,12 @@
 @page "/LongPage1"
-@inject IUriHelper UriHelper
+@inject NavigationManager NavigationManager
 <div id="test-info">This is a long page you can scroll.</div>
 
 <div style="border: 2px dashed red; margin: 1rem; padding: 1rem; height: 1500px;">
     Scroll past me to find the links
 </div>
 
-<button id="go-to-longpage2" @onclick="@(() => UriHelper.NavigateTo("LongPage2"))">
+<button id="go-to-longpage2" @onclick="@(() => NavigationManager.NavigateTo("LongPage2"))">
     Navigate programmatically to long page 2
 </button>