Permission Optimalization

Oqtane.Server/Controllers/FolderController.cs

@@ -6,6 +6,7 @@ using Oqtane.Shared;
 using System.Linq;
 using System.Net;
 using Oqtane.Enums;
+using Oqtane.Extensions;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Security;
@@ -17,14 +18,12 @@ namespace Oqtane.Controllers
     {
         private readonly IFolderRepository _folders;
         private readonly IUserPermissions _userPermissions;
-        private readonly IPermissionRepository _permissionRepository;
         private readonly ILogManager _logger;
 
-        public FolderController(IFolderRepository folders, IUserPermissions userPermissions, IPermissionRepository permissionRepository, ILogManager logger)
+        public FolderController(IFolderRepository folders, IUserPermissions userPermissions, ILogManager logger)
         {
             _folders = folders;
             _userPermissions = userPermissions;
-            _permissionRepository = permissionRepository;
             _logger = logger;
         }
 
@@ -100,9 +99,9 @@ namespace Oqtane.Controllers
                 }
                 else
                 {
-                    permissions = _permissionRepository.EncodePermissions(new List<Permission> {
+                    permissions = new List<Permission> {
-                        new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        new Permission(PermissionNames.Edit, Constants.AdminRole, true),
-                    });
+                    }.EncodePermissions();
                 }
                 if (_userPermissions.IsAuthorized(User,PermissionNames.Edit, permissions))
                 {

Oqtane.Server/Controllers/PageController.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using Oqtane.Security;
 using System.Net;
 using Oqtane.Enums;
+using Oqtane.Extensions;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
@@ -19,17 +20,15 @@ namespace Oqtane.Controllers
         private readonly IModuleRepository _modules;
         private readonly IPageModuleRepository _pageModules;
         private readonly IUserPermissions _userPermissions;
-        private readonly IPermissionRepository _permissionRepository;
         private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
 
-        public PageController(IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IUserPermissions userPermissions, IPermissionRepository permissionRepository, ISyncManager syncManager, ILogManager logger)
+        public PageController(IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IUserPermissions userPermissions, ISyncManager syncManager, ILogManager logger)
         {
             _pages = pages;
             _modules = modules;
             _pageModules = pageModules;
             _userPermissions = userPermissions;
-            _permissionRepository = permissionRepository;
             _syncManager = syncManager;
             _logger = logger;
         }
@@ -113,9 +112,9 @@ namespace Oqtane.Controllers
                 }
                 else
                 {
-                    permissions = _permissionRepository.EncodePermissions(new List<Permission> {
+                    permissions = new List<Permission> {
                         new Permission(PermissionNames.Edit, Constants.AdminRole, true)
-                    });
+                    }.EncodePermissions();
                 }
             
                 if (_userPermissions.IsAuthorized(User,PermissionNames.Edit, permissions))
@@ -156,10 +155,10 @@ namespace Oqtane.Controllers
                 page.ThemeType = parent.ThemeType;
                 page.LayoutType = parent.LayoutType;
                 page.Icon = parent.Icon;
-                page.Permissions = _permissionRepository.EncodePermissions(new List<Permission> {
+                page.Permissions = new List<Permission> {
                     new Permission(PermissionNames.View, userid, true),
                     new Permission(PermissionNames.Edit, userid, true)
-                });
+                }.EncodePermissions();
                 page.IsPersonalizable = false;
                 page.UserId = int.Parse(userid);
                 page = _pages.AddPage(page);
@@ -173,10 +172,10 @@ namespace Oqtane.Controllers
                     module.SiteId = page.SiteId;
                     module.PageId = page.PageId;
                     module.ModuleDefinitionName = pm.Module.ModuleDefinitionName;
-                    module.Permissions = _permissionRepository.EncodePermissions(new List<Permission> {
+                    module.Permissions = new List<Permission> {
                         new Permission(PermissionNames.View, userid, true),
                         new Permission(PermissionNames.Edit, userid, true)
-                    });
+                    }.EncodePermissions();
                     module = _modules.AddModule(module);
 
                     string content = _modules.ExportModule(pm.ModuleId);

Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs

