From 05b2e1ed0822072b0cd66ec29850aa518ee65081 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Sun, 17 Mar 2019 18:43:20 +0100
Subject: [PATCH] Root url.

---
 .../Controllers/Account/AccountController.cs  |  7 +++
 src/Squidex/Areas/IdentityServer/Startup.cs   |  1 -
 .../Views/Account/AccessDenied.cshtml         |  2 +-
 .../Views/Account/LockedOut.cshtml            |  4 +-
 .../Views/Account/LogoutCompleted.cshtml      |  2 +-
 .../IdentityServer/Views/Error/Error.cshtml   |  2 +-
 .../Areas/IdentityServer/Views/Extensions.cs  | 44 +++++++++++++++++++
 .../Views/Profile/Profile.cshtml              |  2 +-
 .../Areas/IdentityServer/Views/_Layout.cshtml |  4 +-
 .../IdentityServer/Views/_ViewImports.cshtml  |  1 +
 10 files changed, 60 insertions(+), 9 deletions(-)
 create mode 100644 src/Squidex/Areas/IdentityServer/Views/Extensions.cs

diff --git a/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs b/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs
index a7da10ccb..bb95b1cdf 100644
--- a/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs
+++ b/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs
@@ -57,6 +57,13 @@ namespace Squidex.Areas.IdentityServer.Controllers.Account
             this.signInManager = signInManager;
         }
 
+        [HttpGet]
+        [Route("account/error/")]
+        public IActionResult LoginError()
+        {
+            throw new InvalidOperationException();
+        }
+
         [HttpGet]
         [Route("account/forbidden/")]
         public IActionResult Forbidden()
diff --git a/src/Squidex/Areas/IdentityServer/Startup.cs b/src/Squidex/Areas/IdentityServer/Startup.cs
index 632a7cbab..e98f0aff3 100644
--- a/src/Squidex/Areas/IdentityServer/Startup.cs
+++ b/src/Squidex/Areas/IdentityServer/Startup.cs
@@ -34,7 +34,6 @@ namespace Squidex.Areas.IdentityServer
 
                 identityApp.UseMyIdentityServer();
 
-                identityApp.UseStaticFiles();
                 identityApp.UseMvc();
             });
         }
diff --git a/src/Squidex/Areas/IdentityServer/Views/Account/AccessDenied.cshtml b/src/Squidex/Areas/IdentityServer/Views/Account/AccessDenied.cshtml
index b4e05a554..16aef5862 100644
--- a/src/Squidex/Areas/IdentityServer/Views/Account/AccessDenied.cshtml
+++ b/src/Squidex/Areas/IdentityServer/Views/Account/AccessDenied.cshtml
@@ -3,7 +3,7 @@
     ViewBag.Title = "Account locked";
 }
 
-<img class="splash-image" src="~/../squid.svg?title=STOP%20HERE&text=You%20shall%20not%20pass!" />
+<img class="splash-image" src="@Url.RootContentUrl("~/squid.svg?title=STOP%20HERE&text=You%20shall%20not%20pass!")" />
 
 <h1 class="splash-h1">Access denied</h1>
 
diff --git a/src/Squidex/Areas/IdentityServer/Views/Account/LockedOut.cshtml b/src/Squidex/Areas/IdentityServer/Views/Account/LockedOut.cshtml
index 2d36fa027..69afd0b6c 100644
--- a/src/Squidex/Areas/IdentityServer/Views/Account/LockedOut.cshtml
+++ b/src/Squidex/Areas/IdentityServer/Views/Account/LockedOut.cshtml
@@ -2,7 +2,7 @@
     ViewBag.Title = "Account locked";
 }
 
-<img class="splash-image" src="~/../squid.svg?title=STOP HERE&text=You%20shall%20not%20pass!" />
+<img class="splash-image" src="@Url.RootContentUrl("~/squid.svg?title=STOP HERE&text=You%20shall%20not%20pass!")" />
 
 <h1 class="splash-h1">Account locked</h1>
 
@@ -11,5 +11,5 @@
 </p>
 
 <p class="splash-text">
-    <a href="~/account/logout-redirect">Logout</a>
+    <a asp-controller="Account" asp-action="LogoutRedirect">Logout</a>
 </p>
\ No newline at end of file
diff --git a/src/Squidex/Areas/IdentityServer/Views/Account/LogoutCompleted.cshtml b/src/Squidex/Areas/IdentityServer/Views/Account/LogoutCompleted.cshtml
index 06b3fee6b..ca6b6702d 100644
--- a/src/Squidex/Areas/IdentityServer/Views/Account/LogoutCompleted.cshtml
+++ b/src/Squidex/Areas/IdentityServer/Views/Account/LogoutCompleted.cshtml
@@ -2,7 +2,7 @@
     ViewBag.Title = "Logout";
 }
 
