Merge pull request #4457 from sbwalker/dev

change IsEffectiiveOrExpired to IsEffectiveAndNotExpired
oqtane · Jul 23, 2024 · 56eebb0 · 56eebb0
2 parents 478a308 + 1cd4d6d
commit 56eebb0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs b/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs
@@ -59,7 +59,7 @@ protected override void OnParametersSet()
             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
@@ -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
@@ -80,7 +80,7 @@ public override async Task<string> ExecuteJobAsync(IServiceProvider provider)
                     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 @@ private void ValidateSearchContent(SearchContent searchContent, PageModule pageM
                 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
@@ -97,7 +97,7 @@ private string GetUserRoles(int userId, int siteId)
             List<UserRole> 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
@@ -83,7 +83,7 @@ public User GetUser(ClaimsPrincipal principal)
                     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
@@ -73,7 +73,7 @@ public async Task<Site> GetSiteAsync(int siteId)
             var pages = new List<Page>();
             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 @@ public async Task<List<Module>> GetModulesAsync(int siteId, int pageId)
             var modules = new List<Module>();
             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
@@ -560,7 +560,7 @@ public static (DateTime? date, string time) UtcAsLocalDateAndTime(DateTime? date
 
             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 @@ public static string ContentUrl(Alias alias, int fileId, bool asAttachment)
             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);
         }
 
     }