From 6d3bd59c80173c312f56971eaca2bfa6bcb51c70 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Fri, 20 Mar 2026 05:52:06 +0000 Subject: [PATCH 1/2] oops :| --- EstateManagementUI.BlazorServer/Program.cs | 30 +++------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/EstateManagementUI.BlazorServer/Program.cs b/EstateManagementUI.BlazorServer/Program.cs index d49f0d52..8c549d35 100644 --- a/EstateManagementUI.BlazorServer/Program.cs +++ b/EstateManagementUI.BlazorServer/Program.cs @@ -7,30 +7,10 @@ using Spectre.Console; using System.IdentityModel.Tokens.Jwt; using System.Reflection; +using Shared.Extensions; WebApplicationBuilder builder = WebApplication.CreateBuilder(args).LoadConfiguration().ConfigureKestrel(); - -//builder.ConfigureAppConfiguration((context, configBuilder) => -//{ -// var env = context.HostingEnvironment; - -// configBuilder.SetBasePath(fi.Directory.FullName) -// .AddJsonFile("hosting.json", optional: true) -// .AddJsonFile($"hosting.{env.EnvironmentName}.json", optional: true) -// .AddJsonFile("/home/txnproc/config/appsettings.json", optional: true, reloadOnChange: true) -// .AddJsonFile($"/home/txnproc/config/appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true) -// .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) -// .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true) -// .AddEnvironmentVariables(); - -// // Build a snapshot of configuration so we can use it immediately (e.g. for Sentry) -// var builtConfig = configBuilder.Build(); - -// // Keep existing static usage (if you must), and initialise the ConfigurationReader now. -// //Startup.Configuration = builtConfig; -// //ConfigurationReader.Initialise(Startup.Configuration); - // Configure Sentry on the webBuilder using the config snapshot. var sentrySection = ConfigurationReader.GetValueOrDefault("SentryConfiguration", "Dsn", "N/A"); if (sentrySection != "N/A") @@ -95,7 +75,6 @@ // Add Health Checks - read URLs from configuration var estateReportingApiUrl = builder.Configuration.GetValue("AppSettings:EstateReportingApi") ?? "http://localhost:5011"; -var securityServiceUrl = builder.Configuration.GetValue("AppSettings:SecurityService") ?? "http://localhost:5001"; // Validate URLs and create Uri objects Uri ValidateAndCreateUri(string url, string configKey) @@ -110,12 +89,9 @@ Uri ValidateAndCreateUri(string url, string configKey) } } -var estateReportingUri = ValidateAndCreateUri(estateReportingApiUrl, "AppSettings:EstateReportingApi"); -var securityServiceUri = ValidateAndCreateUri(securityServiceUrl, "AppSettings:SecurityService"); +var estateReportingUri = ValidateAndCreateUri($"{estateReportingApiUrl}/health", "AppSettings:EstateReportingApi"); -builder.Services.AddHealthChecks() - .AddUrlGroup(estateReportingUri, name: "Estate Reporting API", tags: new[] { "estateapi" }) - .AddUrlGroup(securityServiceUri, name: "Security Service API", tags: new[] { "securityapi" }); +builder.Services.AddHealthChecks().AddSecurityService().AddUrlGroup(estateReportingUri, name: "Estate Reporting API", tags: new[] { "estateapi" }); builder.Host.UseWindowsService(); From 21770c90829599a9a3e491f9a3b6c8df4a5bfe68 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Fri, 20 Mar 2026 05:53:13 +0000 Subject: [PATCH 2/2] :| --- .../appsettings.staging.json | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 EstateManagementUI.BlazorServer/appsettings.staging.json diff --git a/EstateManagementUI.BlazorServer/appsettings.staging.json b/EstateManagementUI.BlazorServer/appsettings.staging.json new file mode 100644 index 00000000..1e1e6ba3 --- /dev/null +++ b/EstateManagementUI.BlazorServer/appsettings.staging.json @@ -0,0 +1,36 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*", + "AppSettings": { + "SecurityServiceLocalPort": null, + "SecurityServicePort": null, + "HttpClientIgnoreCertificateErrors": true, + "TestMode": "Disabled", + "TransactionProcessorApi": "http://127.0.0.1:5002", + "EstateReportingApi": "http://127.0.0.1:5011", + "FileProcessorApi": "http://127.0.0.1:5009", + "SecurityService": "https://127.0.0.1:5001", + "ClientId": "serviceClient", + "ClientSecret": "d192cbc46d834d0da90e8a9d50ded543" + }, + "Authentication": { + "Authority": "https://127.0.0.1:5001", + "ClientId": "managementUIClient", + "ClientSecret": "d192cbc46d834d0da90e8a9d50ded543", + "CallbackPath": "/signin-oidc", + "ResponseType": "code id_token", + "Scopes": [ + "openid", + "profile", + "email", + "offline_access", + "fileProcessor", + "transactionProcessor" + ] + } +}