From 873d70a67ea8fef783b351b7f70cf4e2dbd8d3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ram=C3=B3n=20Tom=C3=A1s?= Date: Fri, 4 Jan 2019 13:39:25 +0100 Subject: [PATCH] Fixed netcore2.2 CORS issue not allowing wildcard origins --- src/ApiGateways/ApiGw-Base/Startup.cs | 3 ++- src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs | 3 ++- src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs | 3 ++- src/Services/Basket/Basket.API/Startup.cs | 3 ++- src/Services/Catalog/Catalog.API/Startup.cs | 3 ++- src/Services/Location/Locations.API/Startup.cs | 3 ++- src/Services/Marketing/Marketing.API/Startup.cs | 3 ++- src/Services/Ordering/Ordering.API/Startup.cs | 3 ++- src/Services/Ordering/Ordering.SignalrHub/Startup.cs | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/ApiGateways/ApiGw-Base/Startup.cs b/src/ApiGateways/ApiGw-Base/Startup.cs index 012229a48..cd90bd7ca 100644 --- a/src/ApiGateways/ApiGw-Base/Startup.cs +++ b/src/ApiGateways/ApiGw-Base/Startup.cs @@ -39,9 +39,10 @@ namespace OcelotApiGw services.AddCors(options => { options.AddPolicy("CorsPolicy", - builder => builder.AllowAnyOrigin() + builder => builder .AllowAnyMethod() .AllowAnyHeader() + .SetIsOriginAllowed((host) => true) .AllowCredentials()); }); diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs index dd77d3c1b..eeb58ac3b 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs @@ -139,9 +139,10 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator services.AddCors(options => { options.AddPolicy("CorsPolicy", - builder => builder.AllowAnyOrigin() + builder => builder .AllowAnyMethod() .AllowAnyHeader() + .SetIsOriginAllowed((host) => true) .AllowCredentials()); }); diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs index 4cd2c0503..0fcd13a41 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs @@ -166,7 +166,8 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator services.AddCors(options => { options.AddPolicy("CorsPolicy", - builder => builder.AllowAnyOrigin() + builder => builder + .SetIsOriginAllowed((host) => true) .AllowAnyMethod() .AllowAnyHeader() .AllowCredentials()); diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index 18805ce94..eecc8bdd4 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -159,7 +159,8 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API services.AddCors(options => { options.AddPolicy("CorsPolicy", - builder => builder.AllowAnyOrigin() + builder => builder + .SetIsOriginAllowed((host) => true) .AllowAnyMethod() .AllowAnyHeader() .AllowCredentials()); diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs index 89deb9eef..5c77d37c8 100644 --- a/src/Services/Catalog/Catalog.API/Startup.cs +++ b/src/Services/Catalog/Catalog.API/Startup.cs @@ -141,7 +141,8 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API services.AddCors(options => { options.AddPolicy("CorsPolicy", - builder => builder.AllowAnyOrigin() + builder => builder + .SetIsOriginAllowed((host) => true) .AllowAnyMethod() .AllowAnyHeader() .AllowCredentials()); diff --git a/src/Services/Location/Locations.API/Startup.cs b/src/Services/Location/Locations.API/Startup.cs index 6ca0ecc6f..3e1936a55 100644 --- a/src/Services/Location/Locations.API/Startup.cs +++ b/src/Services/Location/Locations.API/Startup.cs @@ -133,7 +133,8 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API services.AddCors(options => { options.AddPolicy("CorsPolicy", - builder => builder.AllowAnyOrigin() + builder => builder + .SetIsOriginAllowed((host) => true) .AllowAnyMethod() .AllowAnyHeader() .AllowCredentials()); diff --git a/src/Services/Marketing/Marketing.API/Startup.cs b/src/Services/Marketing/Marketing.API/Startup.cs index 40f1b2695..826c8cb81 100644 --- a/src/Services/Marketing/Marketing.API/Startup.cs +++ b/src/Services/Marketing/Marketing.API/Startup.cs @@ -154,7 +154,8 @@ services.AddCors(options => { options.AddPolicy("CorsPolicy", - builder => builder.AllowAnyOrigin() + builder => builder + .SetIsOriginAllowed((host) => true) .AllowAnyMethod() .AllowAnyHeader() .AllowCredentials()); diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs index 39b424583..b517dfaa9 100644 --- a/src/Services/Ordering/Ordering.API/Startup.cs +++ b/src/Services/Ordering/Ordering.API/Startup.cs @@ -173,7 +173,8 @@ services.AddCors(options => { options.AddPolicy("CorsPolicy", - builder => builder.AllowAnyOrigin() + builder => builder + .SetIsOriginAllowed((host) => true) .AllowAnyMethod() .AllowAnyHeader() .AllowCredentials()); diff --git a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs index 6e10fd346..555606a67 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs +++ b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs @@ -39,9 +39,10 @@ namespace Ordering.SignalrHub .AddCors(options => { options.AddPolicy("CorsPolicy", - builder => builder.AllowAnyOrigin() + builder => builder .AllowAnyMethod() .AllowAnyHeader() + .SetIsOriginAllowed((host) => true) .AllowCredentials()); });