Browse Source

correct call order of "app.UseCors"

pull/1337/head
Christian Morgenthaler 4 years ago
parent
commit
beda8378d5
9 changed files with 15 additions and 21 deletions
  1. +1
    -3
      src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs
  2. +2
    -3
      src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs
  3. +2
    -2
      src/Services/Basket/Basket.API/Startup.cs
  4. +2
    -2
      src/Services/Catalog/Catalog.API/Startup.cs
  5. +1
    -2
      src/Services/Location/Locations.API/Startup.cs
  6. +2
    -3
      src/Services/Marketing/Marketing.API/Startup.cs
  7. +1
    -2
      src/Services/Ordering/Ordering.API/Startup.cs
  8. +2
    -3
      src/Services/Ordering/Ordering.SignalrHub/Startup.cs
  9. +2
    -1
      src/Services/Webhooks/Webhooks.API/Startup.cs

+ 1
- 3
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs View File

@ -64,9 +64,6 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
{ {
app.UseDeveloperExceptionPage(); app.UseDeveloperExceptionPage();
} }
app.UseCors("CorsPolicy");
app.UseSwagger().UseSwaggerUI(c => app.UseSwagger().UseSwaggerUI(c =>
{ {
@ -79,6 +76,7 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
}); });
app.UseRouting(); app.UseRouting();
app.UseCors("CorsPolicy");
app.UseAuthentication(); app.UseAuthentication();
app.UseAuthorization(); app.UseAuthorization();
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>


+ 2
- 3
src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs View File

@ -64,9 +64,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
{ {
app.UseDeveloperExceptionPage(); app.UseDeveloperExceptionPage();
} }
app.UseCors("CorsPolicy");
app.UseHttpsRedirection(); app.UseHttpsRedirection();
app.UseSwagger().UseSwaggerUI(c => app.UseSwagger().UseSwaggerUI(c =>
@ -80,6 +78,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
}); });
app.UseRouting(); app.UseRouting();
app.UseCors("CorsPolicy");
app.UseAuthentication(); app.UseAuthentication();
app.UseAuthorization(); app.UseAuthorization();


+ 2
- 2
src/Services/Basket/Basket.API/Startup.cs View File

@ -209,11 +209,11 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
}); });
app.UseRouting(); app.UseRouting();
app.UseCors("CorsPolicy");
ConfigureAuth(app); ConfigureAuth(app);
app.UseStaticFiles(); app.UseStaticFiles();
app.UseCors("CorsPolicy");
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>
{ {
endpoints.MapGrpcService<BasketService>(); endpoints.MapGrpcService<BasketService>();


+ 2
- 2
src/Services/Catalog/Catalog.API/Startup.cs View File

@ -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"); c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Catalog.API V1");
}); });
app.UseCors("CorsPolicy");
app.UseRouting(); app.UseRouting();
app.UseCors("CorsPolicy");
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>
{ {
endpoints.MapDefaultControllerRoute(); endpoints.MapDefaultControllerRoute();


+ 1
- 2
src/Services/Location/Locations.API/Startup.cs View File

@ -168,9 +168,8 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API
app.UsePathBase(pathBase); app.UsePathBase(pathBase);
} }
app.UseCors("CorsPolicy");
app.UseRouting(); app.UseRouting();
app.UseCors("CorsPolicy");
ConfigureAuth(app); ConfigureAuth(app);
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>


+ 2
- 3
src/Services/Marketing/Marketing.API/Startup.cs View File

@ -163,10 +163,9 @@
{ {
app.UsePathBase(pathBase); app.UsePathBase(pathBase);
} }
app.UseCors("CorsPolicy");
app.UseRouting(); app.UseRouting();
app.UseCors("CorsPolicy");
ConfigureAuth(app); ConfigureAuth(app);
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>


+ 1
- 2
src/Services/Ordering/Ordering.API/Startup.cs View File

@ -89,8 +89,6 @@
app.UsePathBase(pathBase); app.UsePathBase(pathBase);
} }
app.UseCors("CorsPolicy");
app.UseSwagger() app.UseSwagger()
.UseSwaggerUI(c => .UseSwaggerUI(c =>
{ {
@ -100,6 +98,7 @@
}); });
app.UseRouting(); app.UseRouting();
app.UseCors("CorsPolicy");
ConfigureAuth(app); ConfigureAuth(app);
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>


+ 2
- 3
src/Services/Ordering/Ordering.SignalrHub/Startup.cs View File

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


+ 2
- 1
src/Services/Webhooks/Webhooks.API/Startup.cs View File

@ -78,9 +78,10 @@ namespace Webhooks.API
app.UsePathBase(pathBase); app.UsePathBase(pathBase);
} }
app.UseCors("CorsPolicy");
app.UseRouting(); app.UseRouting();
app.UseCors("CorsPolicy");
ConfigureAuth(app); ConfigureAuth(app);
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>


Loading…
Cancel
Save