Renamed IPermissionService to IPermissionDefinitionService

GerardSmit · GerardSmit · commit 397ffaf04dac · 2023-10-17T23:24:11.000+02:00
diff --git a/DNN Platform/DotNetNuke.Abstractions/Security/Permissions/IPermissionDefinitionService.cs b/DNN Platform/DotNetNuke.Abstractions/Security/Permissions/IPermissionDefinitionService.cs
@@ -7,7 +7,7 @@ namespace DotNetNuke.Abstractions.Security.Permissions;
 using System.Collections.Generic;
 
 /// <summary>Handles the Business Control Layer for Permissions.</summary>
-public interface IPermissionService
+public interface IPermissionDefinitionService
 {
     /// <summary>Gets the permissions.</summary>
     /// <returns>The permissions.</returns>
diff --git a/DNN Platform/Library/Security/Permissions/PermissionController.cs b/DNN Platform/Library/Security/Permissions/PermissionController.cs
@@ -20,7 +20,7 @@ namespace DotNetNuke.Security.Permissions
     using DotNetNuke.Security.Roles;
     using DotNetNuke.Services.Log.EventLog;
 
-    public partial class PermissionController : IPermissionService
+    public partial class PermissionController : IPermissionDefinitionService
     {
         private static readonly DataProvider Provider = DataProvider.Instance();
 
@@ -69,34 +69,34 @@ public static string BuildPermissions(IList permissions, string permissionKey)
             return permissionsString;
         }
 
-        /// <inheritdoc cref="IPermissionService.GetDefinitionsByFolder" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionService)}.{nameof(IPermissionService.GetDefinitionsByFolder)} instead.")]
+        /// <inheritdoc cref="IPermissionDefinitionService.GetDefinitionsByFolder" />
+        [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionDefinitionService)}.{nameof(IPermissionDefinitionService.GetDefinitionsByFolder)} instead.")]
         public static partial ArrayList GetPermissionsByFolder()
         {
             return new ArrayList(GetPermissionsByFolderEnumerable().ToArray());
         }
 
-        /// <inheritdoc cref="IPermissionService.GetDefinitionsByPortalDesktopModule" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionService)}.{nameof(IPermissionService.GetDefinitionsByPortalDesktopModule)} instead.")]
+        /// <inheritdoc cref="IPermissionDefinitionService.GetDefinitionsByPortalDesktopModule" />
+        [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionDefinitionService)}.{nameof(IPermissionDefinitionService.GetDefinitionsByPortalDesktopModule)} instead.")]
         public static partial ArrayList GetPermissionsByPortalDesktopModule()
         {
             return new ArrayList(GetPermissionsByPortalDesktopModuleEnumerable().ToArray());
         }
 
-        /// <inheritdoc cref="IPermissionService.GetDefinitionsByTab" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionService)}.{nameof(IPermissionService.GetDefinitionsByTab)} instead.")]
+        /// <inheritdoc cref="IPermissionDefinitionService.GetDefinitionsByTab" />
+        [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionDefinitionService)}.{nameof(IPermissionDefinitionService.GetDefinitionsByTab)} instead.")]
         public static partial ArrayList GetPermissionsByTab()
         {
             return new ArrayList(GetPermissionsByTabEnumerable().ToArray());
         }
 
-        /// <inheritdoc cref="IPermissionService.AddDefinition" />
+        /// <inheritdoc cref="IPermissionDefinitionService.AddDefinition" />
         public int AddPermission(PermissionInfo permission)
         {
             return this.AddPermission((IPermissionDefinitionInfo)permission);
         }
 
-        /// <inheritdoc cref="IPermissionService.AddDefinition" />
+        /// <inheritdoc cref="IPermissionDefinitionService.AddDefinition" />
         public int AddPermission(IPermissionDefinitionInfo permission)
         {
             EventLogController.Instance.AddLog(permission, PortalController.Instance.GetCurrentPortalSettings(), UserController.Instance.GetCurrentUserInfo().UserID, string.Empty, EventLogController.EventLogType.PERMISSION_CREATED);
@@ -111,7 +111,7 @@ public int AddPermission(IPermissionDefinitionInfo permission)
             return permissionId;
         }
 
