Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Updates

Browse Source 
Loops tighter
Updated Logout base
SiteController corrected.
This commit is contained in:
Leigh Pointer
2024-01-03 12:12:27 +01:00
parent 5ce5193430
commit 22e4e4efc1
4 changed files with 47 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Oqtane.Client/UI/SiteRouter.razor
View File

@ -258,20 +258,14 @@
}
}
}
bool isAdminOrHost = false;
if(user != null)
{
isAdminOrHost = UserSecurity.IsAuthorized(user, RoleNames.Admin) || UserSecurity.IsAuthorized(user, PermissionNames.Edit, page.PermissionList);
}
if (page != null && (isAdminOrHost || IsPageModuleVisible(page.EffectiveDate, page.ExpiryDate)))
if (page != null)
{
// check if user is authorized to view page
if (UserSecurity.IsAuthorized(user, PermissionNames.View, page.PermissionList))
if ((Utilities.IsPageModuleVisible(page.EffectiveDate, page.ExpiryDate) || UserSecurity.IsAuthorized(user, PermissionNames.Edit, page.PermissionList)) || UserSecurity.IsAuthorized(user, PermissionNames.View, page.PermissionList))
{
if (isAdminOrHost || Utilities.ValidateEffectiveExpiryDates(page.EffectiveDate, page.ExpiryDate))
{
// 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);
@ -302,7 +296,7 @@
OnStateChange?.Invoke(_pagestate);
await ScrollToFragment(_pagestate.Uri);
}
// }
}
}
else // page not found
@ -316,7 +310,7 @@
}
else // not mapped
{
if (user == null && IsPageModuleVisible(page.EffectiveDate, page.ExpiryDate))
if (user == null && Utilities.IsPageModuleVisible(page.EffectiveDate, page.ExpiryDate))
{
// redirect to login page if user not logged in as they may need to be authenticated
NavigationManager.NavigateTo(Utilities.NavigateUrl(SiteState.Alias.Path, "login", "?returnurl=" + WebUtility.UrlEncode(route.PathAndQuery)));
@ -587,29 +581,4 @@
}
}
}
private bool IsPageModuleVisible(DateTime? effectiveDate, DateTime? expiryDate)
{
DateTime currentUtcTime = DateTime.UtcNow;
// Check if either effectiveDate or expiryDate is provided
if (effectiveDate.HasValue && expiryDate.HasValue)
{
return currentUtcTime >= effectiveDate.Value && currentUtcTime <= expiryDate.Value;
}
// Check if only effectiveDate is provided
else if (effectiveDate.HasValue)
{
return currentUtcTime >= effectiveDate.Value;
}
// Check if only expiryDate is provided
else if (expiryDate.HasValue)
{
return currentUtcTime <= expiryDate.Value;
}
// If neither effectiveDate nor expiryDate is provided, consider the page/module visible
else
{
return true;
}
}
}