From 2833ad9a621d82cfef5be3868f89c9b2db436cf6 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 24 Dec 2019 13:59:11 -0500
Subject: fix log parser & JSON validator showing relative share URL

---
 src/SMAPI.Web/Framework/Extensions.cs          | 14 ++++++++++++--
 src/SMAPI.Web/Views/JsonValidator/Index.cshtml |  2 +-
 src/SMAPI.Web/Views/LogParser/Index.cshtml     |  6 ++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/SMAPI.Web/Framework/Extensions.cs b/src/SMAPI.Web/Framework/Extensions.cs
index d7707924..e0da1424 100644
--- a/src/SMAPI.Web/Framework/Extensions.cs
+++ b/src/SMAPI.Web/Framework/Extensions.cs
@@ -1,4 +1,6 @@
+using System;
 using JetBrains.Annotations;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 
@@ -12,8 +14,9 @@ namespace StardewModdingAPI.Web.Framework
         /// <param name="action">The name of the action method.</param>
         /// <param name="controller">The name of the controller.</param>
         /// <param name="values">An object that contains route values.</param>
+        /// <param name="absoluteUrl">Get an absolute URL instead of a server-relative path/</param>
         /// <returns>The generated URL.</returns>
-        public static string PlainAction(this IUrlHelper helper, [AspMvcAction] string action, [AspMvcController] string controller, object values = null)
+        public static string PlainAction(this IUrlHelper helper, [AspMvcAction] string action, [AspMvcController] string controller, object values = null, bool absoluteUrl = false)
         {
             RouteValueDictionary valuesDict = new RouteValueDictionary(values);
             foreach (var value in helper.ActionContext.RouteData.Values)
@@ -22,7 +25,14 @@ namespace StardewModdingAPI.Web.Framework
                     valuesDict[value.Key] = null; // explicitly remove it from the URL
             }
 
-            return helper.Action(action, controller, valuesDict);
+            string url = helper.Action(action, controller, valuesDict);
+            if (absoluteUrl)
+            {
+                HttpRequest request = helper.ActionContext.HttpContext.Request;
+                Uri baseUri = new Uri($"{request.Scheme}://{request.Host}");
+                url = new Uri(baseUri, url).ToString();
+            }
+            return url;
         }
     }
 }
diff --git a/src/SMAPI.Web/Views/JsonValidator/Index.cshtml b/src/SMAPI.Web/Views/JsonValidator/Index.cshtml
index fb43823a..f3696578 100644
--- a/src/SMAPI.Web/Views/JsonValidator/Index.cshtml
+++ b/src/SMAPI.Web/Views/JsonValidator/Index.cshtml
@@ -5,7 +5,7 @@
 
 @{
     // get view data
-    string curPageUrl = this.Url.PlainAction("Index", "JsonValidator", new { schemaName = Model.SchemaName, id = Model.PasteID });
+    string curPageUrl = this.Url.PlainAction("Index", "JsonValidator", new { schemaName = Model.SchemaName, id = Model.PasteID }, absoluteUrl: true);
     string newUploadUrl = this.Url.PlainAction("Index", "JsonValidator", new { schemaName = Model.SchemaName });
     string schemaDisplayName = null;
     bool isValidSchema = Model.SchemaName != null && Model.SchemaFormats.TryGetValue(Model.SchemaName, out schemaDisplayName) && schemaDisplayName?.ToLower() != "none";
diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index ac951564..87c7f918 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -13,6 +13,8 @@
         .Cast<LogLevel>()
         .ToDictionary(level => level.ToString().ToLower(), level => level != LogLevel.Trace);
     JsonSerializerSettings noFormatting = new JsonSerializerSettings { Formatting = Formatting.None };
+
+    string curPageUrl = this.Url.PlainAction("Index", "LogParser", new { id = Model.PasteID }, absoluteUrl: true);
 }
 
 @section Head {
@@ -50,7 +52,7 @@ else if (Model.ParseError != null)
 {
     <div class="banner error" v-pre>
         <strong>Oops, couldn't parse that log. (Make sure you upload the log file, not the console text.)</strong><br />
-        Share this URL when asking for help: <code>https://@this.Context.Request.Host.ToUriComponent()@this.Url.PlainAction("Index", "LogParser", new { id = Model.PasteID }))</code><br />
+        Share this URL when asking for help: <code>@curPageUrl</code><br />
         (Or <a href="@this.Url.PlainAction("Index", "LogParser", values: null)">upload a new log</a>.)<br />
         <br />
         <small v-pre>Error details: @Model.ParseError</small>
@@ -59,7 +61,7 @@ else if (Model.ParseError != null)
 else if (Model.ParsedLog?.IsValid == true)
 {
     <div class="banner success" v-pre>
-        <strong>Share this link to let someone else see the log:</strong> <code>https://@this.Context.Request.Host.ToUriComponent()@this.Url.PlainAction("Index", "LogParser", new { id = Model.PasteID })</code><br />
+        <strong>Share this link to let someone else see the log:</strong> <code>@curPageUrl</code><br />
         (Or <a href="@this.Url.PlainAction("Index", "LogParser", values: null)">upload a new log</a>.)
     </div>
 }
-- 
cgit