Merge pull request #1337 from morgenthaler-de/cors_order

correct call order of "app.UseCors"

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 =>

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();
 

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<BasketService>();

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();

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 =>

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 =>

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 =>

src/Services/Ordering/Ordering.SignalrHub/Startup.cs

@@ -133,10 +133,9 @@ namespace Ordering.SignalrHub
                 loggerFactory.CreateLogger<Startup>().LogDebug("Using PATH BASE '{pathBase}'", pathBase);
                 app.UsePathBase(pathBase);
             }
-
+            
-            app.UseCors("CorsPolicy");
             app.UseRouting();
-
+            app.UseCors("CorsPolicy");
             app.UseAuthentication();
             app.UseAuthorization();
 

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 =>