Prerenderer now passes original (unescaped) URL to Node - fixes aspnet#250

SteveSandersonMS · SteveSandersonMS · commit c53bd8f8f613 · 2016-08-16T11:44:55.000-07:00
diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs
@@ -2,13 +2,11 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Extensions;
+using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.NodeServices;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.Extensions.PlatformAbstractions;
 using Newtonsoft.Json;
 
 namespace Microsoft.AspNetCore.SpaServices.Prerendering
@@ -60,7 +58,19 @@ public PrerenderTagHelper(IServiceProvider serviceProvider)
 
 public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
{
+ // We want to pass the original, unencoded incoming URL data through to Node, so that
+ // server-side code has the same view of the URL as client-side code (on the client,
+ // location.pathname returns an unencoded string).
+ // The following logic handles special characters in URL paths in the same way that
+ // Node and client-side JS does. For example, the path "/a=b%20c" gets passed through
+ // unchanged (whereas other .NET APIs do change it - Path.Value will return it as
+ // "/a=b c" and Path.ToString() will return it as "/a%3db%20c")
+ var requestFeature = ViewContext.HttpContext.Features.Get<IHttpRequestFeature>();
+ var unencodedPathAndQuery = requestFeature.RawTarget;
+
 var request = ViewContext.HttpContext.Request;
+ var unencodedAbsoluteUrl = $"{request.Scheme}://{request.Host}{unencodedPathAndQuery}";
+
 var result = await Prerenderer.RenderToString(
 _applicationBasePath,
 _nodeServices,
@@ -69,8 +79,8 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
 ExportName = ExportName,
 WebpackConfig = WebpackConfigPath
 },
- request.GetEncodedUrl(),
- request.Path + request.QueryString.Value,
+ unencodedAbsoluteUrl,
+ unencodedPathAndQuery,
 CustomDataParameter);
 output.Content.SetHtmlContent(result.Html);
 

-Original file line number
+Diff line change
 usingSystem.Text;
 usingSystem.Threading.Tasks;
 usingMicrosoft.AspNetCore.Hosting;
 -usingMicrosoft.AspNetCore.Http;
 -usingMicrosoft.AspNetCore.Http.Extensions;
 +usingMicrosoft.AspNetCore.Http.Features;
 usingMicrosoft.AspNetCore.Mvc.ViewFeatures;
 usingMicrosoft.AspNetCore.Mvc.Rendering;
 usingMicrosoft.AspNetCore.NodeServices;
 usingMicrosoft.AspNetCore.Razor.TagHelpers;
 -usingMicrosoft.Extensions.PlatformAbstractions;
 usingNewtonsoft.Json;
 namespaceMicrosoft.AspNetCore.SpaServices.Prerendering
 publicoverrideasyncTaskProcessAsync(TagHelperContextcontext,TagHelperOutputoutput)
+{
 +// We want to pass the original, unencoded incoming URL data through to Node, so that
 +// server-side code has the same view of the URL as client-side code (on the client,
 +// location.pathname returns an unencoded string).
 +// The following logic handles special characters in URL paths in the same way that
 +// Node and client-side JS does. For example, the path "/a=b%20c" gets passed through
 +// unchanged (whereas other .NET APIs do change it - Path.Value will return it as
 +// "/a=b c" and Path.ToString() will return it as "/a%3db%20c")
 +varrequestFeature=ViewContext.HttpContext.Features.Get<IHttpRequestFeature>();
 +varunencodedPathAndQuery=requestFeature.RawTarget;
++
 varrequest=ViewContext.HttpContext.Request;
 +varunencodedAbsoluteUrl=$"{request.Scheme}://{request.Host}{unencodedPathAndQuery}";
++
 varresult=awaitPrerenderer.RenderToString(
 _applicationBasePath,
 _nodeServices,
 ExportName=ExportName,
 WebpackConfig=WebpackConfigPath
 },
 -request.GetEncodedUrl(),
 -request.Path+request.QueryString.Value,
 +unencodedAbsoluteUrl,
 +unencodedPathAndQuery,
 CustomDataParameter);
 output.Content.SetHtmlContent(result.Html);