Remove AbpAntiForgeryPreOptions

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

@@ -95,14 +95,9 @@ namespace Volo.Abp.AspNetCore.Mvc
                 }
             });
 
-            var antiForgeryPreOptions = context.Services.ExecutePreConfiguredActions<AbpAntiForgeryPreOptions>();
-
             var mvcCoreBuilder = context.Services.AddMvcCore(options =>
             {
-                if (antiForgeryPreOptions.AutoValidate)
-                {
-                    options.Filters.Add(new AbpAutoValidateAntiforgeryTokenAttribute());
-                }
+                options.Filters.Add(new AbpAutoValidateAntiforgeryTokenAttribute());
             });
             context.Services.ExecutePreConfiguredActions(mvcCoreBuilder);
 

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AntiForgery/AbpAntiForgeryOptions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
 
 namespace Volo.Abp.AspNetCore.Mvc.AntiForgery
@@ -17,6 +18,11 @@ namespace Volo.Abp.AspNetCore.Mvc.AntiForgery
         /// </summary>
         public string AuthCookieSchemaName { get; set; }
 
+        /// <summary>
+        /// Default value: true.
+        /// </summary>
+        public bool AutoValidate { get; set; } = true;
+
         public AbpAntiForgeryOptions()
         {
             TokenCookie = new CookieBuilder

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AntiForgery/AbpAntiForgeryPreOptions.cs

@@ -1,10 +0,0 @@
-namespace Volo.Abp.AspNetCore.Mvc.AntiForgery
-{
-    public class AbpAntiForgeryPreOptions
-    {
-        /// <summary>
-        /// Default value: true.
-        /// </summary>
-        public bool AutoValidate { get; set; } = true;
-    }
-}

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AntiForgery/AbpAutoValidateAntiforgeryTokenAuthorizationFilter.cs

@@ -2,26 +2,35 @@ using System;
 using Microsoft.AspNetCore.Antiforgery;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.Mvc.AntiForgery
 {
     public class AbpAutoValidateAntiforgeryTokenAuthorizationFilter : AbpValidateAntiforgeryTokenAuthorizationFilter, ITransientDependency
     {
+        private readonly AbpAntiForgeryOptions _options;
+
         public AbpAutoValidateAntiforgeryTokenAuthorizationFilter(
             IAntiforgery antiforgery,
             AbpAntiForgeryCookieNameProvider antiForgeryCookieNameProvider,
+            IOptions<AbpAntiForgeryOptions> options,
             ILogger<AbpValidateAntiforgeryTokenAuthorizationFilter> logger)
             : base(
                 antiforgery,
                 antiForgeryCookieNameProvider,
                 logger)
         {
-
+            _options = options.Value;
         }
 
         protected override bool ShouldValidate(AuthorizationFilterContext context)
         {
+            if (!_options.AutoValidate)
+            {
+                return false;
+            }
+
             if (IsIgnoredHttpMethod(context))
             {
                 return false;