From 8b41a03080f13c0aac9a517069196e87af743b27 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@users.noreply.github.com>
Date: Fri, 5 Jan 2024 10:15:51 +0100
Subject: [PATCH] Modified Logic from || to &&

UserSecurity.IsAuthorized && Utilities.IsPageModuleVisible fixed
---
 Oqtane.Client/UI/SiteRouter.razor | 69 +++++++++++++++++--------------
 1 file changed, 38 insertions(+), 31 deletions(-)

diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index db9e1563..92f7040c 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -262,41 +262,48 @@
             if (page != null)
             {
                 // check if user is authorized to view page
-                if ((Utilities.IsPageModuleVisible(page.EffectiveDate, page.ExpiryDate) || UserSecurity.IsAuthorized(user, PermissionNames.Edit, page.PermissionList)) || UserSecurity.IsAuthorized(user, PermissionNames.View, page.PermissionList))
+                if (UserSecurity.IsAuthorized(user, PermissionNames.View, page.PermissionList) && (Utilities.IsPageModuleVisible(page.EffectiveDate, page.ExpiryDate) || UserSecurity.IsAuthorized(user, PermissionNames.Edit, page.PermissionList)))
+                //if ((Utilities.IsPageModuleVisible(page.EffectiveDate, page.ExpiryDate) || UserSecurity.IsAuthorized(user, PermissionNames.Edit, page.PermissionList)) || UserSecurity.IsAuthorized(user, PermissionNames.View, page.PermissionList))
                 {
-                    // if (UserSecurity.IsAuthorized(user, PermissionNames.Edit, page.PermissionList) || Utilities.ValidateEffectiveExpiryDates(page.EffectiveDate, page.ExpiryDate))
-                    // {
-                        // load additional metadata for current page
-                        page = ProcessPage(page, site, user, SiteState.Alias);
+                    // load additional metadata for current page
+                    page = ProcessPage(page, site, user, SiteState.Alias);
 
-                        // load additional metadata for modules
-                        (page, site.Modules) = ProcessModules(page, site.Modules, moduleid, action, (!string.IsNullOrEmpty(page.DefaultContainerType)) ? page.DefaultContainerType : site.DefaultContainerType, SiteState.Alias);
+                    // load additional metadata for modules
+                    (page, site.Modules) = ProcessModules(page, site.Modules, moduleid, action, (!string.IsNullOrEmpty(page.DefaultContainerType)) ? page.DefaultContainerType : site.DefaultContainerType, SiteState.Alias);
 
-                        // populate page state (which acts as a client-side cache for subsequent requests)
-                        _pagestate = new PageState
-                        {
-                            Alias = SiteState.Alias,
-                            Site = site,
-                            Page = page,
-                            User = user,
-                            Uri = new Uri(_absoluteUri, UriKind.Absolute),
-                            Route = route,
-                            QueryString = querystring,
-                            UrlParameters = route.UrlParameters,
-                            ModuleId = moduleid,
-                            Action = action,
-                            EditMode = editmode,
-                            LastSyncDate = lastsyncdate,
-                            Runtime = runtime,
-						    VisitorId = VisitorId,
-						    RemoteIPAddress = SiteState.RemoteIPAddress,
-						    ReturnUrl = returnurl,
-                            IsInternalNavigation = _isInternalNavigation
-                        };
+                    // populate page state (which acts as a client-side cache for subsequent requests)
+                    _pagestate = new PageState
+                    {
+                        Alias = SiteState.Alias,
+                        Site = site,
+                        Page = page,
+                        User = user,
+                        Uri = new Uri(_absoluteUri, UriKind.Absolute),
+                        Route = route,
+                        QueryString = querystring,
+                        UrlParameters = route.UrlParameters,
+                        ModuleId = moduleid,
+                        Action = action,
+                        EditMode = editmode,
+                        LastSyncDate = lastsyncdate,
+                        Runtime = runtime,
+						VisitorId = VisitorId,
+						RemoteIPAddress = SiteState.RemoteIPAddress,
+						ReturnUrl = returnurl,
+                        IsInternalNavigation = _isInternalNavigation
+                    };
 
-                        OnStateChange?.Invoke(_pagestate);
-                        await ScrollToFragment(_pagestate.Uri);
-                    // }
+                    OnStateChange?.Invoke(_pagestate);
+                    await ScrollToFragment(_pagestate.Uri);
+                }
+                else
+                {
+                    // Need to redirect 404 as page doesnot exist in a Permission or Timeframe
+                    if (route.PagePath != "404")
+                    {
+                        // redirect to 404 page
+                        NavigationManager.NavigateTo(Utilities.NavigateUrl(SiteState.Alias.Path, "404", ""));
+                    }
                 }
             }
             else // page not found