@@ -3,21 +3,21 @@ using Oqtane.Infrastructure;
 using System.Collections.Generic;
 using Oqtane.Repository;
 using Microsoft.AspNetCore.Hosting;
+using Oqtane.Extensions;
 using Oqtane.Shared;
 
 namespace Oqtane.SiteTemplates
 {
     public class DefaultSiteTemplate : ISiteTemplate
     {
-        private readonly IPermissionRepository _permissionRepository;
+
         private readonly IWebHostEnvironment _environment;
         private readonly ISiteRepository _siteRepository;
         private readonly IFolderRepository _folderRepository;
         private readonly IFileRepository _fileRepository;
 
-        public DefaultSiteTemplate(IPermissionRepository permissionRepository, IWebHostEnvironment environment, ISiteRepository siteRepository, IFolderRepository folderRepository, IFileRepository fileRepository)
+        public DefaultSiteTemplate(IWebHostEnvironment environment, ISiteRepository siteRepository, IFolderRepository folderRepository, IFileRepository fileRepository)
         {
-            _permissionRepository = permissionRepository;
             _environment = environment;
             _siteRepository = siteRepository;
             _folderRepository = folderRepository;
@@ -42,40 +42,40 @@ namespace Oqtane.SiteTemplates
                 IsNavigation = true,
                 IsPersonalizable = false,
                 EditMode = false,
-                PagePermissions = _permissionRepository.EncodePermissions( new List<Permission> {
+                PagePermissions = new List<Permission> {
                     new Permission(PermissionNames.View, Constants.AllUsersRole, true),
                     new Permission(PermissionNames.View, Constants.AdminRole, true),
                     new Permission(PermissionNames.Edit, Constants.AdminRole, true)
-                }) ,
+                }.EncodePermissions() ,
                 PageTemplateModules = new List<PageTemplateModule> {
                     new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Welcome To Oqtane...", Pane = "Content", 
-                        ModulePermissions = _permissionRepository.EncodePermissions( new List<Permission> {
+                        ModulePermissions = new List<Permission> {
                             new Permission(PermissionNames.View, Constants.AllUsersRole, true),
                             new Permission(PermissionNames.View, Constants.AdminRole, true),
                             new Permission(PermissionNames.Edit, Constants.AdminRole, true)
-                        }),
+                        }.EncodePermissions(),
                         Content = "<p><a href=\"https://www.oqtane.org\" target=\"_new\">Oqtane</a> is an open source <b>modular application framework</b> built from the ground up using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a <b>fully dynamic</b> web development experience which can be executed on a client or server. Whether you are looking for a platform to <b>accelerate your web development</b> efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.</p>" +
                         "<p align=\"center\"><a href=\"https://www.oqtane.org\" target=\"_new\"><img class=\"img-fluid\" src=\"oqtane.png\"></a></p><p align=\"center\"><a class=\"btn btn-primary\" href=\"https://www.oqtane.org/Community\" target=\"_new\">Join Our Community</a>&nbsp;&nbsp;<a class=\"btn btn-primary\" href=\"https://github.com/oqtane/oqtane.framework\" target=\"_new\">Clone Our Repo</a></p>" +
                         "<p><a href=\"https://dotnet.microsoft.com/apps/aspnet/web-apps/blazor\" target=\"_new\">Blazor</a> is a single-page app framework that lets you build interactive web applications using C# instead of JavaScript. Client-side Blazor relies on WebAssembly, an open web standard that does not require plugins or code transpilation in order to run natively in a web browser. Server-side Blazor uses SignalR to host your application on a web server and provide a responsive and robust debugging experience. Blazor applications works in all modern web browsers, including mobile browsers.</p>" +
                         "<p>Blazor is a feature of <a href=\"https://dotnet.microsoft.com/apps/aspnet\" target=\"_new\">ASP.NET Core 3</a>, the popular cross platform web development framework from Microsoft that extends the <a href=\"https://dotnet.microsoft.com/learn/dotnet/what-is-dotnet\" target=\"_new\" >.NET developer platform</a> with tools and libraries for building web apps.</p>"
                     },
                     new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = "Content",
-                        ModulePermissions = _permissionRepository.EncodePermissions( new List<Permission> {
+                        ModulePermissions = new List<Permission> {
                             new Permission(PermissionNames.View, Constants.AllUsersRole, true),
                             new Permission(PermissionNames.View, Constants.AdminRole, true),
                             new Permission(PermissionNames.Edit, Constants.AdminRole, true)
-                        }),
+                        }.EncodePermissions(),
                         Content = "<p>Copyright (c) 2019-2020 .NET Foundation</p>" +
                         "<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>" +
                         "<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>" +
                         "<p>THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>"
                     },
                     new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content",
-                        ModulePermissions = _permissionRepository.EncodePermissions( new List<Permission> {
+                        ModulePermissions = new List<Permission> {
                             new Permission(PermissionNames.View, Constants.RegisteredRole, true),
                             new Permission(PermissionNames.View, Constants.AdminRole, true),
                             new Permission(PermissionNames.Edit, Constants.AdminRole, true)
-                        }),
+                        }.EncodePermissions(),
                         Content = "<p>Oqtane allows you to control access to your content using security roles. This module is only visible to Registered Users of the site.</p>"
                     }
                 }
