From beda8378d59f9913a2653ab33ce84ed48b891ce7 Mon Sep 17 00:00:00 2001 From: Christian Morgenthaler Date: Mon, 8 Jun 2020 21:58:48 +0200 Subject: [PATCH] correct call order of "app.UseCors" --- src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs | 4 +--- src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs | 5 ++--- src/Services/Basket/Basket.API/Startup.cs | 4 ++-- src/Services/Catalog/Catalog.API/Startup.cs | 4 ++-- src/Services/Location/Locations.API/Startup.cs | 3 +-- src/Services/Marketing/Marketing.API/Startup.cs | 5 ++--- src/Services/Ordering/Ordering.API/Startup.cs | 3 +-- src/Services/Ordering/Ordering.SignalrHub/Startup.cs | 5 ++--- src/Services/Webhooks/Webhooks.API/Startup.cs | 3 ++- 9 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs index 7a48e93ed..6523cafe9 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs @@ -64,9 +64,6 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator { app.UseDeveloperExceptionPage(); } - - - app.UseCors("CorsPolicy"); app.UseSwagger().UseSwaggerUI(c => { @@ -79,6 +76,7 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator }); app.UseRouting(); + app.UseCors("CorsPolicy"); app.UseAuthentication(); app.UseAuthorization(); app.UseEndpoints(endpoints => diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs index 27ee6db3e..f9cd93819 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs @@ -64,9 +64,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator { app.UseDeveloperExceptionPage(); } - - - app.UseCors("CorsPolicy"); + app.UseHttpsRedirection(); app.UseSwagger().UseSwaggerUI(c => @@ -80,6 +78,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator }); app.UseRouting(); + app.UseCors("CorsPolicy"); app.UseAuthentication(); app.UseAuthorization(); diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index d9554bcb8..e8576b238 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -209,11 +209,11 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API }); app.UseRouting(); + app.UseCors("CorsPolicy"); ConfigureAuth(app); app.UseStaticFiles(); - - app.UseCors("CorsPolicy"); + app.UseEndpoints(endpoints => { endpoints.MapGrpcService(); diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs index 53a9554be..836b6a7b8 100644 --- a/src/Services/Catalog/Catalog.API/Startup.cs +++ b/src/Services/Catalog/Catalog.API/Startup.cs @@ -82,9 +82,9 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API { c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Catalog.API V1"); }); - - app.UseCors("CorsPolicy"); + app.UseRouting(); + app.UseCors("CorsPolicy"); app.UseEndpoints(endpoints => { endpoints.MapDefaultControllerRoute(); diff --git a/src/Services/Location/Locations.API/Startup.cs b/src/Services/Location/Locations.API/Startup.cs index 4f79b8977..ca6a57e6e 100644 --- a/src/Services/Location/Locations.API/Startup.cs +++ b/src/Services/Location/Locations.API/Startup.cs @@ -168,9 +168,8 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API app.UsePathBase(pathBase); } - app.UseCors("CorsPolicy"); - app.UseRouting(); + app.UseCors("CorsPolicy"); ConfigureAuth(app); app.UseEndpoints(endpoints => diff --git a/src/Services/Marketing/Marketing.API/Startup.cs b/src/Services/Marketing/Marketing.API/Startup.cs index 4c2c2a710..a7386a532 100644 --- a/src/Services/Marketing/Marketing.API/Startup.cs +++ b/src/Services/Marketing/Marketing.API/Startup.cs @@ -163,10 +163,9 @@ { app.UsePathBase(pathBase); } - - app.UseCors("CorsPolicy"); + app.UseRouting(); - + app.UseCors("CorsPolicy"); ConfigureAuth(app); app.UseEndpoints(endpoints => diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs index 3ccf16d54..a8da9a35c 100644 --- a/src/Services/Ordering/Ordering.API/Startup.cs +++ b/src/Services/Ordering/Ordering.API/Startup.cs @@ -89,8 +89,6 @@ app.UsePathBase(pathBase); } - app.UseCors("CorsPolicy"); - app.UseSwagger() .UseSwaggerUI(c => { @@ -100,6 +98,7 @@ }); app.UseRouting(); + app.UseCors("CorsPolicy"); ConfigureAuth(app); app.UseEndpoints(endpoints => diff --git a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs index cec48c4d2..a20a1a196 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs +++ b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs @@ -133,10 +133,9 @@ namespace Ordering.SignalrHub loggerFactory.CreateLogger().LogDebug("Using PATH BASE '{pathBase}'", pathBase); app.UsePathBase(pathBase); } - - app.UseCors("CorsPolicy"); + app.UseRouting(); - + app.UseCors("CorsPolicy"); app.UseAuthentication(); app.UseAuthorization(); diff --git a/src/Services/Webhooks/Webhooks.API/Startup.cs b/src/Services/Webhooks/Webhooks.API/Startup.cs index 7833133d5..c8073e1a0 100644 --- a/src/Services/Webhooks/Webhooks.API/Startup.cs +++ b/src/Services/Webhooks/Webhooks.API/Startup.cs @@ -78,9 +78,10 @@ namespace Webhooks.API app.UsePathBase(pathBase); } - app.UseCors("CorsPolicy"); + app.UseRouting(); + app.UseCors("CorsPolicy"); ConfigureAuth(app); app.UseEndpoints(endpoints =>