Merge pull request #9089 from abpframework/auto-merge/rel-4-3/396

Merge branch dev with rel-4.3

docs/en/Migration-Guides/Abp-4_3.md

@@ -34,4 +34,10 @@ No change on the framework packages, but **module packages are separated as Web
 
 ### Other Changes
 
-* `EntityAction.RequiredPermission` has been marked as **obsolete**, because of performance reasons. It is suggested to use the `Visible` property by checking the permission/policy yourself and assigning to a variable. 
+* `EntityAction.RequiredPermission` has been marked as **obsolete**, because of performance reasons. It is suggested to use the `Visible` property by checking the permission/policy yourself and assigning to a variable.
+
+### Resource Reference Changes
+
+Open `<YourProjectName>BundleContributor.cs` and replace `context.Add("main.css");` to `context.Add("main.css", true);`
+
+Then run `abp bundle` command in the `blazor` folder to update resource references.

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyCurrentTenantAccessor.cs

@@ -0,0 +1,11 @@
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
+{
+    [Dependency(ReplaceServices = true)]
+    public class WebAssemblyCurrentTenantAccessor : ICurrentTenantAccessor, ISingletonDependency
+    {
+        public BasicTenantInfo Current { get; set; }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs

@@ -12,10 +12,13 @@ namespace Volo.Abp.AspNetCore.Mvc
 
         public HashSet<Type> IgnoredControllersOnModelExclusion { get; }
 
+        public bool AutoModelValidation { get; set; }
+
         public AbpAspNetCoreMvcOptions()
         {
             ConventionalControllers = new AbpConventionalControllerOptions();
             IgnoredControllersOnModelExclusion = new HashSet<Type>();
+            AutoModelValidation = true;
         }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Validation/AbpValidationActionFilter.cs

@@ -1,7 +1,11 @@
-using System.Threading.Tasks;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Reflection;
+using Volo.Abp.Validation;
 
 namespace Volo.Abp.AspNetCore.Mvc.Validation
 {
@@ -9,8 +13,6 @@ namespace Volo.Abp.AspNetCore.Mvc.Validation
     {
         public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
         {
-            //TODO: Configuration to disable validation for controllers..?
-
             if (!context.ActionDescriptor.IsControllerAction() ||
                 !context.ActionDescriptor.HasObjectResult())
             {
@@ -18,6 +20,44 @@ namespace Volo.Abp.AspNetCore.Mvc.Validation
                 return;
             }
 
+            if (!context.GetRequiredService<IOptions<AbpAspNetCoreMvcOptions>>().Value.AutoModelValidation)
+            {
+                await next();
+                return;
+            }
+
+            if (ReflectionHelper.GetSingleAttributeOfMemberOrDeclaringTypeOrDefault<DisableValidationAttribute>(context.ActionDescriptor.GetMethodInfo()) != null)
+            {
+                await next();
+                return;
+            }
+
+            if (ReflectionHelper.GetSingleAttributeOfMemberOrDeclaringTypeOrDefault<DisableValidationAttribute>(context.Controller.GetType()) != null)
+            {
+                await next();
+                return;
+            }
+
+            if (context.ActionDescriptor.GetMethodInfo().DeclaringType != context.Controller.GetType())
+            {
+                var baseMethod = context.ActionDescriptor.GetMethodInfo();
+
+                var overrideMethod = context.Controller.GetType().GetMethods().FirstOrDefault(x =>
+                    x.DeclaringType == context.Controller.GetType() &&
+                    x.Name == baseMethod.Name &&
+                    x.ReturnType == baseMethod.ReturnType &&
+                    x.GetParameters().Select(p => p.ToString()).SequenceEqual(baseMethod.GetParameters().Select(p => p.ToString())));
+
+                if (overrideMethod != null)
+                {
+                    if (ReflectionHelper.GetSingleAttributeOfMemberOrDeclaringTypeOrDefault<DisableValidationAttribute>(overrideMethod) != null)
+                    {
+                        await next();
+                        return;
+                    }
+                }
+            }
+
             context.GetRequiredService<IModelStateValidator>().Validate(context.ModelState);
             await next();
         }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs

@@ -21,6 +21,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building
 
             if (context.Template.Name == AppProTemplate.TemplateName ||
                 context.Template.Name == MicroserviceProTemplate.TemplateName ||
+                context.Template.Name == MicroserviceServiceProTemplate.TemplateName ||
                 context.Template.Name == ModuleProTemplate.TemplateName)
             {
                 pipeline.Steps.Add(new LicenseCodeReplaceStep()); // todo: move to custom steps?

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController.cs

@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Shouldly;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Validation;
 
 namespace Volo.Abp.AspNetCore.Mvc.Validation
@@ -42,6 +43,31 @@ namespace Volo.Abp.AspNetCore.Mvc.Validation
             return Task.FromResult(model.Value1);
         }
 
+        [HttpGet]
+        [Route("disable-validation-object-result-action")]
+        [DisableValidation]
+        public Task<string> DisableValidationObjectResultAction(ValidationTest1Model model)
+        {
+            ModelState.IsValid.ShouldBeFalse();
+            return Task.FromResult("ModelState.IsValid: " + ModelState.IsValid.ToString().ToLowerInvariant());
+        }
+
+        [HttpGet]
+        [Route("object-result-action2")]
+        public virtual Task<string> ObjectResultAction2(ValidationTest1Model model)
+        {
+            ModelState.IsValid.ShouldBeTrue(); //AbpValidationFilter throws exception otherwise
+            return Task.FromResult(model.Value1);
+        }
+
+        [HttpGet]
+        [Route("object-result-action3")]
+        public virtual Task<string> ObjectResultAction3(ValidationTest1Model model)
+        {
+            ModelState.IsValid.ShouldBeFalse();
+            return Task.FromResult("ModelState.IsValid: " + ModelState.IsValid.ToString().ToLowerInvariant());
+        }
+
         public class ValidationTest1Model
         {
             [Required]
@@ -107,4 +133,23 @@ namespace Volo.Abp.AspNetCore.Mvc.Validation
             }
         }
     }
+
+    [DisableValidation]
+    [Route("api/sub1-validation-test")]
+    public class Sub1ValidationTestController : ValidationTestController
+    {
+
+    }
+
+    [Dependency(ReplaceServices = true)]
+    [ExposeServices(typeof(ValidationTestController))]
+    public class Sub2ValidationTestController : ValidationTestController
+    {
+        [DisableValidation]
+        public override Task<string> ObjectResultAction2(ValidationTest1Model model)
+        {
+            ModelState.IsValid.ShouldBeFalse();
+            return Task.FromResult("ModelState.IsValid: " + ModelState.IsValid.ToString().ToLowerInvariant());
+        }
+    }
 }

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController_Tests.cs

@@ -1,5 +1,8 @@
 using System.Net;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Hosting;
 using Shouldly;
 using Volo.Abp.Http;
 using Volo.Abp.Localization;
@@ -90,5 +93,45 @@ namespace Volo.Abp.AspNetCore.Mvc.Validation
             result = await GetResponseAsObjectAsync<RemoteServiceErrorResponse>("/api/validation-test/object-result-action-dynamic-length?value1=123458&value3[0]=53&value3[1]=54&value4=2&value5=1.2&value6=2004-05-04", HttpStatusCode.BadRequest); //value4 has max date of 3/4/2004.
             result.Error.ValidationErrors.Length.ShouldBeGreaterThan(0);
         }
