ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the UseVault and use the existance of the section

Browse Source
This commit is contained in:
David Fowler 2023-05-03 08:07:50 -07:00 committed by Reuben Bond
parent 48f640088b
commit bff808016e
3 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Services/Basket/Basket.API/appsettings.json
View File

@ -19,12 +19,6 @@
"ApplicationInsights": {
"InstrumentationKey": ""
},
"UseVault": false,
"Vault": {
"Name": "eshop",
"ClientId": "your-client-id",
"ClientSecret": "your-client-secret"
},
"OpenApi": {
"Endpoint": {
"Name": ""

6
src/Services/Catalog/Catalog.API/appsettings.json
View File

@ -17,12 +17,6 @@
"ApplicationInsights": {
"InstrumentationKey": ""
},
"UseVault": false,
"Vault": {
"Name": "eshop",
"ClientId": "your-client-id",
"ClientSecret": "your-client-secret"
},
"OpenApi": {
"Endpoint": {
"Name": ""

30
src/Services/Services.Common/CommonExtensions.cs
View File

@ -1,5 +1,6 @@
using System.IdentityModel.Tokens.Jwt;
using System.Net;
using Autofac.Core;
using Azure.Identity;
using HealthChecks.UI.Client;
using Microsoft.AspNetCore.Builder;
@ -79,6 +80,13 @@ public static class CommonExtensions
public static IApplicationBuilder UseDefaultOpenApi(this IApplicationBuilder app, IConfiguration configuration)
{
var openApiSection = configuration.GetRequiredSection("OpenApi");
if (!openApiSection.Exists())
{
return app;
}
app.UseSwagger();
app.UseSwaggerUI(setup =>
{
@ -95,7 +103,6 @@ public static class CommonExtensions
/// }
var pathBase = configuration["PATH_BASE"];
var openApiSection = configuration.GetRequiredSection("OpenApi");
var authSection = openApiSection.GetSection("Auth");
var endpointSection = openApiSection.GetRequiredSection("Endpoint");
@ -113,11 +120,17 @@ public static class CommonExtensions
return app;
}
public static IServiceCollection AddDefaultOpenApi(this IServiceCollection services, IConfiguration configuration) =>
services.AddSwaggerGen(options =>
public static IServiceCollection AddDefaultOpenApi(this IServiceCollection services, IConfiguration configuration)
{
var openApi = configuration.GetRequiredSection("OpenApi");
if (!openApi.Exists())
{
return services;
}
return services.AddSwaggerGen(options =>
{
/// {
/// "OpenApi": {
/// "Document": {
@ -174,6 +187,7 @@ public static class CommonExtensions
options.OperationFilter<AuthorizeCheckOperationFilter>();
});
}
public static IServiceCollection AddDefaultAuthentication(this IServiceCollection services, IConfiguration configuration)
{
@ -242,8 +256,6 @@ public static class CommonExtensions
}
public static ConfigurationManager AddKeyVault(this ConfigurationManager configuration)
{
if (configuration.GetValue("UseVault", false))
{
// {
// "Vault": {
@ -253,7 +265,12 @@ public static class CommonExtensions
// }
// }
var vaultSection = configuration.GetRequiredSection("Vault");
var vaultSection = configuration.GetSection("Vault");
if (!vaultSection.Exists())
{
return configuration;
}
var credential = new ClientSecretCredential(
vaultSection.GetRequiredValue("TenantId"),
@ -263,7 +280,6 @@ public static class CommonExtensions
var name = vaultSection.GetRequiredValue("Name");
configuration.AddAzureKeyVault(new Uri($"https://{name}.vault.azure.net/"), credential);
}
return configuration;
}