Update RedirectToLogin.razor

fix #8700 and #9104
4 years ago · e580e9eeb4
parent 9365ba8137
commit e580e9eeb4
1 changed files with 13 additions and 3 deletions
--- a/framework/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/RedirectToLogin.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/RedirectToLogin.razor
@ -1,7 +1,17 @@
@inject NavigationManager Navigation
-@code {
+@inject IJSRuntime JSRuntime
+
+@code { 
    protected override void OnInitialized()
    {
-        Navigation.NavigateTo($"authentication/login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}");
-    }
+        bool isWebAssembly = JSRuntime is IJSInProcessRuntime;
+        if (isWebAssembly)
+        {
+            Navigation.NavigateTo($"authentication/login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}");
+        }
+        else
+        {
+            Navigation.NavigateTo($"account/login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}", true);
+        }
+    } 
 }