Bonus points, change location.replace with Blazor.navigateTo for additional coolness

Author: javiercn

src/Components/Blazor/WebAssembly.Authentication/src/RemoteAuthenticatorViewCore.cs

@@ -219,11 +219,11 @@ private async Task ProcessLogIn(string returnUrl)
                 case RemoteAuthenticationStatus.Redirect:
                     break;
                 case RemoteAuthenticationStatus.Success:
-                    Navigation.NavigateTo(returnUrl);
+                    await NavigateToReturnUrl(returnUrl);
                     break;
                 case RemoteAuthenticationStatus.Failure:
                     var uri = Navigation.ToAbsoluteUri($"{ApplicationPaths.LogInFailedPath}?message={Uri.EscapeDataString(result.ErrorMessage)}").ToString();
-                    Navigation.NavigateTo(uri);
+                    await NavigateToReturnUrl(uri);
                     break;
                 case RemoteAuthenticationStatus.OperationCompleted:
                 default:
@@ -248,7 +248,7 @@ private async Task ProcessLogInCallback()
                     break;
                 case RemoteAuthenticationStatus.Failure:
                     var uri = Navigation.ToAbsoluteUri($"{ApplicationPaths.LogInFailedPath}?message={Uri.EscapeDataString(result.ErrorMessage)}").ToString();
-                    Navigation.NavigateTo(uri);
+                    await NavigateToReturnUrl(uri);
                     break;
                 default:
                     throw new InvalidOperationException($"Invalid authentication result status '{result.Status}'.");
@@ -283,15 +283,15 @@ private async Task ProcessLogOut(string returnUrl)
                         break;
                     case RemoteAuthenticationStatus.Failure:
                         var uri = Navigation.ToAbsoluteUri($"{ApplicationPaths.LogOutFailedPath}?message={Uri.EscapeDataString(result.ErrorMessage)}").ToString();
-                        Navigation.NavigateTo(uri);
+                        await NavigateToReturnUrl(uri);
                         break;
                     default:
                         throw new InvalidOperationException($"Invalid authentication result status '{result.Status ?? "(null)"}'.");
                 }
             }
             else
             {
-                Navigation.NavigateTo(returnUrl);
+                await NavigateToReturnUrl(returnUrl);
             }
         }
 
@@ -311,7 +311,7 @@ private async Task ProcessLogOutCallback()
                     break;
                 case RemoteAuthenticationStatus.Failure:
                     var uri = Navigation.ToAbsoluteUri($"{ApplicationPaths.LogOutFailedPath}?message={Uri.EscapeDataString(result.ErrorMessage)}").ToString();
-                    Navigation.NavigateTo(uri);
+                    await NavigateToReturnUrl(uri);
                     break;
                 default:
                     throw new InvalidOperationException($"Invalid authentication result status '{result.Status ?? "(null)"}'.");
@@ -403,7 +403,7 @@ private string GetParameter(string key)
             return null;
         }
 
-        private async Task NavigateToReturnUrl(string returnUrl) => await JS.InvokeVoidAsync("location.replace", returnUrl);
+        private async Task NavigateToReturnUrl(string returnUrl) => await JS.InvokeVoidAsync("Blazor.navigateTo", returnUrl, false, true);
 
         private ValueTask RedirectToRegister()
         {

src/Components/Blazor/WebAssembly.Authentication/test/RemoteAuthenticatorCoreTests.cs

@@ -56,7 +56,7 @@ public async Task AuthenticationManager_Login_NavigatesToReturnUrlOnSuccess()
             await renderer.Dispatcher.InvokeAsync<object>(() => remoteAuthenticator.SetParametersAsync(parameters));
 
             // Assert
-            Assert.Equal("https://www.example.com/base/fetchData", remoteAuthenticator.Navigation.Uri);
+            Assert.Equal("https://www.example.com/base/fetchData", jsRuntime.LastInvocation.args[0]);
         }
 
         [Fact]
@@ -109,7 +109,7 @@ public async Task AuthenticationManager_Login_NavigatesToLoginFailureOnError()
             // Assert
             Assert.Equal(
                 "https://www.example.com/base/authentication/login-failed?message=There was an error trying to log in",
-                remoteAuthenticator.Navigation.Uri);
+                jsRuntime.LastInvocation.args[0]);
 
         }
 
@@ -220,7 +220,7 @@ public async Task AuthenticationManager_LoginCallback_NavigatesToLoginFailureOnE
             // Assert
             Assert.Equal(
                 "https://www.example.com/base/authentication/login-failed?message=There was an error trying to log in",
-                remoteAuthenticator.Navigation.Uri);
+                jsRuntime.LastInvocation.args[0]);
 
         }
 
@@ -358,7 +358,7 @@ public async Task AuthenticationManager_Logout_NavigatesToLogoutFailureOnError()
             // Assert
             Assert.Equal(
                 "https://www.example.com/base/authentication/logout-failed?message=There was an error trying to log out",
-                remoteAuthenticator.Navigation.Uri);
+                jsRuntime.LastInvocation.args[0]);
         }
 
         [Fact]
@@ -468,7 +468,7 @@ public async Task AuthenticationManager_LogoutCallback_NavigatesToLoginFailureOn
             // Assert
             Assert.Equal(
                 "https://www.example.com/base/authentication/logout-failed?message=There was an error trying to log out",
-                remoteAuthenticator.Navigation.Uri);
+                jsRuntime.LastInvocation.args[0]);
 
         }
 

src/Components/Web.JS/src/Services/NavigationManager.ts

@@ -72,34 +72,40 @@ export function attachToEventDelegator(eventDelegator: EventDelegator) {
   });
 }
 
-export function navigateTo(uri: string, forceLoad: boolean) {
+export function navigateTo(uri: string, forceLoad: boolean, replace: boolean = false) {
   const absoluteUri = toAbsoluteUri(uri);
 
   if (!forceLoad && isWithinBaseUriSpace(absoluteUri)) {
     // It's an internal URL, so do client-side navigation
-    performInternalNavigation(absoluteUri, false);
+    performInternalNavigation(absoluteUri, false, replace);
   } else if (forceLoad && location.href === uri) {
     // Force-loading the same URL you're already on requires special handling to avoid
     // triggering browser-specific behavior issues.
     // For details about what this fixes and why, see https://github.com/aspnet/AspNetCore/pull/10839
     const temporaryUri = uri + '?';
     history.replaceState(null, '', temporaryUri);
     location.replace(uri);
+  } else if (replace){
+    history.replaceState(null, '', absoluteUri)
   } else {
     // It's either an external URL, or forceLoad is requested, so do a full page load
     location.href = uri;
   }
 }
 
-function performInternalNavigation(absoluteInternalHref: string, interceptedLink: boolean) {
+function performInternalNavigation(absoluteInternalHref: string, interceptedLink: boolean, replace: boolean = false) {
   // Since this was *not* triggered by a back/forward gesture (that goes through a different
   // code path starting with a popstate event), we don't want to preserve the current scroll
   // position, so reset it.
   // To avoid ugly flickering effects, we don't want to change the scroll position until the
   // we render the new page. As a best approximation, wait until the next batch.
   resetScrollAfterNextBatch();
 
-  history.pushState(null, /* ignored title */ '', absoluteInternalHref);
+  if(!replace){
+    history.pushState(null, /* ignored title */ '', absoluteInternalHref);
+  }else{
+    history.replaceState(null, /* ignored title */ '', absoluteInternalHref);
+  }
   notifyLocationChanged(interceptedLink);
 }