Merge pull request #18 from SharpGrip/17-net8-fluentautovalidation-an…

…d-the-default-modelstateinvalidfilter fix unvalidated entries when validation is skipped due to annotation configuration
SharpGrip · Oct 19, 2023 · 9c95cda · 9c95cda
2 parents 5decb86 + 8379dde
commit 9c95cda
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <PackageVersion>1.3.0</PackageVersion>
+        <PackageVersion>1.3.1</PackageVersion>
         <Company>SharpGrip</Company>
         <Authors>SharpGrip</Authors>
         <Copyright>SharpGrip</Copyright>

diff --git a/...ntValidation.AutoValidation.Mvc/src/Filters/FluentValidationAutoValidationActionFilter.cs b/...ntValidation.AutoValidation.Mvc/src/Filters/FluentValidationAutoValidationActionFilter.cs
@@ -41,6 +41,8 @@ public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionE
                 if (autoValidationMvcConfiguration.ValidationStrategy == ValidationStrategy.Annotations &&
                     endpoint != null && !endpoint.Metadata.OfType<FluentValidationAutoValidationAttribute>().Any())
                 {
+                    HandleUnvalidatedEntries(context);
+
                     await next();
 
                     return;
@@ -76,13 +78,7 @@ public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionE
                     }
                 }
 
-                if (autoValidationMvcConfiguration.DisableBuiltInModelValidation)
-                {
-                    foreach (var modelStateEntry in context.ModelState.Values.Where(modelStateEntry => modelStateEntry.ValidationState == ModelValidationState.Unvalidated))
-                    {
-                        modelStateEntry.ValidationState = ModelValidationState.Skipped;
-                    }
-                }
+                HandleUnvalidatedEntries(context);
 
                 if (!context.ModelState.IsValid)
                 {
@@ -96,5 +92,16 @@ public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionE
 
             await next();
         }
+
+        private void HandleUnvalidatedEntries(ActionExecutingContext context)
+        {
+            if (autoValidationMvcConfiguration.DisableBuiltInModelValidation)
+            {
+                foreach (var modelStateEntry in context.ModelState.Values.Where(modelStateEntry => modelStateEntry.ValidationState == ModelValidationState.Unvalidated))
+                {
+                    modelStateEntry.ValidationState = ModelValidationState.Skipped;
+                }
+            }
+        }
     }
 }