update antiforgery

Author: Musa Demir

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Controllers/AntiForgeryController.cs

@@ -1,20 +1,30 @@
+using System.Threading.Tasks;
+using Abp.Web.Security.AntiForgery;
 using Microsoft.AspNetCore.Antiforgery;
 using AbpCompanyName.AbpProjectName.Controllers;
+using Microsoft.AspNetCore.Mvc;
 
 namespace AbpCompanyName.AbpProjectName.Web.Host.Controllers
 {
     public class AntiForgeryController : AbpProjectNameControllerBase
     {
         private readonly IAntiforgery _antiforgery;
+        private readonly IAbpAntiForgeryManager _antiForgeryManager;
 
-        public AntiForgeryController(IAntiforgery antiforgery)
+        public AntiForgeryController(IAntiforgery antiforgery, IAbpAntiForgeryManager antiForgeryManager)
         {
             _antiforgery = antiforgery;
+            _antiForgeryManager = antiForgeryManager;
         }
 
         public void GetToken()
         {
             _antiforgery.SetCookieTokenAndHeader(HttpContext);
         }
+
+        public void SetCookie()
+        {
+            _antiForgeryManager.SetCookie(HttpContext);
+        }
     }
 }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs

@@ -121,21 +121,7 @@ public void Configure(IApplicationBuilder app,  ILoggerFactory loggerFactory)
                 endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
                 endpoints.MapControllerRoute("defaultWithArea", "{area}/{controller=Home}/{action=Index}/{id?}");
             });
-
-            // Swagger anti forgery
-            app.Use(async (context, next) =>
-            {
-                const string swaggerRoutePrefix = "swagger";
-
-                if (context.Request.Method == "GET" &&
-                    context.Request.Path.HasValue &&
-                    context.Request.Path.Value.StartsWith(swaggerRoutePrefix.EnsureStartsWith('/')))
-                {
-                    context.RequestServices.GetRequiredService<IAbpAntiForgeryManager>().SetCookie(context);
-                }
-
-                await next.Invoke();
-            });
+          
             // Enable middleware to serve generated Swagger as a JSON endpoint
             app.UseSwagger();
             // Enable middleware to serve swagger-ui assets (HTML, JS, CSS etc.)

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/wwwroot/swagger/ui/index.html

@@ -70,8 +70,14 @@
     <script src="swagger-ui-standalone-preset.js"></script>
     <script src="ui/abp.js"></script>
     <script src="ui/abp.swagger.js"></script>
+
     <script>
         window.onload = function () {
+            if (!abp.security.antiForgery.getToken()) {
+                fetch("/antiforgery/SetCookie")
+                    .then(data => { });
+            }
+
             var configObject = JSON.parse('%(ConfigObject)');
 
             // Apply mandatory parameters