Updated fluent validation

Author: Chris Young

src/ArchitectNow.Web/Configuration/WebApiExtensions.cs

@@ -1,5 +1,7 @@
 using System.IO;
+using ArchitectNow.Models.Options;
 using ArchitectNow.Web.Filters;
+using ArchitectNow.Web.Models;
 using FluentValidation.AspNetCore;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
@@ -14,15 +16,15 @@ namespace ArchitectNow.Web.Configuration
 {
 	public static class WebApiExtensions
 	{
-		public static void ConfigureApi(this IServiceCollection services)
+		public static void ConfigureApi(this IServiceCollection services, FluentValidationOptions fluentValidationOptions)
 		{
 			/*************************
              * IConfiguration is not available yet
              *************************/
 
 			services.AddAntiforgery(options => options.HeaderName = "X-XSRF-TOKEN");
 			services.AddRouting(options => options.LowercaseUrls = true);
-			services.AddMvc(o =>
+			var mvcBuilder = services.AddMvc(o =>
 				{
 					o.Filters.AddService(typeof(GlobalExceptionFilter));
 					o.ModelValidatorProviders.Clear();
@@ -45,7 +47,13 @@ public static void ConfigureApi(this IServiceCollection services)
 						new IsoDateTimeConverter(),
 						new StringEnumConverter(true)
 					};
-				}).AddFluentValidation();
+				});
+
+
+			if (fluentValidationOptions.Enabled == true)
+			{
+				mvcBuilder.AddFluentValidation(configuration => fluentValidationOptions?.Configure(configuration));
+			}
 		}
 
 		public static void ConfigureAssets(this IApplicationBuilder app, IConfigurationRoot configurationRoot)

src/ArchitectNow.Web/Models/FluentValidationOptions.cs

@@ -0,0 +1,11 @@
+using System;
+using FluentValidation.AspNetCore;
+
+namespace ArchitectNow.Web.Models
+{
+    public class FluentValidationOptions
+    {
+        public Action<FluentValidationMvcConfiguration> Configure;
+        public bool Enabled { get; set; }
+    }
+}

src/ArchitectNow.Web/StartupBase.cs

@@ -3,6 +3,7 @@
 using System.Reflection;
 using ArchitectNow.Models.Options;
 using ArchitectNow.Web.Configuration;
+using ArchitectNow.Web.Models;
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using Hangfire;
@@ -15,7 +16,6 @@
 using Serilog;
 using SwaggerOptions = ArchitectNow.Web.Models.SwaggerOptions;
 using AutoMapper;
-using NSwag.AspNetCore;
 
 namespace ArchitectNow.Web
 {
@@ -34,6 +34,9 @@ protected StartupBase(IHostingEnvironment env, ILoggerFactory loggerFactory)
 
 		protected abstract IEnumerable<SwaggerOptions> SwaggerOptions { get; }
 
+		protected virtual FluentValidationOptions FluentValidationOptions { get; } =
+			new FluentValidationOptions {Enabled = true};
+			
 		protected IConfigurationRoot ConfigurationRoot => _configurationRoot;
 		protected IContainer ApplicationContainer { get; private set; }
 
@@ -49,7 +52,7 @@ protected virtual IServiceProvider ConfigureServicesInternal(IServiceCollection
 
 			services.ConfigureOptions();
 
-			services.ConfigureApi();
+			services.ConfigureApi(FluentValidationOptions);
 
             services.ConfigureAutomapper(ConfigureAutoMapper);