From 8b5c477b2bdefd3bb99632bc75c446d2bbadf3fc Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Wed, 22 Jan 2025 11:37:31 +0100 Subject: [PATCH] refactor(ConsumerApi): umbenannt in Consumer --- src/DigitalData.Auth.API/Program.cs | 2 +- .../Services/ConfiguredConsumerService.cs | 15 ++++++++++----- src/DigitalData.Auth.API/Services/DIExtensions.cs | 2 +- src/DigitalData.Auth.API/consumer-repository.json | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/DigitalData.Auth.API/Program.cs b/src/DigitalData.Auth.API/Program.cs index 9224ef6..5781083 100644 --- a/src/DigitalData.Auth.API/Program.cs +++ b/src/DigitalData.Auth.API/Program.cs @@ -21,7 +21,7 @@ var apiParams = config.Get() ?? throw new InvalidOperationExcepti // Add services to the container. builder.Services.Configure(config); -builder.Services.AddConsumerApiService(config); +builder.Services.AddConsumerService(config); builder.Services.AddCryptoFactory(config.GetSection("CryptParams")); builder.Services.AddJwtSignatureHandler(api => new Dictionary { diff --git a/src/DigitalData.Auth.API/Services/ConfiguredConsumerService.cs b/src/DigitalData.Auth.API/Services/ConfiguredConsumerService.cs index 4eedea5..1f5fe70 100644 --- a/src/DigitalData.Auth.API/Services/ConfiguredConsumerService.cs +++ b/src/DigitalData.Auth.API/Services/ConfiguredConsumerService.cs @@ -1,4 +1,5 @@ -using DigitalData.Auth.API.Entities; +using DigitalData.Auth.API.Config; +using DigitalData.Auth.API.Entities; using DigitalData.Auth.API.Services.Contracts; using Microsoft.Extensions.Options; @@ -6,13 +7,17 @@ namespace DigitalData.Auth.API.Services { public class ConfiguredConsumerService : IConsumerService { - private readonly IEnumerable _consumerAPIs; - public ConfiguredConsumerService(IOptions> options) + private readonly IEnumerable _consumers; + + private readonly AuthApiParams _authApiParams; + + public ConfiguredConsumerService(IOptions> consumeroptions, IOptions authApiParamOptions) { - _consumerAPIs = options.Value; + _consumers = consumeroptions.Value; + _authApiParams = authApiParamOptions.Value; } - public Task ReadByIdAsync(string id) => Task.Run(() => _consumerAPIs.FirstOrDefault(api => api.Id == id)); + public Task ReadByIdAsync(string id) => Task.Run(() => _consumers.FirstOrDefault(api => api.Id == id)); public async Task VerifyAsync(string id, string password) => (await ReadByIdAsync(id))?.Password == password; } diff --git a/src/DigitalData.Auth.API/Services/DIExtensions.cs b/src/DigitalData.Auth.API/Services/DIExtensions.cs index c85a715..5048900 100644 --- a/src/DigitalData.Auth.API/Services/DIExtensions.cs +++ b/src/DigitalData.Auth.API/Services/DIExtensions.cs @@ -6,7 +6,7 @@ namespace DigitalData.Auth.API.Services { public static class DIExtensions { - public static IServiceCollection AddConsumerApiService(this IServiceCollection services, IConfiguration configuration, string key = "ConsumerAPIs") + public static IServiceCollection AddConsumerService(this IServiceCollection services, IConfiguration configuration, string key = "Consumers") { var consumers = configuration.GetSection(key).Get>() ?? throw new InvalidOperationException($"No Consumer list found in {key} in configuration."); services.AddSingleton(Options.Create(consumers)); diff --git a/src/DigitalData.Auth.API/consumer-repository.json b/src/DigitalData.Auth.API/consumer-repository.json index db6c921..c5fabfd 100644 --- a/src/DigitalData.Auth.API/consumer-repository.json +++ b/src/DigitalData.Auth.API/consumer-repository.json @@ -1,5 +1,5 @@ { - "ConsumerAPIs": [ + "Consumers": [ { "Id": "auth", "Audience": "auth.digitaldata.works",