+
+        [Fact]
+        public async Task Should_Disable_Validate()
+        {
+            var result = await GetResponseAsStringAsync("/api/validation-test/disable-validation-object-result-action");
+            result.ShouldBe("ModelState.IsValid: false");
+        }
+
+        [Fact] public async Task SubClass_Should_Disable_Validate_If_Class_Has_DisableValidationAttribute()
+        {
+            var result = await GetResponseAsStringAsync("/api/sub1-validation-test/disable-validation-object-result-action");
+            result.ShouldBe("ModelState.IsValid: false");
+        }
+
+        [Fact]
+        public async Task SubClass_Should_Disable_Validate_If_Action_Has_DisableValidationAttribute()
+        {
+            var result = await GetResponseAsStringAsync("/api/validation-test/object-result-action2");
+            result.ShouldBe("ModelState.IsValid: false");
+        }
+    }
+
+    public class DisableAutoModelValidationTestController_Tests : AspNetCoreMvcTestBase
+    {
+        protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services)
+        {
+            services.Configure<AbpAspNetCoreMvcOptions>(options =>
+            {
+                options.AutoModelValidation = false;
+            });
+
+            base.ConfigureServices(context, services);
+        }
+
+        [Fact]
+        public async Task Should_Disable_Validate_If_AutoModelValidation_Is_False()
+        {
+            var result = await GetResponseAsStringAsync("/api/validation-test/object-result-action3");
+            result.ShouldBe("ModelState.IsValid: false");
+        }
     }
 }