Merge pull request #8131 from abpframework/maliming/patch-1

Enhanced global features interceptor

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

@@ -0,0 +1,23 @@
+using System;
+using Volo.Abp.ExceptionHandling;
+
+namespace Volo.Abp.GlobalFeatures
+{
+    [Serializable]
+    public class AbpGlobalFeatureNotEnabledException : AbpException, IHasErrorCode
+    {
+        public string Code { get; }
+
+        public AbpGlobalFeatureNotEnabledException(string message = null, string code = null, Exception innerException = null)
+            : base(message, innerException)
+        {
+            Code = code;
+        }
+
+        public AbpGlobalFeatureNotEnabledException WithData(string name, object value)
+        {
+            Data[name] = value;
+            return this;
+        }
+    }
+}

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

@@ -5,9 +5,9 @@ namespace Volo.Abp.GlobalFeatures
 {
     public static class GlobalFeatureHelper
     {
-        public static bool IsGlobalFeatureEnabled(Type controllerType, out RequiresGlobalFeatureAttribute attribute)
+        public static bool IsGlobalFeatureEnabled(Type type, out RequiresGlobalFeatureAttribute attribute)
         {
-            attribute = ReflectionHelper.GetSingleAttributeOrDefault<RequiresGlobalFeatureAttribute>(controllerType);
+            attribute = ReflectionHelper.GetSingleAttributeOrDefault<RequiresGlobalFeatureAttribute>(type);
             return attribute == null || GlobalFeatureManager.Instance.IsEnabled(attribute.GetFeatureName());
         }
     }

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

@@ -17,7 +17,7 @@ public override async Task InterceptAsync(IAbpMethodInvocation invocation)
 
             if (!GlobalFeatureHelper.IsGlobalFeatureEnabled(invocation.TargetObject.GetType(), out var attribute))
             {
-                throw new AbpGlobalFeatureNotEnableException(code: AbpGlobalFeatureErrorCodes.GlobalFeatureIsNotEnabled)
+                throw new AbpGlobalFeatureNotEnabledException(code: AbpGlobalFeatureErrorCodes.GlobalFeatureIsNotEnabled)
                     .WithData("ServiceName", invocation.TargetObject.GetType().FullName)
                     .WithData("GlobalFeatureName", attribute.Name);
             }

framework/test/Volo.Abp.GlobalFeatures.Tests/Volo/Abp/GlobalFeatures/AbpGlobalFeatureNotEnableException_Localization_Test.cs

@@ -19,7 +19,7 @@ public void AbpAuthorizationException_Localization()
         {
             using (CultureHelper.Use("zh-Hans"))
             {
-                var exception = new AbpGlobalFeatureNotEnableException(code: AbpGlobalFeatureErrorCodes.GlobalFeatureIsNotEnabled)
+                var exception = new AbpGlobalFeatureNotEnabledException(code: AbpGlobalFeatureErrorCodes.GlobalFeatureIsNotEnabled)
                     .WithData("ServiceName", "MyService")
                     .WithData("GlobalFeatureName", "TestFeature");;
                 var errorInfo = _exceptionToErrorInfoConverter.Convert(exception, false);

framework/test/Volo.Abp.GlobalFeatures.Tests/Volo/Abp/GlobalFeatures/GlobalFeatureInterceptor_Tests.cs

@@ -20,7 +20,7 @@ public GlobalFeatureInterceptor_Tests()
         [Fact]
         public async Task Interceptor_Test()
         {
-            var ex = await Assert.ThrowsAsync<AbpGlobalFeatureNotEnableException>(async () =>
+            var ex = await Assert.ThrowsAsync<AbpGlobalFeatureNotEnabledException>(async () =>
             {
                 await _testAppServiceV1.TestMethod();
             });