From 3f0b736589c071a836867aa6828ebc4199b23a21 Mon Sep 17 00:00:00 2001 From: Daniel Gerst Date: Mon, 22 Sep 2025 17:10:31 +0200 Subject: [PATCH] Update to new structure --- .../WebApiConfiguration.OpenId.Validation.cs | 6 +-- .../WebApiConfiguration.Swagger.cs | 8 +++- .../GerstITS.Examples.Api.csproj | 37 +++++++++---------- ...erstITS.Examples.Jobs.SayHelloWorld.csproj | 10 ++--- .../GerstITS.Examples.Logic.csproj | 16 ++++---- ...GerstITS.Examples.WebClient.Console.csproj | 18 ++++----- ...TS.Examples.WebClients.Examples.Api.csproj | 10 ++--- 7 files changed, 53 insertions(+), 52 deletions(-) diff --git a/GerstITS.Examples.Api/Common/Configurations/WebApiConfiguration.OpenId.Validation.cs b/GerstITS.Examples.Api/Common/Configurations/WebApiConfiguration.OpenId.Validation.cs index 264b8e6..df406fd 100644 --- a/GerstITS.Examples.Api/Common/Configurations/WebApiConfiguration.OpenId.Validation.cs +++ b/GerstITS.Examples.Api/Common/Configurations/WebApiConfiguration.OpenId.Validation.cs @@ -8,14 +8,14 @@ internal class OpenIdValidationConfiguration : IOpenIdValidationConfiguration #region Constructors public OpenIdValidationConfiguration(string parentPrefix, - IConfiguration configuration) + IConfiguration configuration) { var prefix = $"{parentPrefix}:Validate"; Issuer = configuration.GetValue($"{prefix}:{nameof(Issuer)}"); Audience = configuration.GetValue($"{prefix}:{nameof(Audience)}"); RsaPublicKey = configuration.GetValue($"{prefix}:{nameof(RsaPublicKey)}"); - RequiredClaimType = configuration.GetValue($"{prefix}:{nameof(RequiredClaimType)}"); + NameClaimType = configuration.GetValue($"{prefix}:{nameof(NameClaimType)}"); ValidateLifetime = configuration.GetValue($"{prefix}:{nameof(ValidateLifetime)}"); } @@ -26,7 +26,7 @@ internal class OpenIdValidationConfiguration : IOpenIdValidationConfiguration public string Issuer { get; } public string Audience { get; } public string RsaPublicKey { get; } - public string RequiredClaimType { get; } + public string NameClaimType { get; } public bool ValidateLifetime { get; } #endregion diff --git a/GerstITS.Examples.Api/Common/Configurations/WebApiConfiguration.Swagger.cs b/GerstITS.Examples.Api/Common/Configurations/WebApiConfiguration.Swagger.cs index e38041b..4b40af3 100644 --- a/GerstITS.Examples.Api/Common/Configurations/WebApiConfiguration.Swagger.cs +++ b/GerstITS.Examples.Api/Common/Configurations/WebApiConfiguration.Swagger.cs @@ -1,5 +1,8 @@ using System; +using System.Collections.Generic; using System.Diagnostics; +using System.Linq; +using GerstITS.Common; using GerstITS.System.Configurations; using GerstITS.Web.Api.Swagger; using Microsoft.Extensions.Configuration; @@ -25,7 +28,8 @@ internal sealed class SwaggerConfiguration : ISwaggerConfiguration Release = currentAssembly.GetName().Version; License = new LicenseConfiguration(prefix, configuration); - Security = new OpenApiSecuritySchemeConfiguration(); + Securities = new OpenApiSecuritySchemeConfiguration().AsEnumerable() + .ToList(); } #endregion @@ -37,8 +41,8 @@ internal sealed class SwaggerConfiguration : ISwaggerConfiguration public string SupportEMail { get; } public Uri TermsOfService { get; } public Version Release { get; } + public IEnumerable Securities { get; } public ILicense License { get; } - public IOpenApiSecuritySchemeConfiguration Security { get; } #endregion } \ No newline at end of file diff --git a/GerstITS.Examples.Api/GerstITS.Examples.Api.csproj b/GerstITS.Examples.Api/GerstITS.Examples.Api.csproj index 9f34687..614df81 100644 --- a/GerstITS.Examples.Api/GerstITS.Examples.Api.csproj +++ b/GerstITS.Examples.Api/GerstITS.Examples.Api.csproj @@ -37,29 +37,28 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + diff --git a/GerstITS.Examples.Jobs.SayHelloWorld/GerstITS.Examples.Jobs.SayHelloWorld.csproj b/GerstITS.Examples.Jobs.SayHelloWorld/GerstITS.Examples.Jobs.SayHelloWorld.csproj index c803bdb..6deb71a 100644 --- a/GerstITS.Examples.Jobs.SayHelloWorld/GerstITS.Examples.Jobs.SayHelloWorld.csproj +++ b/GerstITS.Examples.Jobs.SayHelloWorld/GerstITS.Examples.Jobs.SayHelloWorld.csproj @@ -32,11 +32,11 @@ - - - - - + + + + + diff --git a/GerstITS.Examples.Logic/GerstITS.Examples.Logic.csproj b/GerstITS.Examples.Logic/GerstITS.Examples.Logic.csproj index 46aee99..87d9153 100644 --- a/GerstITS.Examples.Logic/GerstITS.Examples.Logic.csproj +++ b/GerstITS.Examples.Logic/GerstITS.Examples.Logic.csproj @@ -32,15 +32,13 @@ - - - - - - - - - + + + + + + + diff --git a/GerstITS.Examples.WebClient.Console/GerstITS.Examples.WebClient.Console.csproj b/GerstITS.Examples.WebClient.Console/GerstITS.Examples.WebClient.Console.csproj index d2541d6..619cb10 100644 --- a/GerstITS.Examples.WebClient.Console/GerstITS.Examples.WebClient.Console.csproj +++ b/GerstITS.Examples.WebClient.Console/GerstITS.Examples.WebClient.Console.csproj @@ -43,15 +43,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/GerstITS.WebClients.Example.Api/GerstITS.Examples.WebClients.Examples.Api.csproj b/GerstITS.WebClients.Example.Api/GerstITS.Examples.WebClients.Examples.Api.csproj index 503b8cc..32d25bf 100644 --- a/GerstITS.WebClients.Example.Api/GerstITS.Examples.WebClients.Examples.Api.csproj +++ b/GerstITS.WebClients.Example.Api/GerstITS.Examples.WebClients.Examples.Api.csproj @@ -32,11 +32,11 @@ - - - - - + + + + +