Merge pull request #8678 from abpframework/maliming/Permission-RequireFeature-GlobalFeatures

Add RequireFeature & GlobalFeatures to permissions.

framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureDefinitionExtensions.cs

@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System;
+using JetBrains.Annotations;
 using Volo.Abp.Authorization.Permissions;
 
 namespace Volo.Abp.GlobalFeatures
@@ -6,12 +7,12 @@ namespace Volo.Abp.GlobalFeatures
     public static class GlobalFeatureDefinitionExtensions
     {
         public static PermissionDefinition RequireGlobalFeatures(
-            this PermissionDefinition permissionDefinition, 
+            this PermissionDefinition permissionDefinition,
             params string[] globalFeatures)
         {
             return permissionDefinition.RequireGlobalFeatures(true, globalFeatures);
         }
-        
+
         public static PermissionDefinition RequireGlobalFeatures(
             [NotNull] this PermissionDefinition permissionDefinition,
             bool requiresAll,
@@ -25,5 +26,25 @@ namespace Volo.Abp.GlobalFeatures
             );
         }
 
+        public static PermissionDefinition RequireGlobalFeatures(
+            this PermissionDefinition permissionDefinition,
+            params Type[] globalFeatures)
+        {
+            return permissionDefinition.RequireGlobalFeatures(true, globalFeatures);
+        }
+
+        public static PermissionDefinition RequireGlobalFeatures(
+            [NotNull] this PermissionDefinition permissionDefinition,
+            bool requiresAll,
+            params Type[] globalFeatures)
+        {
+            Check.NotNull(permissionDefinition, nameof(permissionDefinition));
+            Check.NotNullOrEmpty(globalFeatures, nameof(globalFeatures));
+
+            return permissionDefinition.AddStateProviders(
+                new RequireGlobalFeaturesPermissionStateProvider(requiresAll, globalFeatures)
+            );
+        }
+
     }
 }

framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/RequireGlobalFeaturesPermissionStateProvider.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp.Authorization.Permissions;
 
@@ -13,7 +14,7 @@ namespace Volo.Abp.GlobalFeatures
             : this(true, globalFeatureNames)
         {
         }
-        
+
         public RequireGlobalFeaturesPermissionStateProvider(bool requiresAll, params string[] globalFeatureNames)
         {
             Check.NotNullOrEmpty(globalFeatureNames, nameof(globalFeatureNames));
@@ -22,12 +23,20 @@ namespace Volo.Abp.GlobalFeatures
             _globalFeatureNames = globalFeatureNames;
         }
 
+        public RequireGlobalFeaturesPermissionStateProvider(bool requiresAll, params Type[] globalFeatureNames)
+        {
+            Check.NotNullOrEmpty(globalFeatureNames, nameof(globalFeatureNames));
+
+            _requiresAll = requiresAll;
+            _globalFeatureNames = globalFeatureNames.Select(GlobalFeatureNameAttribute.GetName).ToArray();
+        }
+
         public Task<bool> IsEnabledAsync(PermissionStateContext context)
         {
             bool isEnabled = _requiresAll
                 ? _globalFeatureNames.All(x => GlobalFeatureManager.Instance.IsEnabled(x))
                 : _globalFeatureNames.Any(x => GlobalFeatureManager.Instance.IsEnabled(x));
-            
+
             return Task.FromResult(isEnabled);
         }
     }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs

