refactor: Use Vault to get configuration

2 files changed, 24 insertions, 16 deletions

diff --git a/server/src/Utilities/ConfigurationExtensions.cs b/server/src/Utilities/ConfigurationExtensions.cs
index 772059a..41b6ab3 100644
--- a/server/src/Utilities/ConfigurationExtensions.cs
+++ b/server/src/Utilities/ConfigurationExtensions.cs
@@ -1,27 +1,34 @@
+using Microsoft.Extensions.Options;
+
 namespace IOL.GreatOffice.Api.Utilities;
 
 public static class ConfigurationExtensions
 {
-	public static string GetAppDatabaseConnectionString(this IConfiguration configuration) {
-		var host = configuration.GetValue<string>(AppEnvironmentVariables.DB_HOST);
-		var port = configuration.GetValue<string>(AppEnvironmentVariables.DB_PORT);
-		var database = configuration.GetValue<string>(AppEnvironmentVariables.DB_NAME);
-		var user = configuration.GetValue<string>(AppEnvironmentVariables.DB_USER);
-		var password = configuration.GetValue<string>(AppEnvironmentVariables.DB_PASSWORD);
+	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;
 
-		if (configuration.GetValue<string>("ASPNETCORE_ENVIRONMENT") == "Development") {
+		if (config.GetValue<string>("ASPNETCORE_ENVIRONMENT") == "Development") {
 			return $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true";
 		}
 
 		return $"Server={host};Port={port};Database={database};User Id={user};Password={password}";
 	}
 
-	public static string GetQuartzDatabaseConnectionString(this IConfiguration Configuration) {
-		var host = Configuration.GetValue<string>(AppEnvironmentVariables.QUARTZ_DB_HOST);
-		var port = Configuration.GetValue<string>(AppEnvironmentVariables.QUARTZ_DB_PORT);
-		var database = Configuration.GetValue<string>(AppEnvironmentVariables.QUARTZ_DB_NAME);
-		var user = Configuration.GetValue<string>(AppEnvironmentVariables.QUARTZ_DB_USER);
-		var password = Configuration.GetValue<string>(AppEnvironmentVariables.QUARTZ_DB_PASSWORD);
+	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;
+		Log.Information(host);
+		if (config.GetValue<string>("ASPNETCORE_ENVIRONMENT") == "Development") {
+			return $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true";
+		}
+
 		return $"Server={host};Port={port};Database={database};User Id={user};Password={password}";
 	}
 
diff --git a/server/src/Utilities/GithubAuthenticationHelpers.cs b/server/src/Utilities/GithubAuthenticationHelpers.cs
index cf0cabb..f924ecc 100644
--- a/server/src/Utilities/GithubAuthenticationHelpers.cs
+++ b/server/src/Utilities/GithubAuthenticationHelpers.cs
@@ -1,11 +1,12 @@
 using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.Extensions.Options;
 using Npgsql;
 
 namespace IOL.GreatOffice.Api.Utilities;
 
 public static class GithubAuthenticationHelpers
 {
-	public static async Task HandleGithubTicketCreation(OAuthCreatingTicketContext context, IConfiguration configuration) {
+	public static async Task HandleGithubTicketCreation(OAuthCreatingTicketContext context, IConfiguration configuration, AppConfiguration options) {
 		var githubId = context.Identity?.FindFirst(p => p.Type == ClaimTypes.NameIdentifier)?.Value;
 		var githubUsername = context.Identity?.FindFirst(p => p.Type == ClaimTypes.Name)?.Value;
 		var githubEmail = context.Identity?.FindFirst(p => p.Type == ClaimTypes.Email)?.Value;
@@ -19,7 +20,7 @@ public static class GithubAuthenticationHelpers
 			context.Identity.RemoveClaim(claim);
 		}
 
-		var connstring = configuration.GetAppDatabaseConnectionString();
+		var connstring = configuration.GetAppDatabaseConnectionString(options);
 		var connection = new NpgsqlConnection(connstring);
 
 		Log.Information($"Getting user mappings for github user: {githubId}");
@@ -57,7 +58,7 @@ public static class GithubAuthenticationHelpers
 			await insertUserCommand.ExecuteNonQueryAsync();
 			await connection.CloseAsync();
 
-			var refreshTokenEncryptionKey = configuration.GetValue<string>(AppEnvironmentVariables.APP_AES_KEY);
+			var refreshTokenEncryptionKey = options.APP_AES_KEY;
 			string insertMappingQuery;
 
 			if (context.RefreshToken.HasValue() && refreshTokenEncryptionKey.HasValue()) {