From 1cd4d6d0dfa1c5e6d7f68f124dd4ee640def2ef6 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Tue, 23 Jul 2024 07:08:26 -0400 Subject: [PATCH] change IsEffectiiveOrExpired to IsEffectiveAndNotExpired --- Oqtane.Client/Themes/Controls/Theme/LoginBase.cs | 2 +- Oqtane.Client/UI/SiteRouter.razor | 2 +- Oqtane.Server/Infrastructure/Jobs/SearchIndexJob.cs | 4 ++-- Oqtane.Server/Managers/UserManager.cs | 2 +- Oqtane.Server/Security/UserPermissions.cs | 2 +- Oqtane.Server/Services/SiteService.cs | 4 ++-- Oqtane.Shared/Shared/Utilities.cs | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs b/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs index 6e9d4bc9..099be1d5 100644 --- a/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs +++ b/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs @@ -59,7 +59,7 @@ namespace Oqtane.Themes.Controls logouturl = Utilities.TenantUrl(PageState.Alias, "/pages/logout/"); // verify anonymous users can access current page - if (UserSecurity.IsAuthorized(null, PermissionNames.View, PageState.Page.PermissionList) && Utilities.IsEffectiveOrExpired(PageState.Page.EffectiveDate, PageState.Page.ExpiryDate)) + if (UserSecurity.IsAuthorized(null, PermissionNames.View, PageState.Page.PermissionList) && Utilities.IsEffectiveAndNotExpired(PageState.Page.EffectiveDate, PageState.Page.ExpiryDate)) { returnurl = PageState.Route.PathAndQuery; } diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor index cb2eb0be..0ca3b5ea 100644 --- a/Oqtane.Client/UI/SiteRouter.razor +++ b/Oqtane.Client/UI/SiteRouter.razor @@ -256,7 +256,7 @@ } // check if user is authorized to view page - if (page != null && UserSecurity.IsAuthorized(user, PermissionNames.View, page.PermissionList) && (Utilities.IsEffectiveOrExpired(page.EffectiveDate, page.ExpiryDate) || UserSecurity.IsAuthorized(user, PermissionNames.Edit, page.PermissionList))) + if (page != null && UserSecurity.IsAuthorized(user, PermissionNames.View, page.PermissionList) && (Utilities.IsEffectiveAndNotExpired(page.EffectiveDate, page.ExpiryDate) || UserSecurity.IsAuthorized(user, PermissionNames.Edit, page.PermissionList))) { // edit mode if (user != null) diff --git a/Oqtane.Server/Infrastructure/Jobs/SearchIndexJob.cs b/Oqtane.Server/Infrastructure/Jobs/SearchIndexJob.cs index 12f3957d..75375737 100644 --- a/Oqtane.Server/Infrastructure/Jobs/SearchIndexJob.cs +++ b/Oqtane.Server/Infrastructure/Jobs/SearchIndexJob.cs @@ -80,7 +80,7 @@ namespace Oqtane.Infrastructure if (page.ModifiedOn >= lastIndexedOn && !ignoreEntities.Contains(EntityNames.Page)) { changed = true; - removed = page.IsDeleted || !Utilities.IsEffectiveOrExpired(page.EffectiveDate, page.ExpiryDate); + removed = page.IsDeleted || !Utilities.IsEffectiveAndNotExpired(page.EffectiveDate, page.ExpiryDate); var searchContent = new SearchContent { @@ -229,7 +229,7 @@ namespace Oqtane.Infrastructure searchContent.AdditionalContent = string.Empty; } - if (removed || pageModule.IsDeleted || !Utilities.IsEffectiveOrExpired(pageModule.EffectiveDate, pageModule.ExpiryDate)) + if (removed || pageModule.IsDeleted || !Utilities.IsEffectiveAndNotExpired(pageModule.EffectiveDate, pageModule.ExpiryDate)) { searchContent.IsDeleted = true; } diff --git a/Oqtane.Server/Managers/UserManager.cs b/Oqtane.Server/Managers/UserManager.cs index 6bda83dd..35bf2211 100644 --- a/Oqtane.Server/Managers/UserManager.cs +++ b/Oqtane.Server/Managers/UserManager.cs @@ -97,7 +97,7 @@ namespace Oqtane.Managers List userroles = _userRoles.GetUserRoles(userId, siteId).ToList(); foreach (UserRole userrole in userroles) { - if (Utilities.IsEffectiveOrExpired(userrole.EffectiveDate, userrole.ExpiryDate)) + if (Utilities.IsEffectiveAndNotExpired(userrole.EffectiveDate, userrole.ExpiryDate)) { roles += userrole.Role.Name + ";"; if (userrole.Role.Name == RoleNames.Host && !userroles.Any(item => item.Role.Name == RoleNames.Admin)) diff --git a/Oqtane.Server/Security/UserPermissions.cs b/Oqtane.Server/Security/UserPermissions.cs index e26c02f3..cc11a7b5 100644 --- a/Oqtane.Server/Security/UserPermissions.cs +++ b/Oqtane.Server/Security/UserPermissions.cs @@ -83,7 +83,7 @@ namespace Oqtane.Security var role = userRoles.FirstOrDefault(item => item.Role.Name == roleName); if (role != null) { - if (Utilities.IsEffectiveOrExpired(role.EffectiveDate,role.ExpiryDate)) + if (Utilities.IsEffectiveAndNotExpired(role.EffectiveDate,role.ExpiryDate)) { user.Roles += roleName + ";"; } diff --git a/Oqtane.Server/Services/SiteService.cs b/Oqtane.Server/Services/SiteService.cs index cdf04490..8451b58a 100644 --- a/Oqtane.Server/Services/SiteService.cs +++ b/Oqtane.Server/Services/SiteService.cs @@ -73,7 +73,7 @@ namespace Oqtane.Services var pages = new List(); foreach (Page page in site.Pages) { - if (!page.IsDeleted && _userPermissions.IsAuthorized(_accessor.HttpContext.User, PermissionNames.View, page.PermissionList) && (Utilities.IsEffectiveOrExpired(page.EffectiveDate, page.ExpiryDate) || _userPermissions.IsAuthorized(_accessor.HttpContext.User, PermissionNames.Edit, page.PermissionList))) + if (!page.IsDeleted && _userPermissions.IsAuthorized(_accessor.HttpContext.User, PermissionNames.View, page.PermissionList) && (Utilities.IsEffectiveAndNotExpired(page.EffectiveDate, page.ExpiryDate) || _userPermissions.IsAuthorized(_accessor.HttpContext.User, PermissionNames.Edit, page.PermissionList))) { pages.Add(page); } @@ -256,7 +256,7 @@ namespace Oqtane.Services var modules = new List(); foreach (Module module in sitemodules.Where(item => (item.PageId == pageId || pageId == -1) && !item.IsDeleted && _userPermissions.IsAuthorized(_accessor.HttpContext.User, PermissionNames.View, item.PermissionList))) { - if (Utilities.IsEffectiveOrExpired(module.EffectiveDate, module.ExpiryDate) || _userPermissions.IsAuthorized(_accessor.HttpContext.User, PermissionNames.Edit, module.PermissionList)) + if (Utilities.IsEffectiveAndNotExpired(module.EffectiveDate, module.ExpiryDate) || _userPermissions.IsAuthorized(_accessor.HttpContext.User, PermissionNames.Edit, module.PermissionList)) { modules.Add(module); } diff --git a/Oqtane.Shared/Shared/Utilities.cs b/Oqtane.Shared/Shared/Utilities.cs index 3b8b012a..408e889c 100644 --- a/Oqtane.Shared/Shared/Utilities.cs +++ b/Oqtane.Shared/Shared/Utilities.cs @@ -560,7 +560,7 @@ namespace Oqtane.Shared return (localDateTime?.Date, localTime); } - public static bool IsEffectiveOrExpired(DateTime? effectiveDate, DateTime? expiryDate) + public static bool IsEffectiveAndNotExpired(DateTime? effectiveDate, DateTime? expiryDate) { DateTime currentUtcTime = DateTime.UtcNow; @@ -626,10 +626,10 @@ namespace Oqtane.Shared return $"{alias?.BaseUrl}{aliasUrl}{Constants.ContentUrl}{fileId}{method}"; } - [Obsolete("IsPageModuleVisible(DateTime?, DateTime?) is deprecated. Use IsEffectiveOrExpired(DateTime?, DateTime?) instead.", false)] + [Obsolete("IsPageModuleVisible(DateTime?, DateTime?) is deprecated. Use IsEffectiveAndNotExpired(DateTime?, DateTime?) instead.", false)] public static bool IsPageModuleVisible(DateTime? effectiveDate, DateTime? expiryDate) { - return IsEffectiveOrExpired(effectiveDate, expiryDate); + return IsEffectiveAndNotExpired(effectiveDate, expiryDate); } }