Merge pull request #20 from Kentico/CM-7484-caching-for-static-content

Fix client caching for static content when Preview is enabled

CHANGELOG.md

@@ -62,6 +62,8 @@
 #### Fixed
 
 * Updated Kentico package description for NuGet.org.
+* Fix client caching for static content when Preview module is enabled.
+[#20](https://github.com/Kentico/Mvc/pull/20)
 
 ## Kentico.Core
 

src/Kentico.Content.Web.Mvc/Kentico.Content.Web.Mvc.csproj

@@ -52,6 +52,7 @@
     <Compile Include="Preview\IPreviewFeature.cs" />
     <Compile Include="Preview\PreviewFeature.cs" />
     <Compile Include="Preview\PreviewFeatureModule.cs" />
+    <Compile Include="Preview\PreviewOutputCacheFilter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

src/Kentico.Content.Web.Mvc/Preview/PreviewFeatureModule.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Web;
+using System.Web.Mvc;
 using System.Web.Helpers;
 
 using CMS.DocumentEngine;
@@ -21,6 +22,7 @@ internal sealed class PreviewFeatureModule : IModule
         public void Initialize(HttpApplication application)
         {
             application.BeginRequest += HandleBeginRequest;
+            GlobalFilters.Filters.Add(new PreviewOutputCacheFilter());
         }
 
 
@@ -30,7 +32,6 @@ private void HandleBeginRequest(object sender, EventArgs e)
             var context = application.Context;
             var relativeFilePath = context.Request.AppRelativeCurrentExecutionFilePath.TrimStart('~');
 
-
             // Check whether the current request URL contains information about a preview mode
             if (HandleVirtualContext(ref relativeFilePath))
             {
@@ -51,11 +52,6 @@ private void HandleBeginRequest(object sender, EventArgs e)
                 // Remove preview mode information from the request URL
                 context.RewritePath("~" + relativeFilePath, context.Request.PathInfo, context.Request.Url.Query.TrimStart('?'));
             }
-            else
-            {
-                // Add validation callback for the output cache item to ignore it in a preview mode
-                context.Response.Cache.AddValidationCallback(ValidateCacheItem, null);
-            }
 
             var previewFeature = new PreviewFeature();
             context.Kentico().SetFeature<IPreviewFeature>(previewFeature);
@@ -89,14 +85,5 @@ private static bool ValidatePreviewGuid(object value)
 
             return query.HasResults();
         }
-
-
-        private static void ValidateCacheItem(HttpContext context, object data, ref HttpValidationStatus status)
-        {
-            if (context.Kentico().Preview().Enabled)
-            {
-                status = HttpValidationStatus.IgnoreThisRequest;
-            }
-        }
     }
 }

src/Kentico.Content.Web.Mvc/Preview/PreviewOutputCacheFilter.cs

@@ -0,0 +1,32 @@
+using System.Web;
+using System.Web.Mvc;
+
+using Kentico.Web.Mvc;
+
+namespace Kentico.Content.Web.Mvc
+{
+    /// <summary>
+    /// Adds validation callback for the output cache item to ignore it in a preview mode.
+    /// </summary>
+    internal class PreviewOutputCacheFilter : ActionFilterAttribute
+    {
+        public override void OnActionExecuting(ActionExecutingContext filterContext)
+        {
+            var context = filterContext.HttpContext;
+
+            if (!context.Kentico().Preview().Enabled)
+            {
+                context.Response.Cache.AddValidationCallback(new HttpCacheValidateHandler(ValidateCacheItem), null);
+            }
+        }
+
+
+        private static void ValidateCacheItem(HttpContext context, object data, ref HttpValidationStatus status)
+        {
+            if (context.Kentico().Preview().Enabled)
+            {
+                status = HttpValidationStatus.IgnoreThisRequest;
+            }
+        }
+    }
+}