@@ -89,18 +89,18 @@ namespace Oqtane.SiteTemplates
                 IsNavigation = true,
                 IsPersonalizable = false,
                 EditMode = false,
-                PagePermissions = _permissionRepository.EncodePermissions(new List<Permission> {
+                PagePermissions = new List<Permission> {
                     new Permission(PermissionNames.View, Constants.RegisteredRole, true),
                     new Permission(PermissionNames.View, Constants.AdminRole, true),
                     new Permission(PermissionNames.Edit, Constants.AdminRole, true)
-                }),
+                }.EncodePermissions(),
                 PageTemplateModules = new List<PageTemplateModule> {
                     new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content",
-                        ModulePermissions = _permissionRepository.EncodePermissions( new List<Permission> {
+                        ModulePermissions = new List<Permission> {
                             new Permission(PermissionNames.View, Constants.RegisteredRole, true),
                             new Permission(PermissionNames.View, Constants.AdminRole, true),
                             new Permission(PermissionNames.Edit, Constants.AdminRole, true)
-                        }),
+                        }.EncodePermissions(),
                         Content = "<p>Oqtane allows you to control access to your content using security roles. This page is only visible to Registered Users of the site.</p>"
                     }
                 }
@@ -114,18 +114,18 @@ namespace Oqtane.SiteTemplates
                 IsNavigation = true,
                 IsPersonalizable = true,
                 EditMode = false,
-                PagePermissions = _permissionRepository.EncodePermissions(new List<Permission> {
+                PagePermissions = new List<Permission> {
                     new Permission(PermissionNames.View, Constants.AllUsersRole, true),
                     new Permission(PermissionNames.View, Constants.AdminRole, true),
                     new Permission(PermissionNames.Edit, Constants.AdminRole, true)
-                }),
+                }.EncodePermissions(),
                 PageTemplateModules = new List<PageTemplateModule> {
                     new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "My Page", Pane = "Content",
-                        ModulePermissions = _permissionRepository.EncodePermissions( new List<Permission> {
+                        ModulePermissions = new List<Permission> {
                             new Permission(PermissionNames.View, Constants.AllUsersRole, true),
                             new Permission(PermissionNames.View, Constants.AdminRole, true),
                             new Permission(PermissionNames.Edit, Constants.AdminRole, true)
-                        }),
+                        }.EncodePermissions(),
                         Content = "<p>Oqtane offers native support for user personalized pages. If a page is identified as personalizable by the site administrator in the page settings, when an authenticated user visits the page they will see an edit button at the top right corner of the page next to their username. When they click this button the sytem will create a new version of the page and allow them to edit the page content.</p>"
                     }
                 }

Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs

