diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs index ac7294c15..1296256aa 100644 --- a/src/Services/Basket/Basket.API/Program.cs +++ b/src/Services/Basket/Basket.API/Program.cs @@ -60,14 +60,13 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API }); }) + .ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .UseFailing(options => { options.ConfigPath = "/Failing"; options.NotFilteredPaths.AddRange(new[] {"/hc","/liveness"}); }) .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..3632609b4 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 => { @@ -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 ad708c0f4..1d058faf9 100644 --- a/src/Services/Identity/Identity.API/Program.cs +++ b/src/Services/Identity/Identity.API/Program.cs @@ -67,10 +67,9 @@ 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..f9e21a8a4 100644 --- a/src/Services/Location/Locations.API/Program.cs +++ b/src/Services/Location/Locations.API/Program.cs @@ -44,10 +44,9 @@ 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..a76ad5349 100644 --- a/src/Services/Marketing/Marketing.API/Program.cs +++ b/src/Services/Marketing/Marketing.API/Program.cs @@ -55,11 +55,10 @@ 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..0bac28006 100644 --- a/src/Services/Ordering/Ordering.API/Program.cs +++ b/src/Services/Ordering/Ordering.API/Program.cs @@ -77,10 +77,9 @@ 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..ea0dc3bf3 100644 --- a/src/Services/Payment/Payment.API/Program.cs +++ b/src/Services/Payment/Payment.API/Program.cs @@ -44,10 +44,9 @@ 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/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) diff --git a/src/Web/WebMVC/Program.cs b/src/Web/WebMVC/Program.cs index 5a149ab44..eb99cd42e 100644 --- a/src/Web/WebMVC/Program.cs +++ b/src/Web/WebMVC/Program.cs @@ -42,10 +42,9 @@ 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/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 efe3f051b..cf648daa9 100644 --- a/src/Web/WebStatus/Program.cs +++ b/src/Web/WebStatus/Program.cs @@ -47,10 +47,9 @@ 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();