Make saving TempData operate via a filter

This change moves the responsibility for saving TempData into a filter,
which is registered with other View features. This moves TempData into the
ViewFeatures package.

ActionResults which require TempData to be kept use a new marker interface
which is handled by the filter.

Author: rynowak

src/Microsoft.AspNet.Mvc.Core/ControllerActionInvoker.cs

@@ -18,7 +18,6 @@ public class ControllerActionInvoker : FilterActionInvoker
         private readonly ControllerActionDescriptor _descriptor;
         private readonly IControllerFactory _controllerFactory;
         private readonly IControllerActionArgumentBinder _argumentBinder;
-        private readonly ITempDataDictionary _tempData;
 
         public ControllerActionInvoker(
             [NotNull] ActionContext actionContext,
@@ -32,7 +31,6 @@ public ControllerActionInvoker(
             [NotNull] IReadOnlyList<IModelValidatorProvider> modelValidatorProviders,
             [NotNull] IReadOnlyList<IValueProviderFactory> valueProviderFactories,
             [NotNull] IScopedInstance<ActionBindingContext> actionBindingContextAccessor,
-            [NotNull] ITempDataDictionary tempData,
             [NotNull] ILoggerFactory loggerFactory,
             int maxModelValidationErrors)
             : base(
@@ -50,7 +48,6 @@ public ControllerActionInvoker(
             _descriptor = descriptor;
             _controllerFactory = controllerFactory;
             _argumentBinder = controllerActionArgumentBinder;
-            _tempData = tempData;
 
             if (descriptor.MethodInfo == null)
             {
@@ -70,7 +67,6 @@ protected override object CreateInstance()
 
         protected override void ReleaseInstance(object instance)
         {
-            _tempData.Save();
             _controllerFactory.ReleaseController(instance);
         }
 

src/Microsoft.AspNet.Mvc.Core/ControllerActionInvokerProvider.cs

@@ -22,7 +22,6 @@ public class ControllerActionInvokerProvider : IActionInvokerProvider
         private readonly IReadOnlyList<IModelValidatorProvider> _modelValidatorProviders;
         private readonly IReadOnlyList<IValueProviderFactory> _valueProviderFactories;
         private readonly IScopedInstance<ActionBindingContext> _actionBindingContextAccessor;
-        private readonly ITempDataDictionary _tempData;
         private readonly int _maxModelValidationErrors;
         private readonly ILoggerFactory _loggerFactory;
 
@@ -32,7 +31,6 @@ public ControllerActionInvokerProvider(
             IControllerActionArgumentBinder argumentBinder,
             IOptions<MvcOptions> optionsAccessor,
             IScopedInstance<ActionBindingContext> actionBindingContextAccessor,
-            ITempDataDictionary tempData,
             ILoggerFactory loggerFactory)
         {
             _controllerFactory = controllerFactory;
@@ -44,7 +42,6 @@ public ControllerActionInvokerProvider(
             _modelValidatorProviders = optionsAccessor.Options.ModelValidatorProviders.ToArray();
             _valueProviderFactories = optionsAccessor.Options.ValueProviderFactories.ToArray();
             _actionBindingContextAccessor = actionBindingContextAccessor;
-            _tempData = tempData;
             _maxModelValidationErrors = optionsAccessor.Options.MaxModelValidationErrors;
             _loggerFactory = loggerFactory;
         }
@@ -73,7 +70,6 @@ public void OnProvidersExecuting([NotNull] ActionInvokerProviderContext context)
                                     _modelValidatorProviders,
                                     _valueProviderFactories,
                                     _actionBindingContextAccessor,
-                                    _tempData,
                                     _loggerFactory,
                                     _maxModelValidationErrors);
             }

src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs

@@ -130,15 +130,6 @@ internal static void AddMvcCoreServices(IServiceCollection services)
                 return new DefaultObjectValidator(options.ValidationExcludeFilters, modelMetadataProvider);
             }));
 
-            //
-            // Temp Data
-            //
-            // Holds per-request data so it should be scoped
-            services.TryAddScoped<ITempDataDictionary, TempDataDictionary>();
-
-            // This does caching so it should stay singleton
-            services.TryAddSingleton<ITempDataProvider, SessionStateTempDataProvider>();
-
             //
             // Random Infrastructure
             //

src/Microsoft.AspNet.Mvc.Core/IKeepTempDataResult.cs

@@ -0,0 +1,12 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNet.Mvc
+{
+    /// <summary>
+    /// A marker interface for <see cref="IActionResult"/> types which need to have temp data saved.
+    /// </summary>
+    public interface IKeepTempDataResult : IActionResult
+    {
+    }
+}

src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 
 namespace Microsoft.AspNet.Mvc
 {
-    public class RedirectResult : ActionResult
+    public class RedirectResult : ActionResult, IKeepTempDataResult
     {
         private string _url;
 
@@ -60,8 +60,6 @@ public override void ExecuteResult([NotNull] ActionContext context)
                 destinationUrl = urlHelper.Content(Url);
             }
 
-            var tempData = context.HttpContext.RequestServices.GetRequiredService<ITempDataDictionary>();
-            tempData.Keep();
             context.HttpContext.Response.Redirect(destinationUrl, Permanent);
         }
 

src/Microsoft.AspNet.Mvc.Core/RedirectResult.cs

