From a9f9650400ed9e7f40db5ec5fd08a861f4c30902 Mon Sep 17 00:00:00 2001
From: ivar <i@oiee.no>
Date: Sun, 12 Nov 2023 00:01:31 +0100
Subject: Change how config is operated

---
 .../src/Utilities/BasicAuthenticationHandler.cs    |  7 +-
 code/api/src/Utilities/ConfigurationExtensions.cs  | 85 ----------------------
 2 files changed, 2 insertions(+), 90 deletions(-)
 delete mode 100644 code/api/src/Utilities/ConfigurationExtensions.cs

(limited to 'code/api/src/Utilities')

diff --git a/code/api/src/Utilities/BasicAuthenticationHandler.cs b/code/api/src/Utilities/BasicAuthenticationHandler.cs
index 41486ef..52ba75a 100644
--- a/code/api/src/Utilities/BasicAuthenticationHandler.cs
+++ b/code/api/src/Utilities/BasicAuthenticationHandler.cs
@@ -8,20 +8,17 @@ namespace IOL.GreatOffice.Api.Utilities;
 public class BasicAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions>
 {
 	private readonly MainAppDatabase _context;
-	private readonly AppConfiguration _configuration;
 	private readonly ILogger<BasicAuthenticationHandler> _logger;
 
 	public BasicAuthenticationHandler(
 			IOptionsMonitor<AuthenticationSchemeOptions> options,
 			ILoggerFactory logger,
 			UrlEncoder encoder,
-			MainAppDatabase context,
-			VaultService vaultService
+			MainAppDatabase context
 	) :
 			base(options, logger, encoder)
 	{
 		_context = context;
-		_configuration = vaultService.GetCurrentAppConfiguration();
 		_logger = logger.CreateLogger<BasicAuthenticationHandler>();
 	}
 
@@ -36,7 +33,7 @@ public class BasicAuthenticationHandler : AuthenticationHandler<AuthenticationSc
 
 		try
 		{
-			var tokenEntropy = _configuration.APP_AES_KEY;
+			var tokenEntropy = Program.AppConfiguration.APP_AES_KEY;
 			if (tokenEntropy.IsNullOrWhiteSpace())
 			{
 				_logger.LogWarning("No token entropy is available in env:TOKEN_ENTROPY, Basic auth is disabled");
diff --git a/code/api/src/Utilities/ConfigurationExtensions.cs b/code/api/src/Utilities/ConfigurationExtensions.cs
deleted file mode 100644
index c95e293..0000000
--- a/code/api/src/Utilities/ConfigurationExtensions.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-namespace IOL.GreatOffice.Api.Utilities;
-
-public static class ConfigurationExtensions
-{
-	public static string GetAppDatabaseConnectionString(this IConfiguration config, AppConfiguration configuration) {
-		var host = configuration.DB_HOST;
-		var port = configuration.DB_PORT;
-		var database = configuration.DB_NAME;
-		var user = configuration.DB_USER;
-		var password = configuration.DB_PASSWORD;
-
-		string result;
-		if (config.GetValue<string>("ASPNETCORE_ENVIRONMENT") == "Development") {
-			result = $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true";
-		} else {
-			result = $"Server={host};Port={port};Database={database};User Id={user};Password={password}";
-		}
-
-		Log.Debug("Using app database connection string: " + result);
-		return result;
-	}
-
-	public static string GetAppDatabaseConnectionString(this IConfiguration config, Func<AppConfiguration> configuration) {
-		var _configuration = configuration();
-		var host = _configuration.DB_HOST;
-		var port = _configuration.DB_PORT;
-		var database = _configuration.DB_NAME;
-		var user = _configuration.DB_USER;
-		var password = _configuration.DB_PASSWORD;
-
-		string result;
-		if (config.GetValue<string>("ASPNETCORE_ENVIRONMENT") == "Development") {
-			result = $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true";
-		} else {
-			result = $"Server={host};Port={port};Database={database};User Id={user};Password={password}";
-		}
-
-		Log.Debug("Using app database connection string: " + result);
-		return result;
-	}
-
-	public static string GetQuartzDatabaseConnectionString(this IConfiguration config, AppConfiguration configuration) {
-		var host = configuration.QUARTZ_DB_HOST;
-		var port = configuration.QUARTZ_DB_PORT;
-		var database = configuration.QUARTZ_DB_NAME;
-		var user = configuration.QUARTZ_DB_USER;
-		var password = configuration.QUARTZ_DB_PASSWORD;
-
-		string result;
-		if (config.GetValue<string>("ASPNETCORE_ENVIRONMENT") == "Development") {
-			result = $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true";
-		} else {
-			result = $"Server={host};Port={port};Database={database};User Id={user};Password={password}";
-		}
-
-		Log.Debug("Using quartz database connection string: " + result);
-		return result;
-	}
-
-	public static string GetQuartzDatabaseConnectionString(this IConfiguration config, Func<AppConfiguration> configuration) {
-		var _configuration = configuration();
-		var host = _configuration.QUARTZ_DB_HOST;
-		var port = _configuration.QUARTZ_DB_PORT;
-		var database = _configuration.QUARTZ_DB_NAME;
-		var user = _configuration.QUARTZ_DB_USER;
-		var password = _configuration.QUARTZ_DB_PASSWORD;
-
-		string result;
-		if (config.GetValue<string>("ASPNETCORE_ENVIRONMENT") == "Development") {
-			result = $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true";
-		} else {
-			result = $"Server={host};Port={port};Database={database};User Id={user};Password={password}";
-		}
-
-		Log.Debug("Using quartz database connection string: " + result);
-		return result;
-	}
-
-	public static string GetVersion(this IConfiguration configuration) {
-		var versionFilePath = Path.Combine(AppPaths.AppData.HostPath, "version.txt");
-		if (!File.Exists(versionFilePath)) return "unknown-" + configuration.GetValue<string>("ASPNETCORE_ENVIRONMENT");
-		var versionText = File.ReadAllText(versionFilePath);
-		return versionText + "-" + configuration.GetValue<string>("ASPNETCORE_ENVIRONMENT");
-	}
-}
-- 
cgit v1.3