KSP/graf-uloh
Archived
37
1
Fork 0
Code Issues 20 Pull requests Releases Wiki Activity

Switch frontend to using dotnet proxy project

Browse source
This commit is contained in:
Standa Lukeš 2020-09-27 09:26:28 +00:00
parent 8ba2cf383d
commit 50a6864c12
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frontend/package.json
View file

@ -4,7 +4,8 @@
"scripts": { "scripts": {
"build": "rollup -c", "build": "rollup -c",
"dev": "rollup -c -w", "dev": "rollup -c -w",
"start": "sirv public", "start": "dotnet run --project ../server/Ksp.WebServer",
"start-sirv": "sirv public",
"validate": "svelte-check" "validate": "svelte-check"
}, },
"devDependencies": { "devDependencies": {

0
frontend/public/index.html → frontend/public/grafik.html
View file

15
server/Ksp.WebServer/Startup.cs
View file

@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.HttpsPolicy; using Microsoft.AspNetCore.HttpsPolicy;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Rewrite;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.FileProviders;
@ -64,6 +65,10 @@ namespace Ksp.WebServer
endpoints.MapControllers(); endpoints.MapControllers();
}); });
app.UseRewriter(new RewriteOptions()
.AddRewrite("^grafik$", "grafik.html", true)
);
app.UseStaticFiles(new StaticFileOptions { app.UseStaticFiles(new StaticFileOptions {
FileProvider = new PhysicalFileProvider( FileProvider = new PhysicalFileProvider(
Path.Combine(env.ContentRootPath, "../../frontend/public")), Path.Combine(env.ContentRootPath, "../../frontend/public")),
@ -76,7 +81,7 @@ namespace Ksp.WebServer
}, opt => { }, opt => {
opt.WithHttpClientName("RedirectClient"); opt.WithHttpClientName("RedirectClient");
opt.WithBeforeSend(async (cx, request) => { opt.WithBeforeSend((cx, request) => {
request.Headers.Authorization = request.Headers.Authorization =
new AuthenticationHeaderValue("Basic", "SECRET"); new AuthenticationHeaderValue("Basic", "SECRET");
if (request.Headers.Referrer is object) if (request.Headers.Referrer is object)
@ -92,10 +97,11 @@ namespace Ksp.WebServer
// request.Headers.Remove("Forwarded"); // request.Headers.Remove("Forwarded");
// request.Headers.Remove("Origin"); // request.Headers.Remove("Origin");
// request.Headers.Add("Origin", "https://ksp-test.ks.matfyz.cz"); // request.Headers.Add("Origin", "https://ksp-test.ks.matfyz.cz");
Console.WriteLine(request); // Console.WriteLine(request);
return Task.CompletedTask;
}); });
opt.WithAfterReceive(async (cx, response) => { opt.WithAfterReceive((cx, response) => {
Console.WriteLine(response); // Console.WriteLine(response);
if (response.Headers.Location is object && response.Headers.Location.Host == "ksp-test.ks.matfyz.cz") if (response.Headers.Location is object && response.Headers.Location.Host == "ksp-test.ks.matfyz.cz")
{ {
response.Headers.Location = new UriBuilder(response.Headers.Location) { response.Headers.Location = new UriBuilder(response.Headers.Location) {
@ -112,6 +118,7 @@ namespace Ksp.WebServer
.Replace("; domain=ksp-test.ks.matfyz.cz", $"; domain={cx.Request.Host.Host}") .Replace("; domain=ksp-test.ks.matfyz.cz", $"; domain={cx.Request.Host.Host}")
)); ));
} }
return Task.CompletedTask;
}); });
})); }));
} }