Skip to content

Commit c1320f4

Browse files
author
igorsych
committed
1 parent c5778a0 commit c1320f4

9 files changed

Lines changed: 26 additions & 29 deletions

File tree

‎src/Services/Basket/Basket.API/Auth/Server/AuthorizationHeaderParameterOperationFilter.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using Microsoft.AspNetCore.Mvc.Authorization;
2-
using Swashbuckle.Swagger.Model;
3-
using Swashbuckle.SwaggerGen.Generator;
4-
using System;
2+
using Swashbuckle.AspNetCore.Swagger;
3+
using Swashbuckle.AspNetCore.SwaggerGen;
54
using System.Collections.Generic;
65
using System.Linq;
7-
using System.Threading.Tasks;
86

97
namespace Microsoft.eShopOnContainers.Services.Basket.API.Auth.Server
108
{

‎src/Services/Basket/Basket.API/Auth/Server/IdentitySecurityScheme.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
using Swashbuckle.Swagger.Model;
2-
using System;
1+
using Swashbuckle.AspNetCore.Swagger;
32
using System.Collections.Generic;
4-
using System.Linq;
5-
using System.Threading.Tasks;
63

74
namespace Microsoft.eShopOnContainers.Services.Basket.API.Auth.Server
85
{

‎src/Services/Basket/Basket.API/Basket.API.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25+
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
2526
<PackageReference Include="System.Threading" Version="4.3.0" />
2627
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
2728
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
@@ -36,7 +37,6 @@
3637
<PackageReference Include="StackExchange.Redis" Version="1.1.608" />
3738
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
3839
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.0.1-rc3" />
39-
<PackageReference Include="Swashbuckle" Version="6.0.0-beta902" />
4040
</ItemGroup>
4141

4242
<ItemGroup>

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,10 @@ public void ConfigureServices(IServiceCollection services)
8282
return new DefaultRabbitMQPersistentConnection(factory, logger);
8383
});
8484

85-
services.AddSwaggerGen();
86-
87-
services.ConfigureSwaggerGen(options =>
85+
services.AddSwaggerGen(options =>
8886
{
89-
options.OperationFilter<AuthorizationHeaderParameterOperationFilter>();
9087
options.DescribeAllEnumsAsStrings();
91-
options.SingleApiVersion(new Swashbuckle.Swagger.Model.Info()
88+
options.SwaggerDoc("eShopOnContainers - Basket HTTP API", new Swashbuckle.AspNetCore.Swagger.Info
9289
{
9390
Title = "Basket HTTP API",
9491
Version = "v1",
@@ -97,7 +94,6 @@ public void ConfigureServices(IServiceCollection services)
9794
});
9895
});
9996

100-
10197
services.AddCors(options =>
10298
{
10399
options.AddPolicy("CorsPolicy",
@@ -137,7 +133,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
137133
app.UseMvcWithDefaultRoute();
138134

139135
app.UseSwagger()
140-
.UseSwaggerUi();
136+
.UseSwaggerUI(c =>
137+
{
138+
c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
139+
});
141140

142141
ConfigureEventBus(app);
143142

‎src/Services/Catalog/Catalog.API/Catalog.API.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" />
4949
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" />
5050
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
51-
<PackageReference Include="Swashbuckle" Version="6.0.0-beta902" />
51+
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
5252
</ItemGroup>
5353

5454
<ItemGroup>

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,10 @@ public void ConfigureServices(IServiceCollection services)
8282
services.Configure<CatalogSettings>(Configuration);
8383

8484
// Add framework services.
85-
services.AddSwaggerGen();
86-
services.ConfigureSwaggerGen(options =>
85+
services.AddSwaggerGen(options =>
8786
{
8887
options.DescribeAllEnumsAsStrings();
89-
options.SingleApiVersion(new Swashbuckle.Swagger.Model.Info()
88+
options.SwaggerDoc("eShopOnContainers - Catalog HTTP API",new Swashbuckle.AspNetCore.Swagger.Info
9089
{
9190
Title = "eShopOnContainers - Catalog HTTP API",
9291
Version = "v1",
@@ -137,7 +136,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
137136
app.UseMvcWithDefaultRoute();
138137

139138
app.UseSwagger()
140-
.UseSwaggerUi();
139+
.UseSwaggerUI(c =>
140+
{
141+
c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
142+
});
141143

142144
var context = (CatalogContext)app
143145
.ApplicationServices.GetService(typeof(CatalogContext));

‎src/Services/Ordering/Ordering.API/Infrastructure/Auth/AuthorizationHeaderParameterOperationFilter.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.AspNetCore.Mvc.Authorization;
2-
using Swashbuckle.Swagger.Model;
3-
using Swashbuckle.SwaggerGen.Generator;
2+
using Swashbuckle.AspNetCore.Swagger;
3+
using Swashbuckle.AspNetCore.SwaggerGen;
44
using System.Collections.Generic;
55
using System.Linq;
66

‎src/Services/Ordering/Ordering.API/Ordering.API.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<PackageReference Include="FluentValidation.MVC6" Version="6.4.0" />
3939
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="1.1.0" />
4040
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.0.0" />
41-
<PackageReference Include="Swashbuckle" Version="6.0.0-beta902" />
4241
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
4342
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
4443
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
@@ -58,6 +57,7 @@
5857
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.2" />
5958
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
6059
<PackageReference Include="MediatR" Version="2.1.0" />
60+
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
6161
<PackageReference Include="System.Reflection" Version="4.3.0" />
6262
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.0.1-rc3" />
6363
<PackageReference Include="Dapper" Version="1.50.2" />

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,10 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
8282
ServiceLifetime.Scoped //Showing explicitly that the DbContext is shared across the HTTP request scope (graph of objects started in the HTTP request)
8383
);
8484

85-
services.AddSwaggerGen();
86-
services.ConfigureSwaggerGen(options =>
85+
services.AddSwaggerGen(options =>
8786
{
88-
options.OperationFilter<AuthorizationHeaderParameterOperationFilter>();
8987
options.DescribeAllEnumsAsStrings();
90-
options.SingleApiVersion(new Swashbuckle.Swagger.Model.Info()
88+
options.SwaggerDoc("eShopOnContainers - Ordering HTTP API", new Swashbuckle.AspNetCore.Swagger.Info
9189
{
9290
Title = "Ordering HTTP API",
9391
Version = "v1",
@@ -153,7 +151,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
153151
app.UseMvcWithDefaultRoute();
154152

155153
app.UseSwagger()
156-
.UseSwaggerUi();
154+
.UseSwaggerUI(c =>
155+
{
156+
c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
157+
});
157158

158159
OrderingContextSeed.SeedAsync(app).Wait();
159160

0 commit comments

Comments
 (0)