-        /// <inheritdoc cref="IPermissionService.DeleteDefinition" />
+        /// <inheritdoc cref="IPermissionDefinitionService.DeleteDefinition" />
         public void DeletePermission(int permissionID)
         {
             EventLogController.Instance.AddLog(
@@ -124,40 +124,40 @@ public void DeletePermission(int permissionID)
             this.ClearCache();
         }
 
-        /// <inheritdoc cref="IPermissionService.GetDefinition" />
+        /// <inheritdoc cref="IPermissionDefinitionService.GetDefinition" />
         public PermissionInfo GetPermission(int permissionID)
         {
             return GetPermissions().SingleOrDefault(p => p.PermissionID == permissionID);
         }
 
-        /// <inheritdoc cref="IPermissionService.GetDefinitionsByCodeAndKey" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionService)}.{nameof(IPermissionService.GetDefinitionsByCodeAndKey)} instead.")]
+        /// <inheritdoc cref="IPermissionDefinitionService.GetDefinitionsByCodeAndKey" />
+        [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionDefinitionService)}.{nameof(IPermissionDefinitionService.GetDefinitionsByCodeAndKey)} instead.")]
         public partial ArrayList GetPermissionByCodeAndKey(string permissionCode, string permissionKey)
         {
             return new ArrayList(GetPermissionByCodeAndKeyEnumerable(permissionCode, permissionKey).ToArray());
         }
 
-        /// <inheritdoc cref="IPermissionService.GetDefinitionsByModuleDefId" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionService)}.{nameof(IPermissionService.GetDefinitionsByModuleDefId)} instead.")]
+        /// <inheritdoc cref="IPermissionDefinitionService.GetDefinitionsByModuleDefId" />
+        [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionDefinitionService)}.{nameof(IPermissionDefinitionService.GetDefinitionsByModuleDefId)} instead.")]
         public partial ArrayList GetPermissionsByModuleDefID(int moduleDefID)
         {
             return new ArrayList(GetPermissionsByModuleDefIdEnumerable(moduleDefID).ToArray());
         }
 
-        /// <inheritdoc cref="IPermissionService.GetDefinitionsByModule" />
-        [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionService)}.{nameof(IPermissionService.GetDefinitionsByModule)} instead.")]
+        /// <inheritdoc cref="IPermissionDefinitionService.GetDefinitionsByModule" />
+        [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionDefinitionService)}.{nameof(IPermissionDefinitionService.GetDefinitionsByModule)} instead.")]
         public partial ArrayList GetPermissionsByModule(int moduleId, int tabId)
         {
             return new ArrayList(GetPermissionsByModuleEnumerable(moduleId, tabId).ToArray());
         }
 
-        /// <inheritdoc cref="IPermissionService.UpdateDefinition" />
+        /// <inheritdoc cref="IPermissionDefinitionService.UpdateDefinition" />
         public void UpdatePermission(PermissionInfo permission)
         {
             this.UpdatePermission((IPermissionDefinitionInfo)permission);
         }
 
-        /// <inheritdoc cref="IPermissionService.UpdateDefinition" />
+        /// <inheritdoc cref="IPermissionDefinitionService.UpdateDefinition" />
         public void UpdatePermission(IPermissionDefinitionInfo permission)
         {
             EventLogController.Instance.AddLog(permission, PortalController.Instance.GetCurrentPortalSettings(), UserController.Instance.GetCurrentUserInfo().UserID, string.Empty, EventLogController.EventLogType.PERMISSION_UPDATED);
@@ -233,40 +233,40 @@ public T RemapPermission<T>(T permission, int portalId)
         }
 
         /// <inheritdoc />
-        IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitions() => GetPermissions();
+        IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitions() => GetPermissions();
 
         /// <inheritdoc />
-        IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitionsByFolder() => GetPermissionsByFolderEnumerable();
+        IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitionsByFolder() => GetPermissionsByFolderEnumerable();
 
         /// <inheritdoc />
-        IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitionsByPortalDesktopModule() => GetPermissionsByPortalDesktopModuleEnumerable();
+        IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitionsByPortalDesktopModule() => GetPermissionsByPortalDesktopModuleEnumerable();
 
         /// <inheritdoc />
