From aabbbc1fea15ffadae1dc49f24bc2aae298fd9cf Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 15 Jun 2026 00:11:48 +0100
Subject: [PATCH] use the helper

---
 .vscode/launch.json                       | 5 ++++-
 src/Yavsc.Api/Program.cs                  | 6 ++----
 src/Yavsc.Blogs/Program.cs                | 5 +----
 src/Yavsc.Org/Program.cs                  | 6 ++----
 src/Yavsc.Server/Helpers/ConfigHelpers.cs | 7 +++----
 src/cli/Program.cs                        | 2 +-
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 4cb9832b..f4c45bd6 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -46,7 +46,10 @@
             "name": "C#: Yavsc.Org Debug",
             "type": "dotnet",
             "request": "launch",
-            "projectPath": "${workspaceFolder}/src/Yavsc.Org/Yavsc.Org.csproj"
+            "projectPath": "${workspaceFolder}/src/Yavsc.Org/Yavsc.Org.csproj",
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            }
         },
         {
             "name": "Yavsc.Org",
diff --git a/src/Yavsc.Api/Program.cs b/src/Yavsc.Api/Program.cs
index 509bd887..7dea9e5b 100644
--- a/src/Yavsc.Api/Program.cs
+++ b/src/Yavsc.Api/Program.cs
@@ -19,6 +19,7 @@ using Yavsc.Abstract.Interfaces;
 using Yavsc.Helpers;
 using Yavsc.Interface;
 using Yavsc.Models;
+using Yavsc.Server.Helpers;
 using Yavsc.Services;
 
 internal class Program
@@ -29,10 +30,7 @@ internal class Program
 
         var builder = WebApplication.CreateBuilder(args);
 
-        builder.Configuration
-            .AddJsonFile("appsettings-api.json", optional: false, reloadOnChange: false)
-            .AddJsonFile($"appsettings-api.{builder.Environment.EnvironmentName}.json", optional: false, reloadOnChange: false)
-            .AddEnvironmentVariables();
+        builder.AddConfiguration("api");
         var services = builder.Services;
 
         // Anthropic client
diff --git a/src/Yavsc.Blogs/Program.cs b/src/Yavsc.Blogs/Program.cs
index 2a3ab0ce..78150f79 100644
--- a/src/Yavsc.Blogs/Program.cs
+++ b/src/Yavsc.Blogs/Program.cs
@@ -29,10 +29,7 @@ internal class Program
         Console.Title = "Yavsc.Blogs";
 
         var builder = WebApplication.CreateBuilder(args);
-        builder.Configuration
-            .AddJsonFile("appsettings-blogs.json", optional: false, reloadOnChange: false)
-            .AddJsonFile($"appsettings-blogs.{builder.Environment.EnvironmentName}.json", optional: false, reloadOnChange: false)
-            .AddEnvironmentVariables();
+        builder.AddConfiguration("blogs");
             
         var services = builder.Services;
 
diff --git a/src/Yavsc.Org/Program.cs b/src/Yavsc.Org/Program.cs
index 8ffcf3dc..2f74616c 100644
--- a/src/Yavsc.Org/Program.cs
+++ b/src/Yavsc.Org/Program.cs
@@ -1,6 +1,7 @@
 using Anthropic.SDK;
 using Yavsc.Abstract.Interfaces;
 using Yavsc.Extensions;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc
 {
@@ -9,10 +10,7 @@ namespace Yavsc
         public static async Task Main(string[] args)
         {
             var builder = WebApplication.CreateBuilder(args);
-            builder.Configuration
-                .AddJsonFile("appsettings-org.json", optional: false, reloadOnChange: false)
-                .AddJsonFile($"appsettings-org.{builder.Environment.EnvironmentName}.json", optional: false, reloadOnChange: false)
-                .AddEnvironmentVariables();
+            builder.AddConfiguration("org");
             var app = await builder
                 .ConfigureWebAppServices()
                 .ConfigurePipeline();
diff --git a/src/Yavsc.Server/Helpers/ConfigHelpers.cs b/src/Yavsc.Server/Helpers/ConfigHelpers.cs
index 37b76227..cbb2e4c4 100644
--- a/src/Yavsc.Server/Helpers/ConfigHelpers.cs
+++ b/src/Yavsc.Server/Helpers/ConfigHelpers.cs
@@ -8,11 +8,10 @@ public static class ConfigHelpers
     public static IConfigurationBuilder AddConfiguration(this WebApplicationBuilder builder, string appName )
         {
             var rootConfig = builder.Configuration
-                            .AddJsonFile($"appsettings-{appName}.json", optional: false, reloadOnChange: false);
+                 .AddJsonFile($"appsettings-{appName}.json", optional: false, reloadOnChange: false);
 
-            if (!String.IsNullOrWhiteSpace(builder.Environment.EnvironmentName))
-                rootConfig.AddJsonFile($"appsettings-{appName}.{builder.Environment.EnvironmentName}.json", optional: true, reloadOnChange: false);
-            ;
+            rootConfig.AddJsonFile($"appsettings-{appName}.{builder.Environment.EnvironmentName}.json", optional: true, reloadOnChange: false);
+            
             return rootConfig.AddEnvironmentVariables();
         }
 }
\ No newline at end of file
diff --git a/src/cli/Program.cs b/src/cli/Program.cs
index 0910ce7a..aeb573b1 100644
--- a/src/cli/Program.cs
+++ b/src/cli/Program.cs
@@ -14,7 +14,7 @@ internal class Program
         HostApplicationBuilder builder = Host.CreateApplicationBuilder(args);
          builder.Configuration
                 .AddJsonFile("appsettings-cli.json", optional: false, reloadOnChange: false)
-                .AddJsonFile($"appsettings-cli.{builder.Environment.EnvironmentName}.json", optional: false, reloadOnChange: false)
+                .AddJsonFile($"appsettings-cli.{builder.Environment.EnvironmentName}.json", optional: true, reloadOnChange: false)
                 .AddEnvironmentVariables();
             
         AppHost = builder.Build();