From fc8149dcca75bf631091a78161d3a0ee95de3266 Mon Sep 17 00:00:00 2001
From: Ben Parsons <9parsonsb@gmail.com>
Date: Sun, 5 May 2024 23:02:48 +1000
Subject: [PATCH] Fix Dev Proxy Setup User Secrets for config

---
 Pulsar/Features/Status/StatusController.cs |  2 +-
 Pulsar/Program.cs                          | 35 +++++++++++++++++-----
 Pulsar/Pulsar.csproj                       |  2 +-
 Pulsar/PulsarConfiguration.cs              |  3 ++
 Pulsar/WebApp/src/routes/+page.svelte      |  2 +-
 Pulsar/appsettings.development.json        |  6 ++--
 Pulsar/appsettings.json                    |  3 +-
 7 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/Pulsar/Features/Status/StatusController.cs b/Pulsar/Features/Status/StatusController.cs
index dd4ba85..6b0accc 100644
--- a/Pulsar/Features/Status/StatusController.cs
+++ b/Pulsar/Features/Status/StatusController.cs
@@ -7,6 +7,6 @@ public class StatusController(IStatusService status) : ControllerBase
     [HttpGet]
     public async Task<IActionResult> Get()
     {
-        return Ok(status.Get());
+        return Ok(await status.Get());
     }
 }
\ No newline at end of file
diff --git a/Pulsar/Program.cs b/Pulsar/Program.cs
index f004158..31ed0dd 100644
--- a/Pulsar/Program.cs
+++ b/Pulsar/Program.cs
@@ -1,8 +1,21 @@
 using Lamar.Microsoft.DependencyInjection;
 using Microsoft.AspNetCore.Cors.Infrastructure;
+using Microsoft.Extensions.FileProviders;
 using Pulsar.Features;
 
