Merge pull request #13 from gareth-james/feature/authorize-filter

Add Web API action metadata also for unauthorized requests

fixes #12

src/SerilogWeb.Classic.WebApi/Classic/WebApi/StoreWebApInfoInHttpContextActionFilter.cs → src/SerilogWeb.Classic.WebApi/Classic/WebApi/HttpActionContextExtensions.cs

@@ -1,28 +1,16 @@
-using System.Collections.Generic;
-using System.Threading;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 using System.Web.Http.Controllers;
-using System.Web.Http.Filters;
 
 namespace SerilogWeb.Classic.WebApi
 {
-    internal class StoreWebApInfoInHttpContextActionFilter : ActionFilterAttribute
+    internal static class HttpActionContextExtensions
     {
-        public override void OnActionExecuting(HttpActionContext actionContext)
-        {
-            StoreWebApInfoInHttpContext(actionContext);
-            base.OnActionExecuting(actionContext);
-        }
-
-        public override Task OnActionExecutingAsync(HttpActionContext actionContext, CancellationToken cancellationToken)
-        {
-            StoreWebApInfoInHttpContext(actionContext);
-            return base.OnActionExecutingAsync(actionContext, cancellationToken);
-        }
-
-
-        private static void StoreWebApInfoInHttpContext(HttpActionContext actionContext)
+        internal static void StoreWebApInfoInHttpContext(this HttpActionContext actionContext)
         {
             var currentHttpContext = HttpContext.Current;
             if (currentHttpContext == null)
@@ -49,4 +37,4 @@ private static void StoreWebApInfoInHttpContext(HttpActionContext actionContext)
             currentHttpContext.Items[Constants.WebApiContextInfoKey] = contextualInfo;
         }
     }
-}
+}

src/SerilogWeb.Classic.WebApi/Classic/WebApi/PreApplicationStartModule.cs

@@ -9,7 +9,7 @@ public static void Register()
         {
             GlobalConfiguration.Configuration.Services.Add(typeof(IExceptionLogger),
                 new WebApiExceptionLogger());
-            GlobalConfiguration.Configuration.Filters.Add(new StoreWebApInfoInHttpContextActionFilter());
+            GlobalConfiguration.Configuration.Filters.Add(new StoreWebApInfoInHttpContextAuthenticationFilter());
         }
     }
 }

src/SerilogWeb.Classic.WebApi/Classic/WebApi/StoreWebApInfoInHttpContextAuthenticationFilter.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using System.Web.Http.Filters;
+
+namespace SerilogWeb.Classic.WebApi
+{
+    internal class StoreWebApInfoInHttpContextAuthenticationFilter : IAuthenticationFilter
+    {
+        public bool AllowMultiple => false;
+
+        public Task AuthenticateAsync(HttpAuthenticationContext context, CancellationToken cancellationToken)
+        {
+            context.ActionContext.StoreWebApInfoInHttpContext();
+            return Task.FromResult(0);
+        }
+
+        public Task ChallengeAsync(HttpAuthenticationChallengeContext context, CancellationToken cancellationToken)
+        {
+            return Task.FromResult(0);
+        }
+    }
+}

src/SerilogWeb.Classic.WebApi/SerilogWeb.Classic.WebApi.csproj

@@ -79,8 +79,9 @@
     <Compile Include="Classic\WebApi\Enrichers\WebApiControllerNameEnricher.cs" />
     <Compile Include="Classic\WebApi\Enrichers\WebApiRouteDataEnricher.cs" />
     <Compile Include="Classic\WebApi\Enrichers\WebApiRouteTemplateEnricher.cs" />
+    <Compile Include="Classic\WebApi\HttpActionContextExtensions.cs" />
     <Compile Include="Classic\WebApi\PreApplicationStartModule.cs" />
-    <Compile Include="Classic\WebApi\StoreWebApInfoInHttpContextActionFilter.cs" />
+    <Compile Include="Classic\WebApi\StoreWebApInfoInHttpContextAuthenticationFilter.cs" />
     <Compile Include="Classic\WebApi\WebApiExceptionLogger.cs" />
     <Compile Include="Classic\WebApi\WebApiRequestInfoKey.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

test/SerilogWeb.Classic.WebApi.Test/Controllers/ValuesController.cs

@@ -18,6 +18,13 @@ public string ShouldThrowException()
             throw new SyntheticException(nameof(ShouldThrowException));
         }
 
+        [Route("api/values/shouldbeunauthorized")]
+        [HttpGet]
+        [Authorize]
+        public void ShouldBeUnauthorized()
+        {
+        }
+
         // GET api/values/5
         public string Get(int id)
         {