@@ -1,6 +1,7 @@
 using Oqtane.Models;
 using Oqtane.Infrastructure;
 using System.Collections.Generic;
+using Oqtane.Extensions;
 using Oqtane.Repository;
 using Oqtane.Shared;
 
@@ -8,11 +9,8 @@ namespace Oqtane.SiteTemplates
 {
     public class EmptySiteTemplate : ISiteTemplate
     {
-        private readonly IPermissionRepository _permissionRepository;
+        public EmptySiteTemplate()
- 
-        public EmptySiteTemplate(IPermissionRepository permissionRepository)
         {
-            _permissionRepository = permissionRepository;
         }
 
         public string Name
@@ -33,11 +31,11 @@ namespace Oqtane.SiteTemplates
                 IsNavigation = true,
                 IsPersonalizable = false,
                 EditMode = false,
-                PagePermissions = _permissionRepository.EncodePermissions( new List<Permission> {
+                PagePermissions = new List<Permission> {
                     new Permission(PermissionNames.View, Constants.AllUsersRole, true),
                     new Permission(PermissionNames.View, Constants.AdminRole, true),
                     new Permission(PermissionNames.Edit, Constants.AdminRole, true)
-                }),
+                }.EncodePermissions(),
                 PageTemplateModules = new List<PageTemplateModule>()
             });
 

Oqtane.Server/Repository/FileRepository.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
+using Oqtane.Extensions;
 using Oqtane.Models;
 using Oqtane.Shared;
 
@@ -23,7 +24,7 @@ namespace Oqtane.Repository
             IEnumerable<File> files = _db.File.Where(item => item.FolderId == folderId).Include(item => item.Folder);
             foreach (File file in files)
             {
-                file.Folder.Permissions = _permissions.EncodePermissions(permissions);
+                file.Folder.Permissions = permissions.EncodePermissions();
             }
             return files;
         }
@@ -48,7 +49,7 @@ namespace Oqtane.Repository
             if (file != null)
             {
                 IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Folder, file.FolderId).ToList();
-                file.Folder.Permissions = _permissions.EncodePermissions(permissions);
+                file.Folder.Permissions = permissions.EncodePermissions();
             }
             return file;
         }

Oqtane.Server/Repository/FolderRepository.cs

@@ -1,6 +1,7 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
+using Oqtane.Extensions;
 using Oqtane.Models;
 using Oqtane.Shared;
 
@@ -23,7 +24,7 @@ namespace Oqtane.Repository
             IEnumerable<Folder> folders = _db.Folder.Where(item => item.SiteId == siteId);
             foreach(Folder folder in folders)
             {
-                folder.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == folder.FolderId));
+                folder.Permissions = permissions.Where(item => item.EntityId == folder.FolderId).EncodePermissions();
             }
             return folders;
         }
@@ -49,8 +50,7 @@ namespace Oqtane.Repository
             Folder folder = _db.Folder.Find(folderId);
             if (folder != null)
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Folder, folder.FolderId).ToList();
+                folder.Permissions = _permissions.GetPermissionString(EntityNames.Folder, folder.FolderId);
-                folder.Permissions = _permissions.EncodePermissions(permissions);
             }
             return folder;
         }
