From a9f9650400ed9e7f40db5ec5fd08a861f4c30902 Mon Sep 17 00:00:00 2001 From: ivar Date: Sun, 12 Nov 2023 00:01:31 +0100 Subject: Change how config is operated --- .../src/Endpoints/V1/ApiTokens/CreateTokenRoute.cs | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'code/api/src/Endpoints/V1') diff --git a/code/api/src/Endpoints/V1/ApiTokens/CreateTokenRoute.cs b/code/api/src/Endpoints/V1/ApiTokens/CreateTokenRoute.cs index 163ddb6..c28f534 100644 --- a/code/api/src/Endpoints/V1/ApiTokens/CreateTokenRoute.cs +++ b/code/api/src/Endpoints/V1/ApiTokens/CreateTokenRoute.cs @@ -5,12 +5,11 @@ namespace IOL.GreatOffice.Api.Endpoints.V1.ApiTokens; public class CreateTokenRoute : RouteBaseSync.WithRequest.WithActionResult { private readonly MainAppDatabase _database; - private readonly AppConfiguration _configuration; private readonly ILogger _logger; - public CreateTokenRoute(MainAppDatabase database, VaultService vaultService, ILogger logger) { + public CreateTokenRoute(MainAppDatabase database, ILogger logger) + { _database = database; - _configuration = vaultService.GetCurrentAppConfiguration(); _logger = logger; } @@ -30,19 +29,23 @@ public class CreateTokenRoute : RouteBaseSync.WithRequest [ApiVersion(ApiSpecV1.VERSION_STRING)] [HttpPost("~/v{version:apiVersion}/api-tokens/create")] - public override ActionResult Handle(Payload request) { + public override ActionResult Handle(Payload request) + { var user = _database.Users.SingleOrDefault(c => c.Id == LoggedInUser.Id); - if (user == default) { + if (user == default) + { return NotFound(new KnownProblemModel("User does not exist")); } - var token_entropy = _configuration.APP_AES_KEY; - if (token_entropy.IsNullOrWhiteSpace()) { + var tokenEntropy = Program.AppConfiguration.APP_AES_KEY; + if (tokenEntropy.IsNullOrWhiteSpace()) + { _logger.LogWarning("No token entropy is available, Basic auth is disabled"); return NotFound(); } - var accessToken = new ApiAccessToken() { + var accessToken = new ApiAccessToken() + { User = user, ExpiryDate = request.ExpiryDate.ToUniversalTime(), AllowCreate = request.AllowCreate, @@ -53,6 +56,6 @@ public class CreateTokenRoute : RouteBaseSync.WithRequest