-        IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitionsByTab() => GetPermissionsByTabEnumerable();
+        IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitionsByTab() => GetPermissionsByTabEnumerable();
 
         /// <inheritdoc />
-        IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitionsByCodeAndKey(string permissionCode, string permissionKey) => GetPermissionByCodeAndKeyEnumerable(permissionCode, permissionKey);
+        IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitionsByCodeAndKey(string permissionCode, string permissionKey) => GetPermissionByCodeAndKeyEnumerable(permissionCode, permissionKey);
 
         /// <inheritdoc />
-        IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitionsByModuleDefId(int moduleDefId) => GetPermissionsByModuleDefIdEnumerable(moduleDefId);
+        IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitionsByModuleDefId(int moduleDefId) => GetPermissionsByModuleDefIdEnumerable(moduleDefId);
 
         /// <inheritdoc />
-        IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitionsByModule(int moduleId, int tabId) => GetPermissionsByModuleEnumerable(moduleId, tabId);
+        IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitionsByModule(int moduleId, int tabId) => GetPermissionsByModuleEnumerable(moduleId, tabId);
 
         /// <inheritdoc />
-        int IPermissionService.AddDefinition(IPermissionDefinitionInfo permission) => this.AddPermission(permission);
+        int IPermissionDefinitionService.AddDefinition(IPermissionDefinitionInfo permission) => this.AddPermission(permission);
 
         /// <inheritdoc />
-        void IPermissionService.DeleteDefinition(IPermissionDefinitionInfo permission) => this.DeletePermission(permission.PermissionId);
+        void IPermissionDefinitionService.DeleteDefinition(IPermissionDefinitionInfo permission) => this.DeletePermission(permission.PermissionId);
 
         /// <inheritdoc />
-        IPermissionDefinitionInfo IPermissionService.GetDefinition(int permissionDefinitionId) => this.GetPermission(permissionDefinitionId);
+        IPermissionDefinitionInfo IPermissionDefinitionService.GetDefinition(int permissionDefinitionId) => this.GetPermission(permissionDefinitionId);
 
         /// <inheritdoc />
-        void IPermissionService.UpdateDefinition(IPermissionDefinitionInfo permission) => this.UpdatePermission(permission);
+        void IPermissionDefinitionService.UpdateDefinition(IPermissionDefinitionInfo permission) => this.UpdatePermission(permission);
 
         /// <inheritdoc />