@@ -60,8 +60,7 @@ namespace Oqtane.Repository
             Folder folder = _db.Folder.Where(item => item.SiteId == siteId && item.Path == path).FirstOrDefault();
             if (folder != null)
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Folder, folder.FolderId).ToList();
+                folder.Permissions = _permissions.GetPermissionString(EntityNames.Folder, folder.FolderId);
-                folder.Permissions = _permissions.EncodePermissions(permissions);
             }
             return folder;
         }

Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
+// ReSharper disable once CheckNamespace
 namespace Oqtane.Repository
 {
     public interface IPermissionRepository
@@ -8,13 +9,17 @@ namespace Oqtane.Repository
         IEnumerable<Permission> GetPermissions(int siteId, string entityName);
         IEnumerable<Permission> GetPermissions(string entityName, int entityId);
         IEnumerable<Permission> GetPermissions(string entityName, int entityId, string permissionName);
+        
+        string GetPermissionString(int siteId, string entityName);
+        string GetPermissionString(string entityName, int entityId);
+        string GetPermissionString(string entityName, int entityId, string permissionName);
+        
         Permission AddPermission(Permission permission);
         Permission UpdatePermission(Permission permission);
         void UpdatePermissions(int siteId, string entityName, int entityId, string permissionStrings);
         Permission GetPermission(int permissionId);
         void DeletePermission(int permissionId);
         void DeletePermissions(int siteId, string entityName, int entityId);
-        string EncodePermissions(IEnumerable<Permission> permissionList);
         IEnumerable<Permission> DecodePermissions(string permissions, int siteId, string entityName, int entityId);
      }
 }

Oqtane.Server/Repository/ModuleDefinitionRepository.cs

@@ -115,7 +115,7 @@ namespace Oqtane.Repository
                     }
                     else
                     {
-                        moduledefinition.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == moduledef.ModuleDefinitionId));
+                        moduledefinition.Permissions = permissions.Where(item => item.EntityId == moduledef.ModuleDefinitionId).EncodePermissions();
                     }
                     // remove module definition from list as it is already synced
                     moduledefs.Remove(moduledef);
@@ -160,7 +160,7 @@ namespace Oqtane.Repository
             {
                 if (modulecontroltype.Name != "ModuleBase" && !modulecontroltype.Namespace.EndsWith(".Controls"))
                 {
-                    string[] typename = modulecontroltype.AssemblyQualifiedName.Split(',').Select(item => item.Trim()).ToList().ToArray();
+                    string[] typename = modulecontroltype.AssemblyQualifiedName?.Split(',').Select(item => item.Trim()).ToArray();
                     string[] segments = typename[0].Split('.');
                     Array.Resize(ref segments, segments.Length - 1);
                     string moduleType = string.Join(".", segments);
@@ -195,7 +195,7 @@ namespace Oqtane.Repository
                         // set internal properties
                         moduledefinition.ModuleDefinitionName = qualifiedModuleType;
                         moduledefinition.ControlTypeTemplate = moduleType + "." + Constants.ActionToken + ", " + typename[1];
-                        moduledefinition.AssemblyName = assembly.FullName.Split(",")[0];
+                        moduledefinition.AssemblyName = assembly.GetName().Name;
                         if (assembly.FullName.StartsWith("Oqtane.Client"))
                         {
                             moduledefinition.Version = Constants.Version;
@@ -225,8 +225,8 @@ namespace Oqtane.Repository
                     moduledefinition = moduledefinitions[index];
                     // actions
                     var modulecontrolobject = Activator.CreateInstance(modulecontroltype);
-                    string actions = (string)modulecontroltype.GetProperty("Actions").GetValue(modulecontrolobject);
+                    string actions = (string)modulecontroltype.GetProperty("Actions")?.GetValue(modulecontrolobject);
-                    if (actions != "")
+                    if (!string.IsNullOrEmpty(actions))
                     {
                         foreach (string action in actions.Split(','))
                         {

Oqtane.Server/Repository/ModuleRepository.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Text.Json;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
@@ -52,9 +51,9 @@ namespace Oqtane.Repository
             Module module = _db.Module.Find(moduleId);
             if (module != null)
             {
-                List<Permission> permissions = _permissions.GetPermissions("Module", module.ModuleId).ToList();
+                module.Permissions = _permissions.GetPermissionString("Module", module.ModuleId);
-                module.Permissions = _permissions.EncodePermissions(permissions);
             }
+
             return module;
         }
 
@@ -75,7 +74,7 @@ namespace Oqtane.Repository
                 if (module != null)
                 {
                     List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(module.SiteId).ToList();
-                    ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionName == module.ModuleDefinitionName).FirstOrDefault();
+                    ModuleDefinition moduledefinition = moduledefinitions.FirstOrDefault(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
                     if (moduledefinition != null)
                     {
                         ModuleContent modulecontent = new ModuleContent();
@@ -89,9 +88,10 @@ namespace Oqtane.Repository
                             if (moduletype != null && moduletype.GetInterface("IPortable") != null)
                             {
                                 var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
-                                modulecontent.Content = ((IPortable)moduleobject).ExportModule(module);
+                                modulecontent.Content = ((IPortable) moduleobject).ExportModule(module);
                             }
                         }
+
                         content = JsonSerializer.Serialize(modulecontent);
                     }
                 }
@@ -100,6 +100,7 @@ namespace Oqtane.Repository
             {
                 // error occurred during export
             }
+
             return content;
         }
 
@@ -124,8 +125,8 @@ namespace Oqtane.Repository
                                 if (moduletype != null && moduletype.GetInterface("IPortable") != null)
                                 {
                                     var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
-                                        ((IPortable)moduleobject).ImportModule(module, modulecontent.Content, modulecontent.Version);
+                                    ((IPortable) moduleobject).ImportModule(module, modulecontent.Content, modulecontent.Version);
-                                        success = true;
+                                    success = true;
                                 }
                             }
                         }