-<img class="splash-image" src="~/../squid.svg?title=BYE%20BYE&text=Hope%20to%20see%20you%20again%20soon!&face=happy" />
+<img class="splash-image" src="@Url.Content("~/squid.svg?title=BYE%20BYE&text=Hope%20to%20see%20you%20again%20soon!&face=happy")" />
 
 <h1 class="splash-h1">Logged out!</h1>
 
diff --git a/src/Squidex/Areas/IdentityServer/Views/Error/Error.cshtml b/src/Squidex/Areas/IdentityServer/Views/Error/Error.cshtml
index a95e9f67e..9d5d18176 100644
--- a/src/Squidex/Areas/IdentityServer/Views/Error/Error.cshtml
+++ b/src/Squidex/Areas/IdentityServer/Views/Error/Error.cshtml
@@ -4,7 +4,7 @@
     ViewBag.Title = "Error";
 }
 
-<img class="splash-image" src="~/../squid.svg?title=OH%20DAMN&text=I%20am%20sorry%2C%20that%20something%20went%20wrong" />
+<img class="splash-image" src="@Url.RootContentUrl("~/squid.svg?title=OH%20DAMN&text=I%20am%20sorry%2C%20that%20something%20went%20wrong")" />
 
 <h1 class="splash-h1">Operation failed</h1>
 
diff --git a/src/Squidex/Areas/IdentityServer/Views/Extensions.cs b/src/Squidex/Areas/IdentityServer/Views/Extensions.cs
new file mode 100644
index 000000000..814f9fb2a
--- /dev/null
+++ b/src/Squidex/Areas/IdentityServer/Views/Extensions.cs
@@ -0,0 +1,44 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Squidex.Areas.IdentityServer.Views
+{
+    public static class Extensions
+    {
+        public static string RootContentUrl(this IUrlHelper urlHelper, string contentPath)
+        {
+            if (string.IsNullOrEmpty(contentPath))
+            {
+                return null;
+            }
+
+            if (contentPath[0] == '~')
+            {
+                var segment = new PathString(contentPath.Substring(1));
+
+                var applicationPath = urlHelper.ActionContext.HttpContext.Request.PathBase;
+
+                if (applicationPath.HasValue)
+                {
+                    var indexOfLastPart = applicationPath.Value.LastIndexOf('/');
+
+                    if (indexOfLastPart >= 0)
+                    {
+                        applicationPath = applicationPath.Value.Substring(0, indexOfLastPart);
+                    }
+                }
+
+                return applicationPath.Add(segment).Value;
+            }
+
+            return contentPath;
+        }
+    }
+}
diff --git a/src/Squidex/Areas/IdentityServer/Views/Profile/Profile.cshtml b/src/Squidex/Areas/IdentityServer/Views/Profile/Profile.cshtml
index 92cd1bd07..bba833687 100644
--- a/src/Squidex/Areas/IdentityServer/Views/Profile/Profile.cshtml
+++ b/src/Squidex/Areas/IdentityServer/Views/Profile/Profile.cshtml
@@ -26,7 +26,7 @@
     
 <div class="row profile-section">
     <div class="col profile-picture-col">
-        <img class="profile-picture" src="@Url.Content($"~/../api/users/{Model.Id}/picture/")" />
+        <img class="profile-picture" src="@Url.RootContentUrl($"~/api/users/{Model.Id}/picture/")" />
     </div>
     <div class="col">
         <form id="pictureForm" class="profile-picture-form" asp-controller="Profile" asp-action="UploadPicture" method="post" enctype="multipart/form-data">
diff --git a/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml b/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml
index 8d4af3196..2760c2247 100644
--- a/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml
+++ b/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml
@@ -9,7 +9,7 @@
     <title>@ViewBag.Title - Squidex Headless CMS</title>
 
     <environment names="Production">
-        <link rel="stylesheet" asp-append-version="true" href="~/build/app.css" />
+        <link rel="stylesheet" asp-append-version="true" href="@Url.RootContentUrl("~/build/app.css")" />
     </environment>
     
     @if (IsSectionDefined("header"))
@@ -19,7 +19,7 @@
 </head>
 <body class="white">
     <div class="profile @ViewBag.Class">
-        <img class="profile-logo" src="~/images/logo-small.png" />
+        <img class="profile-logo" src="@Url.RootContentUrl("~/images/logo-small.png")" />
 
         @RenderBody()
     </div>
diff --git a/src/Squidex/Areas/IdentityServer/Views/_ViewImports.cshtml b/src/Squidex/Areas/IdentityServer/Views/_ViewImports.cshtml
index 7b56072b2..084f025ef 100644
--- a/src/Squidex/Areas/IdentityServer/Views/_ViewImports.cshtml
+++ b/src/Squidex/Areas/IdentityServer/Views/_ViewImports.cshtml
@@ -1,3 +1,4 @@
 @using Microsoft.AspNetCore.Identity
+@using Squidex.Areas.IdentityServer.Views;
 
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers