Move permissions to its own class to avoid module to module reference

src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs

@@ -28,7 +28,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder)
                     .Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin
                         .AddClass("admin").Id("admin")
                         .Action("Index", "Admin", _routeValues)
-                        .Permission(PermissionsAdminSettings.ManageAdminSettings)
+                        .Permission(AdminPermissions.ManageAdminSettings)
                         .LocalNav()
                     )
                 )

src/OrchardCore.Modules/OrchardCore.Admin/Drivers/AdminSiteSettingsDisplayDriver.cs

@@ -31,7 +31,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, AdminSettings s
     {
         var user = _httpContextAccessor.HttpContext?.User;
 
-        if (!await _authorizationService.AuthorizeAsync(user, PermissionsAdminSettings.ManageAdminSettings))
+        if (!await _authorizationService.AuthorizeAsync(user, AdminPermissions.ManageAdminSettings))
         {
             return null;
         }
@@ -50,7 +50,7 @@ public override async Task<IDisplayResult> UpdateAsync(ISite site, AdminSettings
     {
         var user = _httpContextAccessor.HttpContext?.User;
 
-        if (!await _authorizationService.AuthorizeAsync(user, PermissionsAdminSettings.ManageAdminSettings))
+        if (!await _authorizationService.AuthorizeAsync(user, AdminPermissions.ManageAdminSettings))
         {
             return null;
         }

src/OrchardCore.Modules/OrchardCore.Admin/Permissions.cs

@@ -4,9 +4,6 @@ namespace OrchardCore.Admin;
 
 public sealed class Permissions : IPermissionProvider
 {
-    [Obsolete("This will be removed in a future release. Instead use 'AdminPermissions.AccessAdminPanel'.")]
-    public static readonly Permission AccessAdminPanel = AdminPermissions.AccessAdminPanel;
-
     private readonly IEnumerable<Permission> _allPermissions =
     [
         AdminPermissions.AccessAdminPanel,

src/OrchardCore.Modules/OrchardCore.Admin/PermissionsAdminSettings.cs

@@ -4,11 +4,9 @@ namespace OrchardCore.Admin;
 
 public sealed class PermissionsAdminSettings : IPermissionProvider
 {
-    public static readonly Permission ManageAdminSettings = new("ManageAdminSettings", "Manage Admin Settings");
-
     private readonly IEnumerable<Permission> _allPermissions =
     [
-        ManageAdminSettings,
+        AdminPermissions.ManageAdminSettings,
     ];
 
     public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>

src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs

@@ -24,7 +24,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder)
         builder
             .Add(S["Configuration"], configuration => configuration
                 .Add(S["Admin Menus"], S["Admin Menus"].PrefixPosition(), adminMenu => adminMenu
-                    .Permission(Permissions.ManageAdminMenu)
+                    .Permission(AdminMenuPermissions.ManageAdminMenu)
                     .Action("List", "Menu", "OrchardCore.AdminMenu")
                     .LocalNav()
                 )

src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/MenuController.cs

@@ -53,7 +53,7 @@ public MenuController(
 
     public async Task<IActionResult> List(ContentOptions options, PagerParameters pagerParameters)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -121,7 +121,7 @@ public ActionResult IndexFilterPOST(AdminMenuListViewModel model)
 
     public async Task<IActionResult> Create()
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -134,7 +134,7 @@ public async Task<IActionResult> Create()
     [HttpPost]
     public async Task<IActionResult> Create(AdminMenuCreateViewModel model)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -153,7 +153,7 @@ public async Task<IActionResult> Create(AdminMenuCreateViewModel model)
 
     public async Task<IActionResult> Edit(string id)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -178,7 +178,7 @@ public async Task<IActionResult> Edit(string id)
     [HttpPost]
     public async Task<IActionResult> Edit(AdminMenuEditViewModel model)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -208,7 +208,7 @@ public async Task<IActionResult> Edit(AdminMenuEditViewModel model)
     [HttpPost]
     public async Task<IActionResult> Delete(string id)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -240,7 +240,7 @@ public async Task<IActionResult> Delete(string id)
     [FormValueRequired("submit.BulkAction")]
     public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -272,7 +272,7 @@ public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<st
     [HttpPost]
     public async Task<IActionResult> Toggle(string id)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }

src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/NodeController.cs

@@ -43,7 +43,7 @@ public NodeController(
 
     public async Task<IActionResult> List(string id)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -81,7 +81,7 @@ private async Task<AdminNodeListViewModel> BuildDisplayViewModel(Models.AdminMen
 
     public async Task<IActionResult> Create(string id, string type)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -115,7 +115,7 @@ public async Task<IActionResult> Create(string id, string type)
     [HttpPost]
     public async Task<IActionResult> Create(AdminNodeEditViewModel model)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -156,7 +156,7 @@ public async Task<IActionResult> Create(AdminNodeEditViewModel model)
 
     public async Task<IActionResult> Edit(string id, string treeNodeId)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -195,7 +195,7 @@ public async Task<IActionResult> Edit(string id, string treeNodeId)
     [HttpPost]
     public async Task<IActionResult> Edit(AdminNodeEditViewModel model)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -238,7 +238,7 @@ public async Task<IActionResult> Edit(AdminNodeEditViewModel model)
     [HttpPost]
     public async Task<IActionResult> Delete(string id, string treeNodeId)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -273,7 +273,7 @@ public async Task<IActionResult> Delete(string id, string treeNodeId)
     [HttpPost]
     public async Task<IActionResult> Toggle(string id, string treeNodeId)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }
@@ -306,7 +306,7 @@ public async Task<IActionResult> Toggle(string id, string treeNodeId)
     public async Task<IActionResult> MoveNode(string treeId, string nodeToMoveId,
         string destinationNodeId, int position)
     {
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
             return Forbid();
         }

src/OrchardCore.Modules/OrchardCore.AdminMenu/Permissions.cs

@@ -5,14 +5,14 @@ namespace OrchardCore.AdminMenu;
 
 public sealed class Permissions : IPermissionProvider
 {
-    public static readonly Permission ManageAdminMenu = new("ManageAdminMenu", "Manage the admin menu");
-    public static readonly Permission ViewAdminMenuAll = new("ViewAdminMenuAll", "View Admin Menu - View All", new[] { ManageAdminMenu });
-
-    private static readonly Permission _viewAdminMenu = new("ViewAdminMenu_{0}", "View Admin Menu - {0}", new[] { ManageAdminMenu, ViewAdminMenuAll });
+    private static readonly Permission _viewAdminMenu = new("ViewAdminMenu_{0}", "View Admin Menu - {0}", new[] {
+        AdminMenuPermissions.ManageAdminMenu,
+        AdminMenuPermissions.ViewAdminMenuAll
+    });
 
     private readonly IEnumerable<Permission> _generalPermissions =
     [
-        ManageAdminMenu,
+        AdminMenuPermissions.ManageAdminMenu,
     ];
 
     private readonly IAdminMenuService _adminMenuService;
@@ -28,8 +28,8 @@ public async Task<IEnumerable<Permission>> GetPermissionsAsync()
 
         var permissions = new List<Permission>(adminMenuItems.Count + 2)
         {
-            ViewAdminMenuAll,
-            ManageAdminMenu,
+            AdminMenuPermissions.ViewAdminMenuAll,
+            AdminMenuPermissions.ManageAdminMenu,
         };
 
         foreach (var adminMenu in adminMenuItems)

src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs

@@ -18,7 +18,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder)
             .Add(S["Configuration"], configuration => configuration
                 .Add(S["GraphiQL"], S["GraphiQL"].PrefixPosition(), graphiQL => graphiQL
                     .Action("Index", "Admin", "OrchardCore.Apis.GraphQL")
-                    .Permission(CommonPermissions.ExecuteGraphQL)
+                    .Permission(GraphQLPermissions.ExecuteGraphQL)
                     .LocalNav()
                 )
             );

src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/GraphQLMiddleware.cs

@@ -60,7 +60,7 @@ public async Task InvokeAsync(HttpContext context, RequestDelegate next)
                 context.User = authenticateResult.Principal;
             }
             var authorizationService = context.RequestServices.GetService<IAuthorizationService>();
-            var authorized = await authorizationService.AuthorizeAsync(context.User, CommonPermissions.ExecuteGraphQL);
+            var authorized = await authorizationService.AuthorizeAsync(context.User, GraphQLPermissions.ExecuteGraphQL);
 
             if (authorized)
             {

src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Permissions.cs

@@ -4,16 +4,10 @@ namespace OrchardCore.Apis.GraphQL;
 
 public sealed class Permissions : IPermissionProvider
 {
-    [Obsolete("This will be removed in a future release. Instead use 'OrchardCore.Apis.GraphQL.CommonPermissions.ExecuteGraphQLMutations'.")]
-    public static readonly Permission ExecuteGraphQLMutations = CommonPermissions.ExecuteGraphQLMutations;
-
-    [Obsolete("This will be removed in a future release. Instead use 'OrchardCore.Apis.GraphQL.CommonPermissions.ExecuteGraphQL'.")]
-    public static readonly Permission ExecuteGraphQL = CommonPermissions.ExecuteGraphQL;
-
     private readonly IEnumerable<Permission> _allPermissions =
     [
-        CommonPermissions.ExecuteGraphQL,
-        CommonPermissions.ExecuteGraphQLMutations,
+        GraphQLPermissions.ExecuteGraphQL,
+        GraphQLPermissions.ExecuteGraphQLMutations,
     ];
 
     public Task<IEnumerable<Permission>> GetPermissionsAsync()
@@ -26,7 +20,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes() =>
             Name = OrchardCoreConstants.Roles.Administrator,
             Permissions =
             [
-                CommonPermissions.ExecuteGraphQLMutations,
+                GraphQLPermissions.ExecuteGraphQLMutations,
             ],
         },
     ];

src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/ValidationRules/RequiresPermissionValidationRule.cs

@@ -60,7 +60,7 @@ public async ValueTask<INodeVisitor> GetPreNodeVisitorAsync(ValidationContext va
 
     private async Task AuthorizeOperationAsync(ASTNode node, ValidationContext validationContext, GraphQLUserContext userContext, OperationType? operationType, string operationName)
     {
-        if (operationType == OperationType.Mutation && !(await _authorizationService.AuthorizeAsync(userContext.User, CommonPermissions.ExecuteGraphQLMutations)))
+        if (operationType == OperationType.Mutation && !(await _authorizationService.AuthorizeAsync(userContext.User, GraphQLPermissions.ExecuteGraphQLMutations)))
         {
             validationContext.ReportError(new ValidationError(
                 validationContext.Document.Source,

src/OrchardCore.Modules/OrchardCore.AuditTrail/Permissions.cs

@@ -4,12 +4,6 @@ namespace OrchardCore.AuditTrail;
 
 public sealed class Permissions : IPermissionProvider
 {
-    [Obsolete("This will be removed in a future release. Instead use 'OrchardCore.AuditTrail.AuditTrailPermissions.ViewAuditTrail'.")]
-    public static readonly Permission ViewAuditTrail = AuditTrailPermissions.ViewAuditTrail;
-
-    [Obsolete("This will be removed in a future release. Instead use 'OrchardCore.AuditTrail.AuditTrailPermissions.ManageAuditTrailSettings'.")]
-    public static readonly Permission ManageAuditTrailSettings = AuditTrailPermissions.ManageAuditTrailSettings;
-
     private readonly IEnumerable<Permission> _allPermissions =
     [
         AuditTrailPermissions.ViewAuditTrail,

src/OrchardCore.Modules/OrchardCore.Autoroute/Drivers/AutoroutePartDisplayDriver.cs

@@ -108,7 +108,7 @@ await context.Updater.TryUpdateModelAsync(viewModel, Prefix,
 
             var httpContext = _httpContextAccessor.HttpContext;
 
-            if (httpContext != null && await _authorizationService.AuthorizeAsync(httpContext.User, Permissions.SetHomepage))
+            if (httpContext != null && await _authorizationService.AuthorizeAsync(httpContext.User, AutoroutePermissions.SetHomepage))
             {
                 await context.Updater.TryUpdateModelAsync(model, Prefix, t => t.SetHomepage);
             }

src/OrchardCore.Modules/OrchardCore.Autoroute/Permissions.cs

@@ -4,11 +4,9 @@ namespace OrchardCore.Autoroute;
 
 public sealed class Permissions : IPermissionProvider
 {
-    public static readonly Permission SetHomepage = new("SetHomepage", "Set homepage.");
-
     private readonly IEnumerable<Permission> _allPermissions =
     [
-        SetHomepage,
+        AutoroutePermissions.SetHomepage,
     ];
 
     public Task<IEnumerable<Permission>> GetPermissionsAsync()

src/OrchardCore.Modules/OrchardCore.Autoroute/Views/AutoroutePart.Edit.cshtml

@@ -53,7 +53,7 @@
         </div>
     </div>
     @{
-        var authorized = await AuthorizationService.AuthorizeAsync(User, Permissions.SetHomepage);
+        var authorized = await AuthorizationService.AuthorizeAsync(User, AutoroutePermissions.SetHomepage);
         var showHomepageOption = Model.Settings.ShowHomepageOption && authorized;
 
         if (Model.IsHomepage)

src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs

@@ -36,14 +36,14 @@ protected override ValueTask BuildAsync(NavigationBuilder builder)
                             .AddClass("contentrequestcultureprovider")
                             .Id("contentrequestcultureprovider")
                             .Action("Index", "Admin", _providersRouteValues)
-                            .Permission(Permissions.ManageContentCulturePicker)
+                            .Permission(ContentLocalizationPermissions.ManageContentCulturePicker)
                             .LocalNav()
                         )
                         .Add(S["Content Culture Picker"], S["Content Culture Picker"].PrefixPosition(), picker => picker
                             .AddClass("contentculturepicker")
                             .Id("contentculturepicker")
                             .Action("Index", "Admin", _pickerRouteValues)
-                            .Permission(Permissions.ManageContentCulturePicker)
+                            .Permission(ContentLocalizationPermissions.ManageContentCulturePicker)
                             .LocalNav()
                         )
                     )

src/OrchardCore.Modules/OrchardCore.ContentLocalization/Controllers/AdminController.cs

@@ -47,7 +47,7 @@ public async Task<IActionResult> Localize(string contentItemId, string targetCul
             return NotFound();
         }
 
-        if (!await _authorizationService.AuthorizeAsync(User, Permissions.LocalizeContent, contentItem))
+        if (!await _authorizationService.AuthorizeAsync(User, ContentLocalizationPermissions.LocalizeContent, contentItem))
         {
             return Forbid();
         }

src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentCulturePickerSettingsDriver.cs

@@ -30,7 +30,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, ContentCultureP
     {
         var user = _httpContextAccessor.HttpContext?.User;
 
-        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
+        if (!await _authorizationService.AuthorizeAsync(user, ContentLocalizationPermissions.ManageContentCulturePicker))
         {
             return null;
         }
@@ -47,7 +47,7 @@ public override async Task<IDisplayResult> UpdateAsync(ISite site, ContentCultur
     {
         var user = _httpContextAccessor.HttpContext?.User;
 
-        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
+        if (!await _authorizationService.AuthorizeAsync(user, ContentLocalizationPermissions.ManageContentCulturePicker))
         {
             return null;
         }

src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentRequestCultureProviderSettingsDriver.cs

@@ -30,7 +30,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, ContentRequestC
     {
         var user = _httpContextAccessor.HttpContext?.User;
 
-        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
+        if (!await _authorizationService.AuthorizeAsync(user, ContentLocalizationPermissions.ManageContentCulturePicker))
         {
             return null;
         }
@@ -46,7 +46,7 @@ public override async Task<IDisplayResult> UpdateAsync(ISite site, ContentReques
     {
         var user = _httpContextAccessor.HttpContext?.User;
 
-        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
+        if (!await _authorizationService.AuthorizeAsync(user, ContentLocalizationPermissions.ManageContentCulturePicker))
         {
             return null;
         }