@@ -136,8 +137,8 @@ namespace Oqtane.Repository
             {
                 // error occurred during import
             }
+
             return success;
         }
-
     }
 }

Oqtane.Server/Repository/PageModuleRepository.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
+using Oqtane.Extensions;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -21,12 +22,12 @@ namespace Oqtane.Repository
             IEnumerable<PageModule> pagemodules = _db.PageModule
                 .Include(item => item.Module) // eager load modules
                 .Where(item => item.Module.SiteId == siteId);
-            if (pagemodules != null && pagemodules.Any())
+            if (pagemodules.Any())
             {
                 IEnumerable<Permission> permissions = _permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList();
                 foreach (PageModule pagemodule in pagemodules)
                 {
-                    pagemodule.Module.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == pagemodule.ModuleId));
+                    pagemodule.Module.Permissions = permissions.Where(item => item.EntityId == pagemodule.ModuleId).EncodePermissions();
                 }
             }
             return pagemodules;
@@ -37,16 +38,16 @@ namespace Oqtane.Repository
             IEnumerable<PageModule> pagemodules = _db.PageModule
                 .Include(item => item.Module) // eager load modules
                 .Where(item => item.PageId == pageId);
-            if (pane != "" && pagemodules != null && pagemodules.Any())
+            if (pane != "" && pagemodules.Any())
             {
                 pagemodules = pagemodules.Where(item => item.Pane == pane);
             }
-            if (pagemodules != null && pagemodules.Any())
+            if (pagemodules.Any())
             {
                 IEnumerable<Permission> permissions = _permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList();
                 foreach (PageModule pagemodule in pagemodules)
                 {
-                    pagemodule.Module.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == pagemodule.ModuleId));
+                    pagemodule.Module.Permissions = permissions.Where(item => item.EntityId == pagemodule.ModuleId).EncodePermissions();
                 }
             }
             return pagemodules;
@@ -72,8 +73,7 @@ namespace Oqtane.Repository
                 .SingleOrDefault(item => item.PageModuleId == pageModuleId);
             if (pagemodule != null)
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions("Module", pagemodule.ModuleId).ToList();
+                pagemodule.Module.Permissions = _permissions.GetPermissionString("Module", pagemodule.ModuleId);
-                pagemodule.Module.Permissions = _permissions.EncodePermissions(permissions);
             }
             return pagemodule;
         }
@@ -84,8 +84,7 @@ namespace Oqtane.Repository
                 .SingleOrDefault(item => item.PageId == pageId && item.ModuleId == moduleId);
             if (pagemodule != null)
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions("Module", pagemodule.ModuleId).ToList();
+                pagemodule.Module.Permissions = _permissions.GetPermissionString("Module", pagemodule.ModuleId);
-                pagemodule.Module.Permissions = _permissions.EncodePermissions(permissions);
             }
             return pagemodule;
         }