-        void IPermissionService.ClearCache() => this.ClearCache();
+        void IPermissionDefinitionService.ClearCache() => this.ClearCache();
 
         private static IEnumerable<PermissionInfo> GetPermissions()
         {
diff --git a/DNN Platform/Library/Startup.cs b/DNN Platform/Library/Startup.cs
@@ -71,7 +71,7 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddScoped<IPortalAliasService, PortalAliasController>();
 
-            services.AddScoped<IPermissionService, PermissionController>();
+            services.AddScoped<IPermissionDefinitionService, PermissionController>();
 
             services.AddTransient<IFileSystemUtils, FileSystemUtilsProvider>();
             services.AddTransient<ISmtpOAuthController, SmtpOAuthController>();
diff --git a/DNN Platform/Modules/ResourceManager/Components/PermissionHelper.cs b/DNN Platform/Modules/ResourceManager/Components/PermissionHelper.cs
@@ -202,17 +202,17 @@ public static IEnumerable<FolderPermissionInfo> AsFolderPermissions(this IEnumer
         }
 
         /// <summary>Get the permissions for a folder.</summary>
-        /// <param name="permissionService">The permission service.</param>
+        /// <param name="permissionDefinitionService">The permission service.</param>
         /// <param name="collection">The collection of <see cref="FolderPermissionInfo"/>.</param>
         /// <returns>A <see cref="Permissions"/> dto.</returns>
         public static Permissions GetFolderPermissions(
-            this IPermissionService permissionService,
+            this IPermissionDefinitionService permissionDefinitionService,
             FolderPermissionCollection collection)
         {
             var permissions = new Permissions();
 
             // Load the definitions
-            foreach (var definition in permissionService.GetDefinitionsByFolder())
+            foreach (var definition in permissionDefinitionService.GetDefinitionsByFolder())
             {
                 var definitionDto = new Permission
                 {
diff --git a/DNN Platform/Modules/ResourceManager/Services/ItemsController.cs b/DNN Platform/Modules/ResourceManager/Services/ItemsController.cs
@@ -46,20 +46,20 @@ public class ItemsController : DnnApiController
         private readonly IModuleControlPipeline modulePipeline;
         private readonly IApplicationStatusInfo applicationStatusInfo;
         private readonly Hashtable mappedPathsSupported = new Hashtable();
-        private readonly IPermissionService permissionService;
+        private readonly IPermissionDefinitionService permissionDefinitionService;
 
         /// <summary>Initializes a new instance of the <see cref="ItemsController"/> class.</summary>
         /// <param name="modulePipeline">An instance of an <see cref="IModuleControlPipeline"/> used to hook into the EditUrl of the webforms folders provider settings UI.</param>
         /// <param name="applicationStatusInfo">The application status info.</param>
-        /// <param name="permissionService">The permission service.</param>
+        /// <param name="permissionDefinitionService">The permission service.</param>
         public ItemsController(
             IModuleControlPipeline modulePipeline,
             IApplicationStatusInfo applicationStatusInfo,
-            IPermissionService permissionService)
+            IPermissionDefinitionService permissionDefinitionService)
         {
             this.modulePipeline = modulePipeline;
             this.applicationStatusInfo = applicationStatusInfo;
-            this.permissionService = permissionService;
+            this.permissionDefinitionService = permissionDefinitionService;
         }
 
         /// <summary>Gets the content for a specific folder.</summary>
@@ -449,7 +449,7 @@ public HttpResponseMessage GetFolderDetails(int folderId)
                 lastModifiedBy = lastModifiedBy != null ? lastModifiedBy.Username : string.Empty,
                 type = FolderMappingController.Instance.GetFolderMapping(folder.FolderMappingID).MappingName,
                 isVersioned = folder.IsVersioned,
-                permissions = this.permissionService.GetFolderPermissions(folder.FolderPermissions),
+                permissions = this.permissionDefinitionService.GetFolderPermissions(folder.FolderPermissions),
             });
         }
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace DotNetNuke.Abstractions.Security.Permissions;`
`7`	`7`	`using System.Collections.Generic;`
`8`	`8`
`9`	`9`	`/// <summary>Handles the Business Control Layer for Permissions.</summary>`
`10`		`-public interface IPermissionService`
	`10`	`+public interface IPermissionDefinitionService`
`11`	`11`	`{`
`12`	`12`	`/// <summary>Gets the permissions.</summary>`
`13`	`13`	`/// <returns>The permissions.</returns>`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ namespace DotNetNuke.Security.Permissions`
`20`	`20`	`using DotNetNuke.Security.Roles;`
`21`	`21`	`using DotNetNuke.Services.Log.EventLog;`
`22`	`22`
`23`		`- public partial class PermissionController : IPermissionService`
	`23`	`+ public partial class PermissionController : IPermissionDefinitionService`
`24`	`24`	`{`
`25`	`25`	`private static readonly DataProvider Provider = DataProvider.Instance();`
`26`	`26`
`@@ -69,34 +69,34 @@ public static string BuildPermissions(IList permissions, string permissionKey)`
`69`	`69`	`return permissionsString;`
`70`	`70`	`}`
`71`	`71`
`72`		`- /// <inheritdoc cref="IPermissionService.GetDefinitionsByFolder" />`
`73`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionService)}.{nameof(IPermissionService.GetDefinitionsByFolder)} instead.")]`
	`72`	`+ /// <inheritdoc cref="IPermissionDefinitionService.GetDefinitionsByFolder" />`
	`73`	`+ [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionDefinitionService)}.{nameof(IPermissionDefinitionService.GetDefinitionsByFolder)} instead.")]`
`74`	`74`	`public static partial ArrayList GetPermissionsByFolder()`
`75`	`75`	`{`
`76`	`76`	`return new ArrayList(GetPermissionsByFolderEnumerable().ToArray());`
`77`	`77`	`}`
`78`	`78`
`79`		`- /// <inheritdoc cref="IPermissionService.GetDefinitionsByPortalDesktopModule" />`
`80`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionService)}.{nameof(IPermissionService.GetDefinitionsByPortalDesktopModule)} instead.")]`
	`79`	`+ /// <inheritdoc cref="IPermissionDefinitionService.GetDefinitionsByPortalDesktopModule" />`
	`80`	`+ [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionDefinitionService)}.{nameof(IPermissionDefinitionService.GetDefinitionsByPortalDesktopModule)} instead.")]`
