Add GenerateAntiForgery() to IHtmlGenerator

Author: dougbu

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

@@ -42,10 +42,10 @@ public AntiForgery([NotNull] IClaimUidExtractor claimUidExtractor,
         /// This method has a side effect:
         /// A response cookie is set if there is no valid cookie associated with the request.
         /// </remarks>
-        public HtmlString GetHtml([NotNull] HttpContext context)
+        public TagBuilder GetHtml([NotNull] HttpContext context)
         {
             var builder = _worker.GetFormInputElement(context);
-            return builder.ToHtmlString(TagRenderMode.SelfClosing);
+            return builder;
         }
 
         /// <summary>

src/Microsoft.AspNet.Mvc.Core/Rendering/Html/DefaultHtmlGenerator.cs

@@ -22,6 +22,7 @@ public class DefaultHtmlGenerator : IHtmlGenerator
         private const string HiddenListItem = @"<li style=""display:none""></li>";
 
         private readonly IActionBindingContextProvider _actionBindingContextProvider;
+        private readonly AntiForgery _antiForgery;
         private readonly IModelMetadataProvider _metadataProvider;
         private readonly IUrlHelper _urlHelper;
 
@@ -32,10 +33,12 @@ public class DefaultHtmlGenerator : IHtmlGenerator
         /// </summary>
         public DefaultHtmlGenerator(
             [NotNull] IActionBindingContextProvider actionBindingContextProvider,
+            [NotNull] AntiForgery antiForgery,
             [NotNull] IModelMetadataProvider metadataProvider,
             [NotNull] IUrlHelper urlHelper)
         {
             _actionBindingContextProvider = actionBindingContextProvider;
+            _antiForgery = antiForgery;
             _metadataProvider = metadataProvider;
             _urlHelper = urlHelper;
         }
@@ -73,6 +76,13 @@ public virtual TagBuilder GenerateActionLink(
             return GenerateLink(linkText, url, htmlAttributes);
         }
 
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateAntiForgery([NotNull] ViewContext viewContext)
+        {
+            var tagBuilder = _antiForgery.GetHtml(viewContext.HttpContext);
+            return tagBuilder;
+        }
+
         /// <inheritdoc />
         public virtual TagBuilder GenerateCheckBox(
             [NotNull] ViewContext viewContext,

src/Microsoft.AspNet.Mvc.Core/Rendering/Html/HtmlHelper.cs

@@ -189,7 +189,8 @@ public virtual void Contextualize([NotNull] ViewContext viewContext)
         /// <inheritdoc />
         public HtmlString AntiForgeryToken()
         {
-            return _antiForgeryInstance.GetHtml(ViewContext.HttpContext);
+            var tagBuilder = _antiForgeryInstance.GetHtml(ViewContext.HttpContext);
+            return tagBuilder.ToHtmlString(TagRenderMode.SelfClosing);
         }
 
         /// <inheritdoc />

src/Microsoft.AspNet.Mvc.Core/Rendering/Html/IHtmlGenerator.cs

@@ -38,6 +38,8 @@ TagBuilder GenerateActionLink(
             object routeValues,
             object htmlAttributes);
 
+        TagBuilder GenerateAntiForgery([NotNull] ViewContext viewContext);
+
         TagBuilder GenerateCheckBox(
             [NotNull] ViewContext viewContext,
             ModelMetadata metadata,