Skip to content

Commit 9ec4837

Browse files
authored
Merge pull request dotnet-architecture#1337 from morgenthaler-de/cors_order
correct call order of "app.UseCors"
2 parents b1021c8 + beda837 commit 9ec4837

9 files changed

Lines changed: 15 additions & 21 deletions

File tree

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
6464
{
6565
app.UseDeveloperExceptionPage();
6666
}
67-
68-
69-
app.UseCors("CorsPolicy");
7067

7168
app.UseSwagger().UseSwaggerUI(c =>
7269
{
@@ -79,6 +76,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
7976
});
8077

8178
app.UseRouting();
79+
app.UseCors("CorsPolicy");
8280
app.UseAuthentication();
8381
app.UseAuthorization();
8482
app.UseEndpoints(endpoints =>

src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
6464
{
6565
app.UseDeveloperExceptionPage();
6666
}
67-
68-
69-
app.UseCors("CorsPolicy");
67+
7068
app.UseHttpsRedirection();
7169

7270
app.UseSwagger().UseSwaggerUI(c =>
@@ -80,6 +78,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
8078
});
8179

8280
app.UseRouting();
81+
app.UseCors("CorsPolicy");
8382
app.UseAuthentication();
8483
app.UseAuthorization();
8584

src/Services/Basket/Basket.API/Startup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
209209
});
210210

211211
app.UseRouting();
212+
app.UseCors("CorsPolicy");
212213
ConfigureAuth(app);
213214

214215
app.UseStaticFiles();
215-
216-
app.UseCors("CorsPolicy");
216+
217217
app.UseEndpoints(endpoints =>
218218
{
219219
endpoints.MapGrpcService<BasketService>();

src/Services/Catalog/Catalog.API/Startup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
8282
{
8383
c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Catalog.API V1");
8484
});
85-
86-
app.UseCors("CorsPolicy");
85+
8786
app.UseRouting();
87+
app.UseCors("CorsPolicy");
8888
app.UseEndpoints(endpoints =>
8989
{
9090
endpoints.MapDefaultControllerRoute();

src/Services/Location/Locations.API/Startup.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
168168
app.UsePathBase(pathBase);
169169
}
170170

171-
app.UseCors("CorsPolicy");
172-
173171
app.UseRouting();
172+
app.UseCors("CorsPolicy");
174173
ConfigureAuth(app);
175174

176175
app.UseEndpoints(endpoints =>

src/Services/Marketing/Marketing.API/Startup.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,9 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
163163
{
164164
app.UsePathBase(pathBase);
165165
}
166-
167-
app.UseCors("CorsPolicy");
166+
168167
app.UseRouting();
169-
168+
app.UseCors("CorsPolicy");
170169
ConfigureAuth(app);
171170

172171
app.UseEndpoints(endpoints =>

src/Services/Ordering/Ordering.API/Startup.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
8989
app.UsePathBase(pathBase);
9090
}
9191

92-
app.UseCors("CorsPolicy");
93-
9492
app.UseSwagger()
9593
.UseSwaggerUI(c =>
9694
{
@@ -100,6 +98,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
10098
});
10199

102100
app.UseRouting();
101+
app.UseCors("CorsPolicy");
103102
ConfigureAuth(app);
104103

105104
app.UseEndpoints(endpoints =>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,9 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
133133
loggerFactory.CreateLogger<Startup>().LogDebug("Using PATH BASE '{pathBase}'", pathBase);
134134
app.UsePathBase(pathBase);
135135
}
136-
137-
app.UseCors("CorsPolicy");
136+
138137
app.UseRouting();
139-
138+
app.UseCors("CorsPolicy");
140139
app.UseAuthentication();
141140
app.UseAuthorization();
142141

src/Services/Webhooks/Webhooks.API/Startup.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,10 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
7878
app.UsePathBase(pathBase);
7979
}
8080

81-
app.UseCors("CorsPolicy");
81+
8282

8383
app.UseRouting();
84+
app.UseCors("CorsPolicy");
8485
ConfigureAuth(app);
8586

8687
app.UseEndpoints(endpoints =>

0 commit comments

Comments
 (0)