`81`	`81`	`public static partial ArrayList GetPermissionsByPortalDesktopModule()`
`82`	`82`	`{`
`83`	`83`	`return new ArrayList(GetPermissionsByPortalDesktopModuleEnumerable().ToArray());`
`84`	`84`	`}`
`85`	`85`
`86`		`- /// <inheritdoc cref="IPermissionService.GetDefinitionsByTab" />`
`87`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionService)}.{nameof(IPermissionService.GetDefinitionsByTab)} instead.")]`
	`86`	`+ /// <inheritdoc cref="IPermissionDefinitionService.GetDefinitionsByTab" />`
	`87`	`+ [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionDefinitionService)}.{nameof(IPermissionDefinitionService.GetDefinitionsByTab)} instead.")]`
`88`	`88`	`public static partial ArrayList GetPermissionsByTab()`
`89`	`89`	`{`
`90`	`90`	`return new ArrayList(GetPermissionsByTabEnumerable().ToArray());`
`91`	`91`	`}`
`92`	`92`
`93`		`- /// <inheritdoc cref="IPermissionService.AddDefinition" />`
	`93`	`+ /// <inheritdoc cref="IPermissionDefinitionService.AddDefinition" />`
`94`	`94`	`public int AddPermission(PermissionInfo permission)`
`95`	`95`	`{`
`96`	`96`	`return this.AddPermission((IPermissionDefinitionInfo)permission);`
`97`	`97`	`}`
`98`	`98`
`99`		`- /// <inheritdoc cref="IPermissionService.AddDefinition" />`
	`99`	`+ /// <inheritdoc cref="IPermissionDefinitionService.AddDefinition" />`
`100`	`100`	`public int AddPermission(IPermissionDefinitionInfo permission)`
`101`	`101`	`{`
`102`	`102`	`EventLogController.Instance.AddLog(permission, PortalController.Instance.GetCurrentPortalSettings(), UserController.Instance.GetCurrentUserInfo().UserID, string.Empty, EventLogController.EventLogType.PERMISSION_CREATED);`
`@@ -111,7 +111,7 @@ public int AddPermission(IPermissionDefinitionInfo permission)`
`111`	`111`	`return permissionId;`
`112`	`112`	`}`
`113`	`113`
`114`		`- /// <inheritdoc cref="IPermissionService.DeleteDefinition" />`
	`114`	`+ /// <inheritdoc cref="IPermissionDefinitionService.DeleteDefinition" />`
`115`	`115`	`public void DeletePermission(int permissionID)`
`116`	`116`	`{`
`117`	`117`	`EventLogController.Instance.AddLog(`
`@@ -124,40 +124,40 @@ public void DeletePermission(int permissionID)`
`124`	`124`	`this.ClearCache();`
`125`	`125`	`}`
`126`	`126`
`127`		`- /// <inheritdoc cref="IPermissionService.GetDefinition" />`
	`127`	`+ /// <inheritdoc cref="IPermissionDefinitionService.GetDefinition" />`
`128`	`128`	`public PermissionInfo GetPermission(int permissionID)`
`129`	`129`	`{`
`130`	`130`	`return GetPermissions().SingleOrDefault(p => p.PermissionID == permissionID);`
`131`	`131`	`}`
`132`	`132`
`133`		`- /// <inheritdoc cref="IPermissionService.GetDefinitionsByCodeAndKey" />`
`134`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionService)}.{nameof(IPermissionService.GetDefinitionsByCodeAndKey)} instead.")]`
	`133`	`+ /// <inheritdoc cref="IPermissionDefinitionService.GetDefinitionsByCodeAndKey" />`
	`134`	`+ [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionDefinitionService)}.{nameof(IPermissionDefinitionService.GetDefinitionsByCodeAndKey)} instead.")]`
