Merge pull request #1246 from leigh-pointer/dev.fork

Redirect on log out #1225 Fix
oqtane · Apr 18, 2021 · 7a3b2e6 · 7a3b2e6
2 parents 8899504 + 1e7e2c8
commit 7a3b2e6
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs b/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs
@@ -3,17 +3,19 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using Oqtane.Providers;
+using Oqtane.Security;
 using Oqtane.Services;
+using Oqtane.Shared;
 using Oqtane.UI;
 
 namespace Oqtane.Themes.Controls
 {
     public class LoginBase : ThemeControlBase
     {
-        [Inject] public NavigationManager NavigationManager {get;set;}
-        [Inject]public IUserService UserService {get;set;}
-        [Inject]public IJSRuntime jsRuntime {get;set;}
-        [Inject]public IServiceProvider ServiceProvider {get;set;}
+        [Inject] public NavigationManager NavigationManager { get; set; }
+        [Inject] public IUserService UserService { get; set; }
+        [Inject] public IJSRuntime jsRuntime { get; set; }
+        [Inject] public IServiceProvider ServiceProvider { get; set; }
 
         protected void LoginUser()
         {
@@ -29,21 +31,22 @@ protected async Task LogoutUser()
         {
             await UserService.LogoutUserAsync(PageState.User);
             PageState.User = null;
+            bool authorizedtoviewpage = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, PageState.Page.Permissions);
 
             if (PageState.Runtime == Oqtane.Shared.Runtime.Server)
             {
                 // server-side Blazor
                 var interop = new Interop(jsRuntime);
                 string antiforgerytoken = await interop.GetElementByName("__RequestVerificationToken");
-                var fields = new { __RequestVerificationToken = antiforgerytoken, returnurl = (PageState.Alias.Path + "/" + PageState.Page.Path) };
+                var fields = new { __RequestVerificationToken = antiforgerytoken, returnurl = !authorizedtoviewpage ? PageState.Alias.Path : PageState.Alias.Path + "/" + PageState.Page.Path };
                 await interop.SubmitForm($"/{PageState.Alias.AliasId}/pages/logout/", fields);
             }
             else
             {
                 // client-side Blazor
                 var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
                 authstateprovider.NotifyAuthenticationChanged();
-                NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, "reload"));
+                NavigationManager.NavigateTo(NavigateUrl(!authorizedtoviewpage ? PageState.Alias.Path : PageState.Page.Path, "reload"));
             }
         }
     }