From e671f32c44e6e109451ac991e385267f72518785 Mon Sep 17 00:00:00 2001 From: ericuss Date: Tue, 7 Apr 2020 08:59:01 +0200 Subject: [PATCH 1/3] Change extension method to load the configuration --- src/Services/Basket/Basket.API/Program.cs | 2 +- src/Services/Catalog/Catalog.API/Program.cs | 2 +- src/Services/Identity/Identity.API/Program.cs | 2 +- src/Services/Location/Locations.API/Program.cs | 2 +- src/Services/Marketing/Marketing.API/Program.cs | 2 +- src/Services/Ordering/Ordering.API/Program.cs | 2 +- src/Services/Ordering/Ordering.SignalrHub/Program.cs | 2 +- src/Services/Payment/Payment.API/Program.cs | 2 +- src/Web/WebMVC/Program.cs | 4 ++-- src/Web/WebStatus/Program.cs | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs index ac7294c15..e557209a1 100644 --- a/src/Services/Basket/Basket.API/Program.cs +++ b/src/Services/Basket/Basket.API/Program.cs @@ -60,6 +60,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API }); }) + .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseFailing(options => { options.ConfigPath = "/Failing"; options.NotFilteredPaths.AddRange(new[] {"/hc","/liveness"}); @@ -67,7 +68,6 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API .UseStartup() .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseConfiguration(configuration) .UseSerilog() .Build(); diff --git a/src/Services/Catalog/Catalog.API/Program.cs b/src/Services/Catalog/Catalog.API/Program.cs index f3198e7bd..5b05da44b 100644 --- a/src/Services/Catalog/Catalog.API/Program.cs +++ b/src/Services/Catalog/Catalog.API/Program.cs @@ -66,7 +66,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API private static IWebHost CreateHostBuilder(IConfiguration configuration, string[] args) => WebHost.CreateDefaultBuilder(args) - .UseConfiguration(configuration) + .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .CaptureStartupErrors(false) .ConfigureKestrel(options => { diff --git a/src/Services/Identity/Identity.API/Program.cs b/src/Services/Identity/Identity.API/Program.cs index ad708c0f4..e68fe57d6 100644 --- a/src/Services/Identity/Identity.API/Program.cs +++ b/src/Services/Identity/Identity.API/Program.cs @@ -67,10 +67,10 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => WebHost.CreateDefaultBuilder(args) .CaptureStartupErrors(false) + .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseConfiguration(configuration) .UseSerilog() .Build(); diff --git a/src/Services/Location/Locations.API/Program.cs b/src/Services/Location/Locations.API/Program.cs index acadf4a39..d100499fd 100644 --- a/src/Services/Location/Locations.API/Program.cs +++ b/src/Services/Location/Locations.API/Program.cs @@ -44,10 +44,10 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => WebHost.CreateDefaultBuilder(args) .CaptureStartupErrors(false) + .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseConfiguration(configuration) .UseSerilog() .Build(); diff --git a/src/Services/Marketing/Marketing.API/Program.cs b/src/Services/Marketing/Marketing.API/Program.cs index 4d07e7e0f..64c66b728 100644 --- a/src/Services/Marketing/Marketing.API/Program.cs +++ b/src/Services/Marketing/Marketing.API/Program.cs @@ -55,11 +55,11 @@ private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => WebHost.CreateDefaultBuilder(args) .CaptureStartupErrors(false) + .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) .UseWebRoot("Pics") - .UseConfiguration(configuration) .UseSerilog() .Build(); diff --git a/src/Services/Ordering/Ordering.API/Program.cs b/src/Services/Ordering/Ordering.API/Program.cs index 9c734699c..f47bf6d7a 100644 --- a/src/Services/Ordering/Ordering.API/Program.cs +++ b/src/Services/Ordering/Ordering.API/Program.cs @@ -77,10 +77,10 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API }); }) + .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseConfiguration(configuration) .UseSerilog() .Build(); diff --git a/src/Services/Ordering/Ordering.SignalrHub/Program.cs b/src/Services/Ordering/Ordering.SignalrHub/Program.cs index 76f131caa..c278697ba 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Program.cs +++ b/src/Services/Ordering/Ordering.SignalrHub/Program.cs @@ -46,8 +46,8 @@ namespace Ordering.SignalrHub private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => WebHost.CreateDefaultBuilder(args) .CaptureStartupErrors(false) + .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() - .UseConfiguration(configuration) .UseSerilog() .Build(); diff --git a/src/Services/Payment/Payment.API/Program.cs b/src/Services/Payment/Payment.API/Program.cs index b03bee3da..9ee94e1e1 100644 --- a/src/Services/Payment/Payment.API/Program.cs +++ b/src/Services/Payment/Payment.API/Program.cs @@ -44,10 +44,10 @@ namespace Payment.API private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => WebHost.CreateDefaultBuilder(args) .CaptureStartupErrors(false) + .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseConfiguration(configuration) .UseSerilog() .Build(); diff --git a/src/Web/WebMVC/Program.cs b/src/Web/WebMVC/Program.cs index 5a149ab44..5f23177a5 100644 --- a/src/Web/WebMVC/Program.cs +++ b/src/Web/WebMVC/Program.cs @@ -42,10 +42,10 @@ namespace Microsoft.eShopOnContainers.WebMVC private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => WebHost.CreateDefaultBuilder(args) - .CaptureStartupErrors(false) + .CaptureStartupErrors(false) + .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() .UseApplicationInsights() - .UseConfiguration(configuration) .UseSerilog() .Build(); diff --git a/src/Web/WebStatus/Program.cs b/src/Web/WebStatus/Program.cs index efe3f051b..62e7a193d 100644 --- a/src/Web/WebStatus/Program.cs +++ b/src/Web/WebStatus/Program.cs @@ -47,10 +47,10 @@ namespace WebStatus private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => WebHost.CreateDefaultBuilder(args) .CaptureStartupErrors(false) + .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseConfiguration(configuration) .UseSerilog() .Build(); From 07aba24ce4c09ea56d5ce366c4134f2e06404803 Mon Sep 17 00:00:00 2001 From: ericuss Date: Tue, 7 Apr 2020 09:07:49 +0200 Subject: [PATCH 2/3] fix authorization in webhooks api --- src/Services/Webhooks/Webhooks.API/Startup.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Services/Webhooks/Webhooks.API/Startup.cs b/src/Services/Webhooks/Webhooks.API/Startup.cs index 07872a58b..7833133d5 100644 --- a/src/Services/Webhooks/Webhooks.API/Startup.cs +++ b/src/Services/Webhooks/Webhooks.API/Startup.cs @@ -80,9 +80,9 @@ namespace Webhooks.API app.UseCors("CorsPolicy"); + app.UseRouting(); ConfigureAuth(app); - app.UseRouting(); app.UseEndpoints(endpoints => { endpoints.MapDefaultControllerRoute(); @@ -119,6 +119,7 @@ namespace Webhooks.API */ app.UseAuthentication(); + app.UseAuthorization(); } protected virtual void ConfigureEventBus(IApplicationBuilder app) From 09fabcdcfb66e94496b7efb31665f625845ab31e Mon Sep 17 00:00:00 2001 From: ericuss Date: Tue, 7 Apr 2020 09:29:46 +0200 Subject: [PATCH 3/3] Remove obsolete middleware UseApplicationInsights --- src/Services/Basket/Basket.API/Program.cs | 1 - src/Services/Catalog/Catalog.API/Program.cs | 1 - src/Services/Identity/Identity.API/Program.cs | 1 - src/Services/Location/Locations.API/Program.cs | 1 - src/Services/Marketing/Marketing.API/Program.cs | 1 - src/Services/Ordering/Ordering.API/Program.cs | 1 - src/Services/Payment/Payment.API/Program.cs | 1 - src/Web/WebMVC/Program.cs | 1 - src/Web/WebSPA/Program.cs | 1 - src/Web/WebStatus/Program.cs | 1 - 10 files changed, 10 deletions(-) diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs index e557209a1..1296256aa 100644 --- a/src/Services/Basket/Basket.API/Program.cs +++ b/src/Services/Basket/Basket.API/Program.cs @@ -66,7 +66,6 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API options.NotFilteredPaths.AddRange(new[] {"/hc","/liveness"}); }) .UseStartup() - .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) .UseSerilog() .Build(); diff --git a/src/Services/Catalog/Catalog.API/Program.cs b/src/Services/Catalog/Catalog.API/Program.cs index 5b05da44b..3632609b4 100644 --- a/src/Services/Catalog/Catalog.API/Program.cs +++ b/src/Services/Catalog/Catalog.API/Program.cs @@ -82,7 +82,6 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API }) .UseStartup() - .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) .UseWebRoot("Pics") .UseSerilog() diff --git a/src/Services/Identity/Identity.API/Program.cs b/src/Services/Identity/Identity.API/Program.cs index e68fe57d6..1d058faf9 100644 --- a/src/Services/Identity/Identity.API/Program.cs +++ b/src/Services/Identity/Identity.API/Program.cs @@ -69,7 +69,6 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API .CaptureStartupErrors(false) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() - .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) .UseSerilog() .Build(); diff --git a/src/Services/Location/Locations.API/Program.cs b/src/Services/Location/Locations.API/Program.cs index d100499fd..f9e21a8a4 100644 --- a/src/Services/Location/Locations.API/Program.cs +++ b/src/Services/Location/Locations.API/Program.cs @@ -46,7 +46,6 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API .CaptureStartupErrors(false) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() - .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) .UseSerilog() .Build(); diff --git a/src/Services/Marketing/Marketing.API/Program.cs b/src/Services/Marketing/Marketing.API/Program.cs index 64c66b728..a76ad5349 100644 --- a/src/Services/Marketing/Marketing.API/Program.cs +++ b/src/Services/Marketing/Marketing.API/Program.cs @@ -57,7 +57,6 @@ .CaptureStartupErrors(false) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() - .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) .UseWebRoot("Pics") .UseSerilog() diff --git a/src/Services/Ordering/Ordering.API/Program.cs b/src/Services/Ordering/Ordering.API/Program.cs index f47bf6d7a..0bac28006 100644 --- a/src/Services/Ordering/Ordering.API/Program.cs +++ b/src/Services/Ordering/Ordering.API/Program.cs @@ -79,7 +79,6 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API }) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() - .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) .UseSerilog() .Build(); diff --git a/src/Services/Payment/Payment.API/Program.cs b/src/Services/Payment/Payment.API/Program.cs index 9ee94e1e1..ea0dc3bf3 100644 --- a/src/Services/Payment/Payment.API/Program.cs +++ b/src/Services/Payment/Payment.API/Program.cs @@ -46,7 +46,6 @@ namespace Payment.API .CaptureStartupErrors(false) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() - .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) .UseSerilog() .Build(); diff --git a/src/Web/WebMVC/Program.cs b/src/Web/WebMVC/Program.cs index 5f23177a5..eb99cd42e 100644 --- a/src/Web/WebMVC/Program.cs +++ b/src/Web/WebMVC/Program.cs @@ -45,7 +45,6 @@ namespace Microsoft.eShopOnContainers.WebMVC .CaptureStartupErrors(false) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() - .UseApplicationInsights() .UseSerilog() .Build(); diff --git a/src/Web/WebSPA/Program.cs b/src/Web/WebSPA/Program.cs index bd4382603..d8b138e47 100644 --- a/src/Web/WebSPA/Program.cs +++ b/src/Web/WebSPA/Program.cs @@ -29,7 +29,6 @@ namespace eShopConContainers.WebSPA builder.AddDebug(); builder.AddAzureWebAppDiagnostics(); }) - .UseApplicationInsights() .UseSerilog((builderContext, config) => { config diff --git a/src/Web/WebStatus/Program.cs b/src/Web/WebStatus/Program.cs index 62e7a193d..cf648daa9 100644 --- a/src/Web/WebStatus/Program.cs +++ b/src/Web/WebStatus/Program.cs @@ -49,7 +49,6 @@ namespace WebStatus .CaptureStartupErrors(false) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseStartup() - .UseApplicationInsights() .UseContentRoot(Directory.GetCurrentDirectory()) .UseSerilog() .Build();