Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 3 additions & 27 deletions EstateManagementUI.BlazorServer/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -95,7 +75,6 @@

// Add Health Checks - read URLs from configuration
var estateReportingApiUrl = builder.Configuration.GetValue<string>("AppSettings:EstateReportingApi") ?? "http://localhost:5011";
var securityServiceUrl = builder.Configuration.GetValue<string>("AppSettings:SecurityService") ?? "http://localhost:5001";

// Validate URLs and create Uri objects
Uri ValidateAndCreateUri(string url, string configKey)
Expand All @@ -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();

Expand Down
36 changes: 36 additions & 0 deletions EstateManagementUI.BlazorServer/appsettings.staging.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
}
Loading