Oqtane.Server/Repository/PageRepository.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
+using Oqtane.Extensions;
 using Oqtane.Models;
 using Oqtane.Shared;
 
@@ -25,7 +26,7 @@ namespace Oqtane.Repository
             IEnumerable<Page> pages = _db.Page.Where(item => item.SiteId == siteId && item.UserId == null);
             foreach(Page page in pages)
             {
-                page.Permissions = _permissions.EncodePermissions(permissions.Where(item => item.EntityId == page.PageId));
+                page.Permissions = permissions.Where(item => item.EntityId == page.PageId).EncodePermissions();
             }
             return pages;
         }
@@ -51,8 +52,7 @@ namespace Oqtane.Repository
             Page page = _db.Page.Find(pageId);
             if (page != null)
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Page, page.PageId).ToList();
+                page.Permissions = _permissions.GetPermissionString(EntityNames.Page, page.PageId);
-                page.Permissions = _permissions.EncodePermissions(permissions);
             }
             return page;
         }
@@ -62,27 +62,22 @@ namespace Oqtane.Repository
             Page page = _db.Page.Find(pageId);
             if (page != null)
             {
-                Page personalized = _db.Page.Where(item => item.SiteId == page.SiteId && item.Path == page.Path && item.UserId == userId).FirstOrDefault();
+                Page personalized = _db.Page.FirstOrDefault(item => item.SiteId == page.SiteId && item.Path == page.Path && item.UserId == userId);
                 if (personalized != null)
                 {
                     page = personalized;
                 }
-                if (page != null)
+                page.Permissions = _permissions.GetPermissionString(EntityNames.Page, page.PageId);
-                {
-                    IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Page, page.PageId).ToList();
-                    page.Permissions = _permissions.EncodePermissions(permissions);
-                }
             }
             return page;
         }
 
         public Page GetPage(string path, int siteId)
         {
-            Page page = _db.Page.Where(item => item.Path == path && item.SiteId == siteId).FirstOrDefault();
+            Page page = _db.Page.FirstOrDefault(item => item.Path == path && item.SiteId == siteId);
             if (page != null)
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Page, page.PageId).ToList();
+                page.Permissions = _permissions.GetPermissionString(EntityNames.Page, page.PageId);
-                page.Permissions = _permissions.EncodePermissions(permissions);
             }
             return page;
         }

Oqtane.Server/Repository/PermissionRepository.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Text.Json;
 using Microsoft.EntityFrameworkCore;
+using Oqtane.Extensions;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -41,6 +42,22 @@ namespace Oqtane.Repository
                 .Include(item => item.Role); // eager load roles
         }
 
+        public string GetPermissionString(int siteId, string entityName)
+        {
+            return GetPermissions(siteId, entityName)?.EncodePermissions();
+        }
+
+        public string GetPermissionString(string entityName, int entityId)
+        {
+            return GetPermissions(entityName, entityId)?.EncodePermissions();
+        }
+
+        public string GetPermissionString(string entityName, int entityId, string permissionName)
+        {
+            return GetPermissions(entityName, entityId, permissionName)?.EncodePermissions();
+        }
+
+
         public Permission AddPermission(Permission permission)
         {
             _db.Permission.Add(permission);

Oqtane.Server/Security/UserPermissions.cs

@@ -19,7 +19,7 @@ namespace Oqtane.Security
 
         public bool IsAuthorized(ClaimsPrincipal user, string entityName, int entityId, string permissionName)
         {
-            return IsAuthorized(user, permissionName, _permissions.EncodePermissions(_permissions.GetPermissions(entityName, entityId, permissionName).ToList()));
+            return IsAuthorized(user, permissionName, _permissions.GetPermissionString(entityName, entityId, permissionName));
         }
 
         public bool IsAuthorized(ClaimsPrincipal user, string permissionName, string permissions)