`135`	`135`	`public partial ArrayList GetPermissionByCodeAndKey(string permissionCode, string permissionKey)`
`136`	`136`	`{`
`137`	`137`	`return new ArrayList(GetPermissionByCodeAndKeyEnumerable(permissionCode, permissionKey).ToArray());`
`138`	`138`	`}`
`139`	`139`
`140`		`- /// <inheritdoc cref="IPermissionService.GetDefinitionsByModuleDefId" />`
`141`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionService)}.{nameof(IPermissionService.GetDefinitionsByModuleDefId)} instead.")]`
	`140`	`+ /// <inheritdoc cref="IPermissionDefinitionService.GetDefinitionsByModuleDefId" />`
	`141`	`+ [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionDefinitionService)}.{nameof(IPermissionDefinitionService.GetDefinitionsByModuleDefId)} instead.")]`
`142`	`142`	`public partial ArrayList GetPermissionsByModuleDefID(int moduleDefID)`
`143`	`143`	`{`
`144`	`144`	`return new ArrayList(GetPermissionsByModuleDefIdEnumerable(moduleDefID).ToArray());`
`145`	`145`	`}`
`146`	`146`
`147`		`- /// <inheritdoc cref="IPermissionService.GetDefinitionsByModule" />`
`148`		`- [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionService)}.{nameof(IPermissionService.GetDefinitionsByModule)} instead.")]`
	`147`	`+ /// <inheritdoc cref="IPermissionDefinitionService.GetDefinitionsByModule" />`
	`148`	`+ [DnnDeprecated(10, 0, 0, $"Use {nameof(IPermissionDefinitionService)}.{nameof(IPermissionDefinitionService.GetDefinitionsByModule)} instead.")]`
`149`	`149`	`public partial ArrayList GetPermissionsByModule(int moduleId, int tabId)`
`150`	`150`	`{`
`151`	`151`	`return new ArrayList(GetPermissionsByModuleEnumerable(moduleId, tabId).ToArray());`
`152`	`152`	`}`
`153`	`153`
`154`		`- /// <inheritdoc cref="IPermissionService.UpdateDefinition" />`
	`154`	`+ /// <inheritdoc cref="IPermissionDefinitionService.UpdateDefinition" />`
`155`	`155`	`public void UpdatePermission(PermissionInfo permission)`
`156`	`156`	`{`
`157`	`157`	`this.UpdatePermission((IPermissionDefinitionInfo)permission);`
`158`	`158`	`}`
`159`	`159`
`160`		`- /// <inheritdoc cref="IPermissionService.UpdateDefinition" />`
	`160`	`+ /// <inheritdoc cref="IPermissionDefinitionService.UpdateDefinition" />`
`161`	`161`	`public void UpdatePermission(IPermissionDefinitionInfo permission)`
`162`	`162`	`{`
`163`	`163`	`EventLogController.Instance.AddLog(permission, PortalController.Instance.GetCurrentPortalSettings(), UserController.Instance.GetCurrentUserInfo().UserID, string.Empty, EventLogController.EventLogType.PERMISSION_UPDATED);`
`@@ -233,40 +233,40 @@ public T RemapPermission<T>(T permission, int portalId)`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`/// <inheritdoc />`
`236`		`- IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitions() => GetPermissions();`
	`236`	`+ IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitions() => GetPermissions();`
`237`	`237`
`238`	`238`	`/// <inheritdoc />`
`239`		`- IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitionsByFolder() => GetPermissionsByFolderEnumerable();`
	`239`	`+ IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitionsByFolder() => GetPermissionsByFolderEnumerable();`
`240`	`240`
`241`	`241`	`/// <inheritdoc />`
`242`		`- IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitionsByPortalDesktopModule() => GetPermissionsByPortalDesktopModuleEnumerable();`
	`242`	`+ IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitionsByPortalDesktopModule() => GetPermissionsByPortalDesktopModuleEnumerable();`
`243`	`243`
`244`	`244`	`/// <inheritdoc />`
`245`		`- IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitionsByTab() => GetPermissionsByTabEnumerable();`
	`245`	`+ IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitionsByTab() => GetPermissionsByTabEnumerable();`
`246`	`246`
`247`	`247`	`/// <inheritdoc />`
`248`		`- IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitionsByCodeAndKey(string permissionCode, string permissionKey) => GetPermissionByCodeAndKeyEnumerable(permissionCode, permissionKey);`
	`248`	`+ IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitionsByCodeAndKey(string permissionCode, string permissionKey) => GetPermissionByCodeAndKeyEnumerable(permissionCode, permissionKey);`
