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/Endpoints/Internal/Root/ReadConfigurationRoute.cs |  8 ++------
 .../Endpoints/Internal/Root/RefreshConfigurationRoute.cs  | 15 ---------------
 code/api/src/Endpoints/Internal/Root/ValidateRoute.cs     | 12 +++++++-----
 3 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 code/api/src/Endpoints/Internal/Root/RefreshConfigurationRoute.cs

(limited to 'code/api/src/Endpoints/Internal')

diff --git a/code/api/src/Endpoints/Internal/Root/ReadConfigurationRoute.cs b/code/api/src/Endpoints/Internal/Root/ReadConfigurationRoute.cs
index a02dbb8..14a4186 100644
--- a/code/api/src/Endpoints/Internal/Root/ReadConfigurationRoute.cs
+++ b/code/api/src/Endpoints/Internal/Root/ReadConfigurationRoute.cs
@@ -2,18 +2,14 @@ namespace IOL.GreatOffice.Api.Endpoints.Internal.Root;
 
 public class ReadConfigurationRoute : RouteBaseSync.WithoutRequest.WithActionResult
 {
-    private readonly VaultService _vaultService;
-
-    public ReadConfigurationRoute(VaultService vaultService)
+    public ReadConfigurationRoute()
     {
-        _vaultService = vaultService;
     }
 
     [AllowAnonymous]
     [HttpGet("~/_/configuration")]
     public override ActionResult Handle()
     {
-        var config = _vaultService.GetCurrentAppConfiguration();
-        return Content(JsonSerializer.Serialize(config.GetPublicObject()), "application/json");
+        return Content(JsonSerializer.Serialize(Program.AppConfiguration.GetPublicObject()), "application/json");
     }
 }
\ No newline at end of file
diff --git a/code/api/src/Endpoints/Internal/Root/RefreshConfigurationRoute.cs b/code/api/src/Endpoints/Internal/Root/RefreshConfigurationRoute.cs
deleted file mode 100644
index 2bbfd8f..0000000
--- a/code/api/src/Endpoints/Internal/Root/RefreshConfigurationRoute.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace IOL.GreatOffice.Api.Endpoints.Internal.Root;
-
-public class RefreshConfigurationRoute : RouteBaseAsync.WithoutRequest.WithoutResult
-{
-    private readonly VaultService _vaultService;
-
-    public RefreshConfigurationRoute(VaultService vaultService) {
-        _vaultService = vaultService;
-    }
-
-    [HttpGet("~/_/refresh-configuration")]
-    public override async Task HandleAsync(CancellationToken cancellationToken = default) {
-        await _vaultService.RefreshCurrentAppConfigurationAsync();
-    }
-}
\ No newline at end of file
diff --git a/code/api/src/Endpoints/Internal/Root/ValidateRoute.cs b/code/api/src/Endpoints/Internal/Root/ValidateRoute.cs
index 8f0882d..d8ec85a 100644
--- a/code/api/src/Endpoints/Internal/Root/ValidateRoute.cs
+++ b/code/api/src/Endpoints/Internal/Root/ValidateRoute.cs
@@ -6,11 +6,11 @@ public class ValidateRoute : RouteBaseSync.WithRequest<ValidateRoute.QueryParams
     private readonly string CanonicalFrontendUrl;
     private readonly ILogger<ValidateRoute> _logger;
 
-    public ValidateRoute(VaultService vaultService, EmailValidationService emailValidation, ILogger<ValidateRoute> logger) {
+    public ValidateRoute(EmailValidationService emailValidation, ILogger<ValidateRoute> logger)
+    {
         _emailValidation = emailValidation;
         _logger = logger;
-        var c = vaultService.GetCurrentAppConfiguration();
-        CanonicalFrontendUrl = c.CANONICAL_FRONTEND_URL;
+        CanonicalFrontendUrl = Program.AppConfiguration.CANONICAL_FRONTEND_URL;
     }
 
     public class QueryParams
@@ -20,9 +20,11 @@ public class ValidateRoute : RouteBaseSync.WithRequest<ValidateRoute.QueryParams
     }
 
     [HttpGet("~/_/validate")]
-    public override ActionResult Handle([FromQuery] QueryParams request) {
+    public override ActionResult Handle([FromQuery] QueryParams request)
+    {
         var isFulfilled = _emailValidation.FulfillEmailValidationRequest(request.Id, LoggedInUser.Id);
-        if (!isFulfilled) {
+        if (!isFulfilled)
+        {
             _logger.LogError("Email validation fulfillment failed for request {requestId} and user {userId}", request.Id, LoggedInUser.Id);
             return StatusCode(400, $"""
 <html>
-- 
cgit v1.3