@@ -13,41 +13,48 @@ namespace Volo.CmsKit.Permissions
         {
             var cmsGroup = context.GetGroupOrNull(CmsKitAdminPermissions.GroupName) ?? context.AddGroup(CmsKitAdminPermissions.GroupName, L("Permission:CmsKit"));
 
-            if (GlobalFeatureManager.Instance.IsEnabled<CommentsFeature>())
+            var contentGroup = cmsGroup.AddPermission(CmsKitAdminPermissions.Comments.Default, L("Permission:Comments"))
-            {
+                .RequireGlobalFeatures(typeof(CommentsFeature));
-                var contentGroup = cmsGroup.AddPermission(CmsKitAdminPermissions.Comments.Default, L("Permission:Comments"));
+            contentGroup.AddChild(CmsKitAdminPermissions.Comments.Delete, L("Permission:Comments.Delete"))
-                contentGroup.AddChild(CmsKitAdminPermissions.Comments.Delete, L("Permission:Comments.Delete"));
+                .RequireGlobalFeatures(typeof(CommentsFeature));
-            }
-            
-            if (GlobalFeatureManager.Instance.IsEnabled<TagsFeature>())
-            {
-                var tagGroup = cmsGroup.AddPermission(CmsKitAdminPermissions.Tags.Default, L("Permission:TagManagement"));
-                tagGroup.AddChild(CmsKitAdminPermissions.Tags.Create, L("Permission:TagManagement.Create"));
-                tagGroup.AddChild(CmsKitAdminPermissions.Tags.Update, L("Permission:TagManagement.Update"));
-                tagGroup.AddChild(CmsKitAdminPermissions.Tags.Delete, L("Permission:TagManagement.Delete"));
-            }
 
-            if (GlobalFeatureManager.Instance.IsEnabled<PagesFeature>())
+            var tagGroup = cmsGroup.AddPermission(CmsKitAdminPermissions.Tags.Default, L("Permission:TagManagement"))
-            {
+                .RequireGlobalFeatures(typeof(TagsFeature));
-                var pageManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.Pages.Default, L("Permission:PageManagement"));
+            tagGroup.AddChild(CmsKitAdminPermissions.Tags.Create, L("Permission:TagManagement.Create"))
-                pageManagement.AddChild(CmsKitAdminPermissions.Pages.Create, L("Permission:PageManagement:Create"));
+                .RequireGlobalFeatures(typeof(TagsFeature));
-                pageManagement.AddChild(CmsKitAdminPermissions.Pages.Update, L("Permission:PageManagement:Update"));
+            tagGroup.AddChild(CmsKitAdminPermissions.Tags.Update, L("Permission:TagManagement.Update"))
-                pageManagement.AddChild(CmsKitAdminPermissions.Pages.Delete, L("Permission:PageManagement:Delete"));
+                .RequireGlobalFeatures(typeof(TagsFeature));
-            }
+            tagGroup.AddChild(CmsKitAdminPermissions.Tags.Delete, L("Permission:TagManagement.Delete"))
+                .RequireGlobalFeatures(typeof(TagsFeature));
 
-            if (GlobalFeatureManager.Instance.IsEnabled<BlogsFeature>())
+            var pageManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.Pages.Default, L("Permission:PageManagement"))
-            {
+                .RequireGlobalFeatures(typeof(PagesFeature));
-                var blogManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.Blogs.Default, L("Permission:BlogManagement"));
+            pageManagement.AddChild(CmsKitAdminPermissions.Pages.Create, L("Permission:PageManagement:Create"))
-                blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Create, L("Permission:BlogManagement.Create"));
+                .RequireGlobalFeatures(typeof(PagesFeature));
-                blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Update, L("Permission:BlogManagement.Update"));
+            pageManagement.AddChild(CmsKitAdminPermissions.Pages.Update, L("Permission:PageManagement:Update"))
-                blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Delete, L("Permission:BlogManagement.Delete"));
+                .RequireGlobalFeatures(typeof(PagesFeature));
-                blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Features, L("Permission:BlogManagement.Features"));
+            pageManagement.AddChild(CmsKitAdminPermissions.Pages.Delete, L("Permission:PageManagement:Delete"))
+                .RequireGlobalFeatures(typeof(PagesFeature));
 
-                var blogPostManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.BlogPosts.Default, L("Permission:BlogPostManagement"));
+            var blogManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.Blogs.Default, L("Permission:BlogManagement"))
-                blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Create, L("Permission:BlogPostManagement.Create"));
+                .RequireGlobalFeatures(typeof(BlogsFeature));
-                blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Update, L("Permission:BlogPostManagement.Update"));
+            blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Create, L("Permission:BlogManagement.Create"))
-                blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Delete, L("Permission:BlogPostManagement.Delete"));
+                .RequireGlobalFeatures(typeof(BlogsFeature));
-            }
+            blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Update, L("Permission:BlogManagement.Update"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+            blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Delete, L("Permission:BlogManagement.Delete"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+            blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Features, L("Permission:BlogManagement.Features"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+
+            var blogPostManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.BlogPosts.Default, L("Permission:BlogPostManagement"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+            blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Create, L("Permission:BlogPostManagement.Create"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+            blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Update, L("Permission:BlogPostManagement.Update"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
+            blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Delete, L("Permission:BlogPostManagement.Delete"))
+                .RequireGlobalFeatures(typeof(BlogsFeature));
         }
 
         private static LocalizableString L(string name)