`249`	`249`
`250`	`250`	`/// <inheritdoc />`
`251`		`- IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitionsByModuleDefId(int moduleDefId) => GetPermissionsByModuleDefIdEnumerable(moduleDefId);`
	`251`	`+ IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitionsByModuleDefId(int moduleDefId) => GetPermissionsByModuleDefIdEnumerable(moduleDefId);`
`252`	`252`
`253`	`253`	`/// <inheritdoc />`
`254`		`- IEnumerable<IPermissionDefinitionInfo> IPermissionService.GetDefinitionsByModule(int moduleId, int tabId) => GetPermissionsByModuleEnumerable(moduleId, tabId);`
	`254`	`+ IEnumerable<IPermissionDefinitionInfo> IPermissionDefinitionService.GetDefinitionsByModule(int moduleId, int tabId) => GetPermissionsByModuleEnumerable(moduleId, tabId);`
`255`	`255`
`256`	`256`	`/// <inheritdoc />`
`257`		`- int IPermissionService.AddDefinition(IPermissionDefinitionInfo permission) => this.AddPermission(permission);`
	`257`	`+ int IPermissionDefinitionService.AddDefinition(IPermissionDefinitionInfo permission) => this.AddPermission(permission);`
`258`	`258`
`259`	`259`	`/// <inheritdoc />`
`260`		`- void IPermissionService.DeleteDefinition(IPermissionDefinitionInfo permission) => this.DeletePermission(permission.PermissionId);`
	`260`	`+ void IPermissionDefinitionService.DeleteDefinition(IPermissionDefinitionInfo permission) => this.DeletePermission(permission.PermissionId);`
`261`	`261`
`262`	`262`	`/// <inheritdoc />`
`263`		`- IPermissionDefinitionInfo IPermissionService.GetDefinition(int permissionDefinitionId) => this.GetPermission(permissionDefinitionId);`
	`263`	`+ IPermissionDefinitionInfo IPermissionDefinitionService.GetDefinition(int permissionDefinitionId) => this.GetPermission(permissionDefinitionId);`
`264`	`264`
`265`	`265`	`/// <inheritdoc />`
`266`		`- void IPermissionService.UpdateDefinition(IPermissionDefinitionInfo permission) => this.UpdatePermission(permission);`
	`266`	`+ void IPermissionDefinitionService.UpdateDefinition(IPermissionDefinitionInfo permission) => this.UpdatePermission(permission);`
`267`	`267`
`268`	`268`	`/// <inheritdoc />`
`269`		`- void IPermissionService.ClearCache() => this.ClearCache();`
	`269`	`+ void IPermissionDefinitionService.ClearCache() => this.ClearCache();`
`270`	`270`
`271`	`271`	`private static IEnumerable<PermissionInfo> GetPermissions()`
`272`	`272`	`{`
Original file line number	Diff line number	Diff line change
`@@ -202,17 +202,17 @@ public static IEnumerable<FolderPermissionInfo> AsFolderPermissions(this IEnumer`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`/// <summary>Get the permissions for a folder.</summary>`
`205`		`- /// <param name="permissionService">The permission service.</param>`
	`205`	`+ /// <param name="permissionDefinitionService">The permission service.</param>`
`206`	`206`	`/// <param name="collection">The collection of <see cref="FolderPermissionInfo"/>.</param>`
`207`	`207`	`/// <returns>A <see cref="Permissions"/> dto.</returns>`
`208`	`208`	`public static Permissions GetFolderPermissions(`
`209`		`- this IPermissionService permissionService,`
	`209`	`+ this IPermissionDefinitionService permissionDefinitionService,`
`210`	`210`	`FolderPermissionCollection collection)`
`211`	`211`	`{`
`212`	`212`	`var permissions = new Permissions();`
`213`	`213`
`214`	`214`	`// Load the definitions`
`215`		`- foreach (var definition in permissionService.GetDefinitionsByFolder())`
	`215`	`+ foreach (var definition in permissionDefinitionService.GetDefinitionsByFolder())`
`216`	`216`	`{`
`217`	`217`	`var definitionDto = new Permission`
`218`	`218`	`{`