Base path got working.

Squidex · Apr 5, 2019 · fbe4c55 · fbe4c55
1 parent 00b82a3
commit fbe4c55
Show file tree

Hide file tree

Showing 21 changed files with 228 additions and 254 deletions.
diff --git a/src/Squidex.Web/ApiController.cs b/src/Squidex.Web/ApiController.cs
@@ -51,7 +51,9 @@ protected ApiController(ICommandBus commandBus)
 
         public override void OnActionExecuting(ActionExecutingContext context)
         {
-            if (!context.HttpContext.Request.PathBase.StartsWithSegments("/api"))
+            var request = context.HttpContext.Request;
+
+            if (!request.PathBase.HasValue || !request.PathBase.Value.EndsWith("/api", StringComparison.OrdinalIgnoreCase))
             {
                 context.Result = new RedirectResult("/");
             }

diff --git a/src/Squidex/Areas/Api/Controllers/ApiController.cs b/src/Squidex/Areas/Api/Controllers/ApiController.cs
diff --git a/src/Squidex/Areas/Api/Controllers/Docs/DocsController.cs b/src/Squidex/Areas/Api/Controllers/Docs/DocsController.cs
@@ -7,6 +7,7 @@
 
 using Microsoft.AspNetCore.Mvc;
 using Squidex.Infrastructure.Commands;
+using Squidex.Web;
 
 namespace Squidex.Areas.Api.Controllers.Docs
 {

diff --git a/src/Squidex/Areas/Frontend/Middlewares/IndexExtensions.cs b/src/Squidex/Areas/Frontend/Middlewares/IndexExtensions.cs
@@ -12,14 +12,14 @@ namespace Squidex.Areas.Frontend.Middlewares
 {
     public static class IndexExtensions
     {
-        public static bool IsIndexHtml(this HttpContext context)
+        public static bool IsIndex(this HttpContext context)
         {
-            return context.IsIndex() && context.IsHtml();
+            return context.Request.Path.Value.EndsWith("/index.html", StringComparison.OrdinalIgnoreCase);
         }
 
-        public static bool IsIndex(this HttpContext context)
+        public static bool IsHtmlPath(this HttpContext context)
         {
-            return context.Request.Path.Value.EndsWith("/index.html", StringComparison.OrdinalIgnoreCase);
+            return context.Request.Path.Value.EndsWith(".html", StringComparison.OrdinalIgnoreCase);
         }
 
         public static bool IsHtml(this HttpContext context)

diff --git a/src/Squidex/Areas/Frontend/Middlewares/IndexMiddleware.cs b/src/Squidex/Areas/Frontend/Middlewares/IndexMiddleware.cs
@@ -25,7 +25,7 @@ public async Task Invoke(HttpContext context)
         {
             var basePath = context.Request.PathBase;
 
-            if (context.IsIndex() && basePath.HasValue)
+            if (context.IsHtmlPath() && basePath.HasValue)
             {
                 var responseBuffer = new MemoryStream();
                 var responseBody = context.Response.Body;
@@ -36,21 +36,14 @@ public async Task Invoke(HttpContext context)
 
                 context.Response.Body = responseBody;
 
-                if (context.Response.StatusCode == 200 && context.IsIndexHtml())
-                {
-                    var response = Encoding.UTF8.GetString(responseBuffer.ToArray());
+                var response = Encoding.UTF8.GetString(responseBuffer.ToArray());
 
-                    response = AdjustBase(response, basePath);
+                response = AdjustBase(response, basePath);
 
-                    context.Response.ContentLength = Encoding.UTF8.GetByteCount(response);
-                    context.Response.Body = responseBody;
+                context.Response.ContentLength = Encoding.UTF8.GetByteCount(response);
+                context.Response.Body = responseBody;
 
-                    await context.Response.WriteAsync(response);
-                }
-                else if (context.Response.StatusCode != 304)
-                {
-                    await responseBuffer.CopyToAsync(responseBody);
-                }
+                await context.Response.WriteAsync(response);
             }
             else
             {

diff --git a/src/Squidex/Areas/Frontend/Middlewares/WebpackMiddleware.cs b/src/Squidex/Areas/Frontend/Middlewares/WebpackMiddleware.cs
@@ -28,7 +28,7 @@ public WebpackMiddleware(RequestDelegate next)
 
         public async Task Invoke(HttpContext context)
         {
-            if (context.IsIndex())
+            if (context.IsHtmlPath())
             {
                 var responseBuffer = new MemoryStream();
                 var responseBody = context.Response.Body;
@@ -39,22 +39,25 @@ public async Task Invoke(HttpContext context)
 
                 context.Response.Body = responseBody;
 
-                if (context.Response.StatusCode == 200 && context.IsIndexHtml())
-                {
-                    var response = Encoding.UTF8.GetString(responseBuffer.ToArray());
+                var response = Encoding.UTF8.GetString(responseBuffer.ToArray());
 
+                if (context.IsIndex())
+                {
                     response = InjectStyles(response);
                     response = InjectScripts(response);
+                }
 
-                    context.Response.ContentLength = Encoding.UTF8.GetByteCount(response);
-                    context.Response.Body = responseBody;
+                var basePath = context.Request.PathBase;
 
-                    await context.Response.WriteAsync(response);
-                }
-                else if (context.Response.StatusCode != 304)
+                if (basePath.HasValue)
                 {
-                    await responseBuffer.CopyToAsync(responseBody);
+                    response = AdjustBase(response, basePath.Value);
                 }
+
+                context.Response.ContentLength = Encoding.UTF8.GetByteCount(response);
+                context.Response.Body = responseBody;
+
+                await context.Response.WriteAsync(response);
             }
             else
             {
@@ -99,5 +102,10 @@ private static string InjectScripts(string response)
 
             return response;
         }
+
+        private static string AdjustBase(string response, string baseUrl)
+        {
+            return response.Replace("<base href=\"/\">", $"<base href=\"{baseUrl}/\">");
+        }
     }
 }
diff --git a/src/Squidex/Areas/IdentityServer/Controllers/IdentityServerController.cs b/src/Squidex/Areas/IdentityServer/Controllers/IdentityServerController.cs
@@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using System;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 
@@ -15,7 +16,9 @@ public abstract class IdentityServerController : Controller
     {
         public override void OnActionExecuting(ActionExecutingContext context)
         {
-            if (!context.HttpContext.Request.PathBase.StartsWithSegments("/identity-server"))
+            var request = context.HttpContext.Request;
+
+            if (!request.PathBase.HasValue || !request.PathBase.Value.EndsWith("/identity-server", StringComparison.OrdinalIgnoreCase))
             {
                 context.Result = new NotFoundResult();
             }

diff --git a/src/Squidex/app-config/webpack.config.js b/src/Squidex/app-config/webpack.config.js
@@ -9,6 +9,8 @@ const plugins = {
     TsconfigPathsPlugin: require('tsconfig-paths-webpack-plugin')
 };
 
+const isDevServer = path.basename(require.main.filename) === 'webpack-dev-server.js';
+
 module.exports = {
     /**
      * Options affecting the resolving of modules.
@@ -83,16 +85,22 @@ module.exports = {
         }, {
             test: /\.(woff|woff2|ttf|eot)(\?.*$|$)/,
             use: [{
-                loader: 'file-loader?name=assets/[name].[hash].[ext]',
+                loader: 'file-loader?name=[name].[hash].[ext]',
                 options: {
-                    publicPath: 'assets/',
-                    outputPath: 'assets'
+                    outputPath: 'assets', 
+                    /*
+                     * Use custom public path as ./ is not supported by fonts.
+                     */
+                    publicPath: isDevServer ? undefined : 'assets'
                 }
             }]
         }, {
             test: /\.(png|jpe?g|gif|svg|ico)(\?.*$|$)/,
             use: [{
-                loader: 'file-loader?name=assets/[name].[hash].[ext]'
+                loader: 'file-loader?name=[name].[hash].[ext]',
+                options: {
+                    outputPath: 'assets'
+                }
             }]
         }, {
             test: /\.css$/,

diff --git a/src/Squidex/app-config/webpack.run.base.js b/src/Squidex/app-config/webpack.run.base.js
@@ -28,7 +28,7 @@ module.exports = webpackMerge(commonConfig, {
         }),
 
         new plugins.HtmlWebpackPlugin({
-            template: 'wwwroot/theme.html', hash: true, chunksSortMode: 'none', filename: 'theme.html'
+            template: 'wwwroot/_theme.html', hash: true, chunksSortMode: 'none', filename: 'theme.html'
         })
     ]
 });
diff --git a/src/Squidex/app/app.component.html b/src/Squidex/app/app.component.html
@@ -3,7 +3,7 @@
         <sqx-dialog-renderer>
             <router-outlet (activate)="isLoaded = true">
                 <div class="loading" *ngIf="!isLoaded">
-                    <img alt="Loading" src="/images/loader.gif" />
+                    <img alt="Loading" src="./images/loader.gif" />
 
                     <div>Loading Squidex</div>
                 </div>

diff --git a/src/Squidex/app/app.module.ts b/src/Squidex/app/app.module.ts
@@ -32,7 +32,22 @@ import { SqxShellModule } from './shell';
 import { routing } from './app.routes';
 
 export function configApiUrl() {
-    return new ApiUrlConfig(window.location.protocol + '//' + window.location.host + '/');
+    let bases = document.getElementsByTagName('base');
+    let baseHref = null;
+
+    if (bases.length > 0) {
+        baseHref = bases[0].href;
+    }
+
+    if (!baseHref) {
+        baseHref = '/';
+    }
+
+    if (baseHref.indexOf(window.location.protocol) === 0) {
+        return new ApiUrlConfig(baseHref);
+    } else {
+        return new ApiUrlConfig(window.location.protocol + '//' + window.location.host + baseHref);
+    }
 }
 
 export function configTitles() {

diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.html b/src/Squidex/app/features/apps/pages/apps-page.component.html
@@ -30,7 +30,7 @@ <h4 class="card-title">{{app.name}}</h4>
     <div class="card card-template card-href" (click)="createNewApp('')">
         <div class="card-body">
             <div class="card-image">
-                <img src="/images/add-app.png" />
+                <img src="./images/add-app.png" />
             </div>
 
             <h4 class="card-title">New App</h4>
@@ -44,7 +44,7 @@ <h4 class="card-title">New App</h4>
     <div class="card card-template card-href" (click)="createNewApp('Blog')">
         <div class="card-body">
             <div class="card-image">
-                <img src="/images/add-blog.png" />
+                <img src="./images/add-blog.png" />
             </div>
 
             <h4 class="card-title">New Blog Sample</h4>
@@ -61,7 +61,7 @@ <h4 class="card-title">New Blog Sample</h4>
     <div class="card card-template card-href" (click)="createNewApp('Profile')">
         <div class="card-body">
             <div class="card-image">
-                <img src="/images/add-profile.png" />
+                <img src="./images/add-profile.png" />
             </div>
 
             <h4 class="card-title">New Profile Sample</h4>
@@ -78,7 +78,7 @@ <h4 class="card-title">New Profile Sample</h4>
     <div class="card card-template card-href" (click)="createNewApp('Identity')">
         <div class="card-body">
             <div class="card-image">
-                <img src="/images/add-identity.png" />
+                <img src="./images/add-identity.png" />
             </div>
 
             <h4 class="card-title">New Identity App</h4>

diff --git a/src/Squidex/app/features/apps/pages/onboarding-dialog.component.html b/src/Squidex/app/features/apps/pages/onboarding-dialog.component.html
@@ -3,7 +3,7 @@
         <a class="header-right modal-close" (click)="emitClose()">Skip Tour</a>
 
         <div class="onboarding-step" *ngIf="step === 0">
-            <img @fade class="header-left" src="/images/logo-white-small.png" />
+            <img @fade class="header-left" src="./images/logo-white-small.png" />
 
             <div @slide class="onboarding-enter-leave">
                 <h1>Welcome to <span class="header-focus">Squidex CMS</span></h1>
@@ -34,7 +34,7 @@ <h1 @fade class="header-left header-focus">Apps</h1>
                         </div>
                     </div>
                     <div class="col col-image">
-                        <img src="/images/onboarding-step1.png" />
+                        <img src="./images/onboarding-step1.png" />
                     </div>
                 </div>
 
@@ -59,7 +59,7 @@ <h1 @fade class="header-left header-focus">Schemas</h1>
                         </div>
                     </div>
                     <div class="col col-image">
-                        <img src="/images/onboarding-step2.png" />
+                        <img src="./images/onboarding-step2.png" />
                     </div>
                 </div>
 
@@ -84,7 +84,7 @@ <h1 @fade class="header-left header-focus">Contents</h1>
                         </div>
                     </div>
                     <div class="col col-image">
-                        <img src="/images/onboarding-step3.png" />
+                        <img src="./images/onboarding-step3.png" />
                     </div>
                 </div>
 
@@ -109,7 +109,7 @@ <h1 @fade class="header-left header-focus">Assets</h1>
                         </div>
                     </div>
                     <div class="col col-image">
-                        <img src="/images/onboarding-step4.png" />
+                        <img src="./images/onboarding-step4.png" />
                     </div>
                 </div>
 
@@ -119,7 +119,7 @@ <h1 @fade class="header-left header-focus">Assets</h1>
             </div>
         </div>
         <div class="onboarding-step" *ngIf="step === 5">
-            <img @fade class="header-left" src="/images/logo-white-small.png" />
+            <img @fade class="header-left" src="./images/logo-white-small.png" />
 
             <div @slide class="onboarding-enter-leave">
                 <h1>Awesome, now you know the basics!</h1>

diff --git a/src/Squidex/app/features/apps/pages/onboarding-dialog.component.scss b/src/Squidex/app/features/apps/pages/onboarding-dialog.component.scss
@@ -31,7 +31,7 @@ p {
     &-content {
         color: $color-dark-foreground;
         background-color: $color-dark-onboarding;
-        background-image: url('/images/onboarding-background.png');
+        background-image: url('./images/onboarding-background.png');
         position: relative;
     }