From 467dec4d63707d4969ff8c79af26294bde3a0788 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Jan 2022 21:34:49 +0100 Subject: [PATCH] Use code from library. --- .../src/Squidex/Areas/Api/Views/Shared/Docs.cshtml | 2 ++ backend/src/Squidex/Areas/Frontend/Startup.cs | 12 +----------- .../Areas/IdentityServer/Views/_Layout.cshtml | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/backend/src/Squidex/Areas/Api/Views/Shared/Docs.cshtml b/backend/src/Squidex/Areas/Api/Views/Shared/Docs.cshtml index ecf928ff9..681c0b681 100644 --- a/backend/src/Squidex/Areas/Api/Views/Shared/Docs.cshtml +++ b/backend/src/Squidex/Areas/Api/Views/Shared/Docs.cshtml @@ -8,6 +8,8 @@ API Docs + + diff --git a/backend/src/Squidex/Areas/Frontend/Startup.cs b/backend/src/Squidex/Areas/Frontend/Startup.cs index 220aae6a6..9f2baee10 100644 --- a/backend/src/Squidex/Areas/Frontend/Startup.cs +++ b/backend/src/Squidex/Areas/Frontend/Startup.cs @@ -42,7 +42,7 @@ namespace Squidex.Areas.Frontend builder.UseMiddleware(); }); - app.UseWhen(c => c.IsHtmlPath(), builder => + app.UseWhen(c => c.IsSpaFile() || c.IsHtmlPath(), builder => { // Adjust the base for all potential html files. builder.UseHtmlTransform(new HtmlTransformOptions @@ -107,15 +107,5 @@ namespace Squidex.Areas.Frontend { return context.Request.Path.StartsWithSegments("/ws", StringComparison.OrdinalIgnoreCase); } - - private static bool IsHtmlPath(this HttpContext context) - { - return context.IsSpaFile() || context.IsHtml(); - } - - private static bool IsHtml(this HttpContext context) - { - return context.Request.Path.Value?.Contains(".html", StringComparison.OrdinalIgnoreCase) == true; - } } } diff --git a/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml b/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml index 8161f83f2..724596e5d 100644 --- a/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml +++ b/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml @@ -1,7 +1,7 @@  - +