-var builder = WebApplication.CreateBuilder(args);
+
+var builder = WebApplication.CreateBuilder(new WebApplicationOptions()
+{
+    Args = args, WebRootPath = "static", ContentRootPath = "WebApp", ApplicationName = "Pulsar", EnvironmentName =
+#if DEBUG
+        "Development"
+    #else
+    "Production"
+#endif 
+    
+});
+
+var currentDirFileProvider = new PhysicalFileProvider(Directory.GetCurrentDirectory());
 
 builder.Host.UseLamar((_, registry) => registry.Scan(scan =>
 {
@@ -10,7 +23,15 @@ builder.Host.UseLamar((_, registry) => registry.Scan(scan =>
     scan.WithDefaultConventions();
     scan.LookForRegistries();
 }));
-builder.Services.AddControllersWithViews();
+
+builder.Configuration.AddJsonFile(currentDirFileProvider,"appsettings.json", optional: false, reloadOnChange: true);
+builder.Configuration.AddJsonFile(currentDirFileProvider, $"appsettings.{builder.Environment.EnvironmentName.ToLowerInvariant()}.json", optional: true, reloadOnChange: true);
+
+builder.Configuration.AddUserSecrets<Program>();
+
+builder.Services.Configure<PulsarConfiguration>(builder.Configuration.GetSection("Pulsar"));
+
+builder.Services.AddControllers();
 builder.Services.AddCors(options =>
 {
     options.AddDefaultPolicy(new CorsPolicy()
@@ -19,22 +40,20 @@ builder.Services.AddCors(options =>
 builder.Services.AddSignalR().AddJsonProtocol(options =>
     options.PayloadSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull);
 builder.Services.AddDbContext<PulsarContext>();
-builder.Services.Configure<PulsarConfiguration>(builder.Configuration.GetSection(nameof(Pulsar)));
 builder.Services.Configure<JsonOptions>(options =>
     options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull);
 builder.Services.AddReverseProxy().LoadFromConfig(builder.Configuration.GetSection("ReverseProxy"));
-builder.Services.AddSpaYarp();
+
+builder.Services.AddHttpForwarder();
 builder.Services.AddHostedService<FileWatcherService>();
 
 var app = builder.Build();
 
+app.UseWebSockets();
 app.UseRouting();
 app.MapReverseProxy();
 app.MapControllers();
-app.MapDefaultControllerRoute();
-app.UseWebSockets();
 app.MapHub<EventsHub>("api/events");
-app.UseSpaYarp();
-app.MapFallbackToFile("index.html");
+app.MapFallbackToFile("index.html").AllowAnonymous();
 
 await app.RunAsync();
\ No newline at end of file
diff --git a/Pulsar/Pulsar.csproj b/Pulsar/Pulsar.csproj
index 09d53a2..84b2b36 100644
--- a/Pulsar/Pulsar.csproj
+++ b/Pulsar/Pulsar.csproj
@@ -9,6 +9,7 @@
         <LangVersion>latest</LangVersion>
         <SpaRoot>WebApp/</SpaRoot>
         <SpaClientUrl>http://localhost:5173</SpaClientUrl>
+        <UserSecretsId>73ec530f-725a-43be-ae2e-b43eeb61cb04</UserSecretsId>
     </PropertyGroup>
     
     <ItemGroup>
@@ -16,7 +17,6 @@
     </ItemGroup>
    
     <ItemGroup>
-      <PackageReference Include="AspNetCore.SpaYarp" Version="2.0.1" />
       <PackageReference Include="Lamar" Version="13.0.3" />
       <PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="13.0.3" />
       <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
diff --git a/Pulsar/PulsarConfiguration.cs b/Pulsar/PulsarConfiguration.cs
index aecab51..a27d45f 100644
--- a/Pulsar/PulsarConfiguration.cs
+++ b/Pulsar/PulsarConfiguration.cs
@@ -1,6 +1,9 @@
+using System.ComponentModel.DataAnnotations;
+
 namespace Pulsar;
 
 public class PulsarConfiguration
 {
+    [Required]
     public string JournalDirectory { get; set; }
 }
\ No newline at end of file
diff --git a/Pulsar/WebApp/src/routes/+page.svelte b/Pulsar/WebApp/src/routes/+page.svelte
index 5401452..63c6147 100644
--- a/Pulsar/WebApp/src/routes/+page.svelte
+++ b/Pulsar/WebApp/src/routes/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import * as signalR from "@microsoft/signalr"
     import {onMount} from "svelte";
-    let x = $state(null);
+    let x: string | null = $state(null);
     let textarea = $state("");
 
     const connection = new signalR.HubConnectionBuilder()
diff --git a/Pulsar/appsettings.development.json b/Pulsar/appsettings.development.json
index 36d4735..00aa50c 100644
--- a/Pulsar/appsettings.development.json
+++ b/Pulsar/appsettings.development.json
@@ -2,9 +2,9 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft": "Warning",
+      "Microsoft": "Information",
       "Microsoft.Hosting.Lifetime": "Information",
-        "Microsoft.AspNetCore": "Debug"
+      "Microsoft.AspNetCore": "Information"
     }
   },
   "ReverseProxy": {
@@ -17,7 +17,7 @@
       }
     },
     "Clusters": {
-      "spaDev": {
+      "spaDevCluster": {
         "Destinations": {
           "spaDevServer": {
             "Address": "http://localhost:5173"
diff --git a/Pulsar/appsettings.json b/Pulsar/appsettings.json
index 1441e6e..53de2f8 100644
--- a/Pulsar/appsettings.json
+++ b/Pulsar/appsettings.json
@@ -1,6 +1,5 @@
 {
   "Pulsar": {
-    // C:\Users\User Name\Saved Games\Frontier Developments\Elite Dangerous\
-    "JournalDirectory": "/home/minijack/Games/lutris/elite-dangerous/drive_c/users/minijack/Saved Games/Frontier Developments/Elite Dangerous/",
+    "JournalDirectory": "C:\\Users\\User Name\\Saved Games\\Frontier Developments\\Elite Dangerous\\"
   }
 }
\ No newline at end of file