Update to new structure
This commit is contained in:
		| @@ -8,14 +8,14 @@ internal class OpenIdValidationConfiguration : IOpenIdValidationConfiguration | |||||||
|     #region Constructors |     #region Constructors | ||||||
|  |  | ||||||
|     public OpenIdValidationConfiguration(string parentPrefix, |     public OpenIdValidationConfiguration(string parentPrefix, | ||||||
|         IConfiguration configuration) |                                          IConfiguration configuration) | ||||||
|     { |     { | ||||||
|         var prefix = $"{parentPrefix}:Validate"; |         var prefix = $"{parentPrefix}:Validate"; | ||||||
|  |  | ||||||
|         Issuer = configuration.GetValue<string>($"{prefix}:{nameof(Issuer)}"); |         Issuer = configuration.GetValue<string>($"{prefix}:{nameof(Issuer)}"); | ||||||
|         Audience = configuration.GetValue<string>($"{prefix}:{nameof(Audience)}"); |         Audience = configuration.GetValue<string>($"{prefix}:{nameof(Audience)}"); | ||||||
|         RsaPublicKey = configuration.GetValue<string>($"{prefix}:{nameof(RsaPublicKey)}"); |         RsaPublicKey = configuration.GetValue<string>($"{prefix}:{nameof(RsaPublicKey)}"); | ||||||
|         RequiredClaimType = configuration.GetValue<string>($"{prefix}:{nameof(RequiredClaimType)}"); |         NameClaimType = configuration.GetValue<string>($"{prefix}:{nameof(NameClaimType)}"); | ||||||
|         ValidateLifetime = configuration.GetValue<bool>($"{prefix}:{nameof(ValidateLifetime)}"); |         ValidateLifetime = configuration.GetValue<bool>($"{prefix}:{nameof(ValidateLifetime)}"); | ||||||
|     } |     } | ||||||
|  |  | ||||||
| @@ -26,7 +26,7 @@ internal class OpenIdValidationConfiguration : IOpenIdValidationConfiguration | |||||||
|     public string Issuer { get; } |     public string Issuer { get; } | ||||||
|     public string Audience { get; } |     public string Audience { get; } | ||||||
|     public string RsaPublicKey { get; } |     public string RsaPublicKey { get; } | ||||||
|     public string RequiredClaimType { get; } |     public string NameClaimType { get; } | ||||||
|     public bool ValidateLifetime { get; }  |     public bool ValidateLifetime { get; }  | ||||||
|          |          | ||||||
|     #endregion |     #endregion | ||||||
|   | |||||||
| @@ -1,5 +1,8 @@ | |||||||
| using System; | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
| using System.Diagnostics; | using System.Diagnostics; | ||||||
|  | using System.Linq; | ||||||
|  | using GerstITS.Common; | ||||||
| using GerstITS.System.Configurations; | using GerstITS.System.Configurations; | ||||||
| using GerstITS.Web.Api.Swagger; | using GerstITS.Web.Api.Swagger; | ||||||
| using Microsoft.Extensions.Configuration; | using Microsoft.Extensions.Configuration; | ||||||
| @@ -25,7 +28,8 @@ internal sealed class SwaggerConfiguration : ISwaggerConfiguration | |||||||
|  |  | ||||||
|         Release = currentAssembly.GetName().Version; |         Release = currentAssembly.GetName().Version; | ||||||
|         License = new LicenseConfiguration(prefix, configuration); |         License = new LicenseConfiguration(prefix, configuration); | ||||||
|         Security = new OpenApiSecuritySchemeConfiguration(); |         Securities = new OpenApiSecuritySchemeConfiguration().AsEnumerable() | ||||||
|  |                                                              .ToList(); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     #endregion |     #endregion | ||||||
| @@ -37,8 +41,8 @@ internal sealed class SwaggerConfiguration : ISwaggerConfiguration | |||||||
|     public string SupportEMail { get; } |     public string SupportEMail { get; } | ||||||
|     public Uri TermsOfService { get; } |     public Uri TermsOfService { get; } | ||||||
|     public Version Release { get; } |     public Version Release { get; } | ||||||
|  |     public IEnumerable<IOpenApiSecuritySchemeConfiguration> Securities { get; } | ||||||
|     public ILicense License { get; } |     public ILicense License { get; } | ||||||
|     public IOpenApiSecuritySchemeConfiguration Security { get; }  |  | ||||||
|          |          | ||||||
|     #endregion |     #endregion | ||||||
| } | } | ||||||
| @@ -37,29 +37,28 @@ | |||||||
| 	</PropertyGroup> | 	</PropertyGroup> | ||||||
|  |  | ||||||
| 	<ItemGroup> | 	<ItemGroup> | ||||||
| 		<PackageReference Include="GerstITS.Authentication.OpenId" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.Authentication.OpenId" Version="2025.9.2" /> | ||||||
| 		<PackageReference Include="GerstITS.Common" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.Common" Version="2025.9.3" /> | ||||||
| 		<PackageReference Include="GerstITS.Data" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.Data" Version="2025.9.2" /> | ||||||
| 		<PackageReference Include="GerstITS.Data.EntityFramework" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.Data.EntityFramework" Version="2025.9.2" /> | ||||||
| 		<PackageReference Include="GerstITS.IoC" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.IoC" Version="2025.3.6" /> | ||||||
| 		<PackageReference Include="GerstITS.IoC.DotNetCore" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.IoC.DotNetCore" Version="2025.9.2" /> | ||||||
| 		<PackageReference Include="GerstITS.Job" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.Job" Version="2025.8.1" /> | ||||||
| 		<PackageReference Include="GerstITS.Job.Scheduling" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.Job.Scheduling" Version="2025.9.2" /> | ||||||
| 		<PackageReference Include="GerstITS.Mapping.AutoMapper" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.Mapping.AutoMapper" Version="2025.9.2" /> | ||||||
| 		<PackageReference Include="GerstITS.Search" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.Search" Version="2025.9.2" /> | ||||||
| 		<PackageReference Include="GerstITS.System" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.System" Version="2025.9.3" /> | ||||||
| 		<PackageReference Include="GerstITS.Validation" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.Validation" Version="2025.9.2" /> | ||||||
| 		<PackageReference Include="GerstITS.Web" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.Web" Version="2025.9.2" /> | ||||||
| 		<PackageReference Include="GerstITS.Web.Api" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.Web.Api" Version="2025.9.2" /> | ||||||
| 		<PackageReference Include="GerstITS.Web.Api.Swagger" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.Web.Api.Swagger" Version="2025.9.3" /> | ||||||
| 		<PackageReference Include="GerstITS.Web.Rest" Version="2025.1.10" /> | 		<PackageReference Include="GerstITS.Web.Rest" Version="2025.9.2" /> | ||||||
| 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.1" /> | 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.9" /> | ||||||
| 		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.1"> | 		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.1"> | ||||||
| 			<PrivateAssets>all</PrivateAssets> | 			<PrivateAssets>all</PrivateAssets> | ||||||
| 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
| 		</PackageReference> | 		</PackageReference> | ||||||
| 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" /> | 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" /> | ||||||
| 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" /> |  | ||||||
| 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> | 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> | ||||||
| 		<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" /> | 		<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" /> | ||||||
| 	</ItemGroup> | 	</ItemGroup> | ||||||
|   | |||||||
| @@ -32,11 +32,11 @@ | |||||||
| 	</PropertyGroup> | 	</PropertyGroup> | ||||||
|  |  | ||||||
| 	<ItemGroup> | 	<ItemGroup> | ||||||
| 	  <PackageReference Include="GerstITS.Data" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.Data" Version="2025.9.2" /> | ||||||
| 	  <PackageReference Include="GerstITS.IoC" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.IoC" Version="2025.3.6" /> | ||||||
| 	  <PackageReference Include="GerstITS.IoC.DotNetCore" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.IoC.DotNetCore" Version="2025.9.2" /> | ||||||
| 	  <PackageReference Include="GerstITS.Job" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.Job" Version="2025.8.1" /> | ||||||
| 	  <PackageReference Include="GerstITS.Job.Scheduling" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.Job.Scheduling" Version="2025.9.2" /> | ||||||
| 	  <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" /> | 	  <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" /> | ||||||
| 	</ItemGroup> | 	</ItemGroup> | ||||||
|  |  | ||||||
|   | |||||||
| @@ -32,15 +32,13 @@ | |||||||
| 	</PropertyGroup> | 	</PropertyGroup> | ||||||
|  |  | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <PackageReference Include="AutoMapper" Version="13.0.1" /> |     <PackageReference Include="GerstITS.Data" Version="2025.9.2" /> | ||||||
|     <PackageReference Include="FluentValidation" Version="11.11.0" /> |     <PackageReference Include="GerstITS.IoC" Version="2025.3.6" /> | ||||||
|     <PackageReference Include="GerstITS.Data" Version="2025.1.10" /> |     <PackageReference Include="GerstITS.IoC.DotNetCore" Version="2025.9.2" /> | ||||||
|     <PackageReference Include="GerstITS.IoC" Version="2025.1.10" /> |     <PackageReference Include="GerstITS.Mapping.AutoMapper" Version="2025.9.2" /> | ||||||
|     <PackageReference Include="GerstITS.IoC.DotNetCore" Version="2025.1.10" /> |     <PackageReference Include="GerstITS.Search" Version="2025.9.2" /> | ||||||
|     <PackageReference Include="GerstITS.Mapping.AutoMapper" Version="2025.1.10" /> |     <PackageReference Include="GerstITS.Validation" Version="2025.9.2" /> | ||||||
|     <PackageReference Include="GerstITS.Search" Version="2025.1.10" /> |     <PackageReference Include="GerstITS.Web.Api" Version="2025.9.2" /> | ||||||
|     <PackageReference Include="GerstITS.Validation" Version="2025.1.10" /> |  | ||||||
|     <PackageReference Include="GerstITS.Web.Api" Version="2025.1.10" /> |  | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  |  | ||||||
| 	<ItemGroup> | 	<ItemGroup> | ||||||
|   | |||||||
| @@ -43,15 +43,15 @@ | |||||||
| 	</ItemGroup> | 	</ItemGroup> | ||||||
|  |  | ||||||
| 	<ItemGroup> | 	<ItemGroup> | ||||||
| 	  <PackageReference Include="GerstITS.Common" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.Common" Version="2025.9.3" /> | ||||||
| 	  <PackageReference Include="GerstITS.IoC" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.IoC" Version="2025.3.6" /> | ||||||
| 	  <PackageReference Include="GerstITS.IoC.DotNetCore" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.IoC.DotNetCore" Version="2025.9.2" /> | ||||||
| 	  <PackageReference Include="GerstITS.System" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.System" Version="2025.9.3" /> | ||||||
| 	  <PackageReference Include="GerstITS.Web" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.Web" Version="2025.9.2" /> | ||||||
| 	  <PackageReference Include="GerstITS.Web.Rest" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.Web.Rest" Version="2025.9.2" /> | ||||||
| 	  <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.1" /> | 	  <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25451.107" /> | ||||||
| 	  <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.1" /> | 	  <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.0-rc.1.25451.107" /> | ||||||
| 	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" /> | 	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25451.107" /> | ||||||
| 	</ItemGroup> | 	</ItemGroup> | ||||||
|  |  | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|   | |||||||
| @@ -32,11 +32,11 @@ | |||||||
| 	</PropertyGroup> | 	</PropertyGroup> | ||||||
|  |  | ||||||
| 	<ItemGroup> | 	<ItemGroup> | ||||||
| 	  <PackageReference Include="GerstITS.IoC" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.IoC" Version="2025.3.6" /> | ||||||
| 	  <PackageReference Include="GerstITS.IoC.DotNetCore" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.IoC.DotNetCore" Version="2025.9.2" /> | ||||||
| 	  <PackageReference Include="GerstITS.System" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.System" Version="2025.9.3" /> | ||||||
| 	  <PackageReference Include="GerstITS.Web" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.Web" Version="2025.9.2" /> | ||||||
| 	  <PackageReference Include="GerstITS.Web.Rest" Version="2025.1.10" /> | 	  <PackageReference Include="GerstITS.Web.Rest" Version="2025.9.2" /> | ||||||
| 	</ItemGroup> | 	</ItemGroup> | ||||||
|  |  | ||||||
| 	<ItemGroup> | 	<ItemGroup> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user