@@ -9,7 +9,7 @@
 
 namespace Microsoft.AspNet.Mvc
 {
-    public class RedirectToActionResult : ActionResult
+    public class RedirectToActionResult : ActionResult, IKeepTempDataResult
     {
         public RedirectToActionResult(
             string actionName,
@@ -51,8 +51,6 @@ public override void ExecuteResult([NotNull] ActionContext context)
                 throw new InvalidOperationException(Resources.NoRoutesMatched);
             }
 
-            var tempData = context.HttpContext.RequestServices.GetRequiredService<ITempDataDictionary>();
-            tempData.Keep();
             context.HttpContext.Response.Redirect(destinationUrl, Permanent);
         }
 

src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs

@@ -9,7 +9,7 @@
 
 namespace Microsoft.AspNet.Mvc
 {
-    public class RedirectToRouteResult : ActionResult
+    public class RedirectToRouteResult : ActionResult, IKeepTempDataResult
     {
         public RedirectToRouteResult(object routeValues)
             : this(routeName: null, routeValues: routeValues)
@@ -51,8 +51,6 @@ public override void ExecuteResult([NotNull] ActionContext context)
                 throw new InvalidOperationException(Resources.NoRoutesMatched);
             }
 
-            var tempData = context.HttpContext.RequestServices.GetRequiredService<ITempDataDictionary>();
-            tempData.Keep();
             context.HttpContext.Response.Redirect(destinationUrl, Permanent);
         }
 

src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs

@@ -288,15 +288,6 @@
   <data name="ModelType_WrongType" xml:space="preserve">
     <value>The model's runtime type '{0}' is not assignable to the type '{1}'.</value>
   </data>
-  <data name="TempData_CannotSerializeToSession" xml:space="preserve">
-    <value>The '{0}' cannot serialize an object of type '{1}' to session state.</value>
-  </data>
-  <data name="TempData_CannotDeserializeToken" xml:space="preserve">
-    <value>Cannot deserialize {0} of type '{1}'.</value>
-  </data>
-  <data name="TempData_CannotSerializeDictionary" xml:space="preserve">
-    <value>The '{0}' cannot serialize a dictionary with a key of type '{1}' to session state.</value>
-  </data>
   <data name="ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated" xml:space="preserve">
     <value>The type '{0}' cannot be activated by '{1}' because it is either a value type, an interface, an abstract class or an open generic type.</value>
   </data>

src/Microsoft.AspNet.Mvc.Core/Resources.resx

@@ -14,15 +14,15 @@
         "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*",
         "Microsoft.AspNet.Http": "1.0.0-*",
         "Microsoft.AspNet.Mvc.Abstractions": "6.0.0-*",
+        "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*",
         "Microsoft.Framework.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" },
         "Microsoft.Framework.Logging.Abstractions": "1.0.0-*",
         "Microsoft.Framework.Notification": "1.0.0-*",
         "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" },
         "Microsoft.Framework.PropertyActivator.Sources": { "version": "1.0.0-*", "type": "build" },
         "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" },
-        "Microsoft.Framework.SecurityHelper.Sources": { "version": "1.0.0-*", "type": "build" },
-        "Microsoft.Dnx.Compilation.Abstractions": "1.0.0-*",
-        "Newtonsoft.Json": "6.0.6"
+        "Microsoft.Framework.SecurityHelper.Sources": { "version": "1.0.0-*", "type": "build" }
+
     },
     "frameworks": {
         "dnx451": { },

src/Microsoft.AspNet.Mvc.Core/project.json

@@ -51,6 +51,8 @@ internal static void AddViewServices(IServiceCollection services)
 
             services.TryAddEnumerable(
                 ServiceDescriptor.Transient<IConfigureOptions<MvcViewOptions>, MvcViewOptionsSetup>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<MvcOptions>, TempDataMvcOptionsSetup>());
 
             //
             // View Engine and related infrastructure
@@ -95,6 +97,16 @@ internal static void AddViewServices(IServiceCollection services)
             services.TryAddTransient<IViewComponentDescriptorProvider, DefaultViewComponentDescriptorProvider>();
             services.TryAddSingleton<IViewComponentInvokerFactory, DefaultViewComponentInvokerFactory>();
             services.TryAddTransient<IViewComponentHelper, DefaultViewComponentHelper>();
+
+            //
+            // Temp Data
+            //
+            // Holds per-request data so it should be scoped
+            services.TryAddScoped<ITempDataDictionary, TempDataDictionary>();
+            services.TryAddScoped<SaveTempDataFilter>();
+
+            // This does caching so it should stay singleton
+            services.TryAddSingleton<ITempDataProvider, SessionStateTempDataProvider>();
         }
     }
 }

src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs

@@ -265,4 +265,13 @@
   <data name="ViewComponentResult_NameOrTypeMustBeSet" xml:space="preserve">
     <value>Either the '{0}' or '{1}' property must be set in order to invoke a view component.</value>
   </data>
+  <data name="TempData_CannotDeserializeToken" xml:space="preserve">
+    <value>Cannot deserialize {0} of type '{1}'.</value>
+  </data>
+  <data name="TempData_CannotSerializeDictionary" xml:space="preserve">
+    <value>The '{0}' cannot serialize a dictionary with a key of type '{1}' to session state.</value>
+  </data>
+  <data name="TempData_CannotSerializeToSession" xml:space="preserve">
+    <value>The '{0}' cannot serialize an object of type '{1}' to session state.</value>
+  </data>
 </root>

src/Microsoft.AspNet.Mvc.ViewFeatures/Properties/Resources.Designer.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.Framework.DependencyInjection;
+
+namespace Microsoft.AspNet.Mvc
+{
+    /// <summary>
+    /// Adds a filter which will save the <see cref="ITempDataDictionary"/> for a request.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class SaveTempDataAttribute : Attribute, IFilterFactory
+    {
+        /// <inheritdoc />
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            return serviceProvider.GetRequiredService<SaveTempDataFilter>();
+        }
+    }
+}