Merge pull request #44 from mortan/pr-async-actions

Fix issue 20 (async actions)
andrewdavey · Sep 21, 2016 · 7962f68 · 7962f68
2 parents 41172aa + 0f50199
commit 7962f68
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 6 deletions.
diff --git a/src/NotFoundMvc/ActionInvokerSelector.cs b/src/NotFoundMvc/ActionInvokerSelector.cs
@@ -0,0 +1,16 @@
+namespace NotFoundMvc
+{
+    using System;
+    using System.Web.Mvc;
+
+    internal static class ActionInvokerSelector
+    {
+        private static readonly Func<IActionInvoker, IActionInvoker> Mvc3Invoker =
+           originalActionInvoker => new ActionInvokerWrapper(originalActionInvoker);
+
+        private readonly static Func<IActionInvoker, IActionInvoker> Mvc4Invoker =
+            originalActionInvoker => new NotFoundAsyncControllerActionInvoker();
+
+        public static Func<IActionInvoker, IActionInvoker> Current { get; } = typeof(Controller).Assembly.GetName().Version.Major <= 3 ? Mvc3Invoker : Mvc4Invoker;
+    }
+}
diff --git a/src/NotFoundMvc/ControllerFactoryWrapper.cs b/src/NotFoundMvc/ControllerFactoryWrapper.cs
@@ -49,7 +49,7 @@ private static void WrapControllerActionInvoker(IController controller)
             var controllerWithInvoker = controller as Controller;
             if (controllerWithInvoker != null)
             {
-                controllerWithInvoker.ActionInvoker = new ActionInvokerWrapper(controllerWithInvoker.ActionInvoker);
+                controllerWithInvoker.ActionInvoker = ActionInvokerSelector.Current(controllerWithInvoker.ActionInvoker);
             }
         }
     }

diff --git a/src/NotFoundMvc/NotFoundAsyncControllerActionInvoker.cs b/src/NotFoundMvc/NotFoundAsyncControllerActionInvoker.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Web.Mvc;
+using System.Web.Mvc.Async;
+
+namespace NotFoundMvc
+{
+    public class NotFoundAsyncControllerActionInvoker : AsyncControllerActionInvoker
+    {
+        protected override ActionDescriptor FindAction(ControllerContext controllerContext, ControllerDescriptor controllerDescriptor,
+            string actionName)
+        {
+            var result = base.FindAction(controllerContext, controllerDescriptor, actionName);
+            if (result == null)
+            {
+                return new NotFoundActionDescriptor();
+            }
+            return result;
+        }
+    }
+
+    public class NotFoundActionDescriptor : ActionDescriptor
+    {
+        public override object Execute(ControllerContext controllerContext, IDictionary<string, object> parameters)
+        {
+            if (controllerContext == null)
+            {
+                throw new ArgumentNullException(nameof(controllerContext));
+            }
+
+            INotFoundController notFound = NotFoundHandler.CreateNotFoundController(controllerContext.RequestContext);
+            controllerContext.RouteData.Values["action"] = "NotFound";
+            return notFound.NotFound();
+        }
+
+        public override ParameterDescriptor[] GetParameters()
+        {
+            return new ParameterDescriptor[] { };
+        }
+
+        public override string ActionName
+        {
+            get { return "NotFound"; }
+        }
+
+        public override ControllerDescriptor ControllerDescriptor
+        {
+            get { return new ReflectedControllerDescriptor(typeof(NotFoundController)); }
+        }
+    }
+}
diff --git a/src/NotFoundMvc/NotFoundController.cs b/src/NotFoundMvc/NotFoundController.cs
@@ -1,9 +1,8 @@
 namespace NotFoundMvc
 {
     using System.Web.Mvc;
-    using System.Web.Routing;
 
-    public class NotFoundController : ControllerBase
+    public class NotFoundController : ControllerBase, INotFoundController
     {
         public ActionResult NotFound()
         {
@@ -15,4 +14,9 @@ protected override void ExecuteCore()
             new NotFoundViewResult().ExecuteResult(this.ControllerContext);
         }
     }
+
+    public interface INotFoundController : IController
+    {
+        ActionResult NotFound();
+    }
 }
diff --git a/src/NotFoundMvc/NotFoundHandler.cs b/src/NotFoundMvc/NotFoundHandler.cs
@@ -2,14 +2,14 @@
 {
     using System;
     using System.Web;
-    using System.Web.Mvc;
     using System.Web.Routing;
+    using NotFoundMvc;
 
     public class NotFoundHandler : IHttpHandler
     {
-        private static Func<RequestContext, IController> createNotFoundController = context => new NotFoundController();
+        private static Func<RequestContext, INotFoundController> createNotFoundController = context => new NotFoundController();
 
-        public static Func<RequestContext, IController> CreateNotFoundController
+        public static Func<RequestContext, INotFoundController> CreateNotFoundController
         {
             get
             {

diff --git a/src/NotFoundMvc/NotFoundMvc.csproj b/src/NotFoundMvc/NotFoundMvc.csproj
@@ -74,11 +74,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ActionInvokerSelector.cs" />
     <Compile Include="ActionInvokerWrapper.cs" />
     <Compile Include="NotFoundConfig.cs" />
     <Compile Include="ControllerFactoryWrapper.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="InstallerModule.cs" />
+    <Compile Include="NotFoundAsyncControllerActionInvoker.cs" />
     <Compile Include="NotFoundController.cs" />
     <Compile Include="NotFoundHandler.cs" />
     <Compile Include="NotFoundViewResult.cs" />