Merge pull request #788 from erikpique/dev

ramon-tomas-c · web-flow · commit ab4dde15257e · 2018-09-27T12:08:34.000+02:00
update swagger nuget to 2.4.0 from 3.0.0
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" />
   </ItemGroup>
 
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs
@@ -1,4 +1,8 @@
-﻿using Microsoft.AspNetCore.Authentication.JwtBearer;
+﻿using System;
+using System.Collections.Generic;
+using System.IdentityModel.Tokens.Jwt;
+using System.Net.Http;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -12,10 +16,6 @@
 using Polly;
 using Polly.Extensions.Http;
 using Swashbuckle.AspNetCore.Swagger;
-using System;
-using System.Collections.Generic;
-using System.IdentityModel.Tokens.Jwt;
-using System.Net.Http;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
 {
@@ -61,7 +61,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             app.UseSwagger().UseSwaggerUI(c =>
            {
                c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Purchase BFF V1");
-               c.ConfigureOAuth2("Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregatorwaggerui", "", "", "Purchase BFF Swagger UI");
+
+               c.OAuthClientId("Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregatorwaggerui");
+               c.OAuthClientSecret(string.Empty);
+               c.OAuthRealm(string.Empty);
+               c.OAuthAppName("Purchase BFF Swagger UI");
            });
         }
     }
@@ -130,11 +134,9 @@ public static IServiceCollection AddCustomAuthentication(this IServiceCollection
                 {
                     OnAuthenticationFailed = async ctx =>
                     {
-                        int i = 0;
                     },
                     OnTokenValidated = async ctx =>
                     {
-                        int i = 0;
                     }
                 };
             });
@@ -166,15 +168,16 @@ public static IServiceCollection AddHttpServices(this IServiceCollection service
             return services;
         }
 
-        static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy()
+        private static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy()
         {
             return HttpPolicyExtensions
               .HandleTransientHttpError()
               .OrResult(msg => msg.StatusCode == System.Net.HttpStatusCode.NotFound)
               .WaitAndRetryAsync(6, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
 
         }
-        static IAsyncPolicy<HttpResponseMessage> GetCircuitBreakerPolicy()
+
+        private static IAsyncPolicy<HttpResponseMessage> GetCircuitBreakerPolicy()
         {
             return HttpPolicyExtensions
                 .HandleTransientHttpError()
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
@@ -13,8 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="2.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" />
   </ItemGroup>
 
diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
     <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.4" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj
@@ -42,7 +42,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
     <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
   </ItemGroup>
 
diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.1.0" />
     <PackageReference Include="IdentityServer4.EntityFramework" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.3.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
     <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="1.0.163" />
   </ItemGroup>
 
diff --git a/src/Services/Location/Locations.API/Locations.API.csproj b/src/Services/Location/Locations.API/Locations.API.csproj
@@ -18,8 +18,7 @@
     <PackageReference Include="MongoDB.Bson" Version="2.5.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.5.0" />
     <PackageReference Include="MongoDB.Driver.Core" Version="2.5.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="2.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" />
diff --git a/src/Services/Marketing/Marketing.API/Marketing.API.csproj b/src/Services/Marketing/Marketing.API/Marketing.API.csproj
@@ -32,7 +32,7 @@
     <PackageReference Include="MongoDB.Bson" Version="2.5.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.5.0" />
     <PackageReference Include="MongoDB.Driver.Core" Version="2.5.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" />
diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj
@@ -41,7 +41,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
     <PackageReference Include="MediatR" Version="4.1.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
     <PackageReference Include="System.Reflection" Version="4.3.0" />
     <PackageReference Include="Dapper" Version="1.50.4" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`		`-using Microsoft.AspNetCore.Authentication.JwtBearer;`
	`1`	`+using System;`
	`2`	`+using System.Collections.Generic;`
	`3`	`+using System.IdentityModel.Tokens.Jwt;`
	`4`	`+using System.Net.Http;`
	`5`	`+using Microsoft.AspNetCore.Authentication.JwtBearer;`
`2`	`6`	`using Microsoft.AspNetCore.Builder;`
`3`	`7`	`using Microsoft.AspNetCore.Hosting;`
`4`	`8`	`using Microsoft.AspNetCore.Http;`
`@@ -12,10 +16,6 @@`
`12`	`16`	`using Polly;`
`13`	`17`	`using Polly.Extensions.Http;`
`14`	`18`	`using Swashbuckle.AspNetCore.Swagger;`
`15`		`-using System;`
`16`		`-using System.Collections.Generic;`
`17`		`-using System.IdentityModel.Tokens.Jwt;`
`18`		`-using System.Net.Http;`
`19`	`19`
`20`	`20`	`namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator`
`21`	`21`	`{`
`@@ -61,7 +61,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF`
`61`	`61`	`app.UseSwagger().UseSwaggerUI(c =>`
`62`	`62`	`{`
`63`	`63`	`c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Purchase BFF V1");`
`64`		`- c.ConfigureOAuth2("Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregatorwaggerui", "", "", "Purchase BFF Swagger UI");`
	`64`	`+`
	`65`	`+ c.OAuthClientId("Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregatorwaggerui");`
	`66`	`+ c.OAuthClientSecret(string.Empty);`
	`67`	`+ c.OAuthRealm(string.Empty);`
	`68`	`+ c.OAuthAppName("Purchase BFF Swagger UI");`
`65`	`69`	`});`
`66`	`70`	`}`
`67`	`71`	`}`
`@@ -130,11 +134,9 @@ public static IServiceCollection AddCustomAuthentication(this IServiceCollection`
`130`	`134`	`{`
`131`	`135`	`OnAuthenticationFailed = async ctx =>`
`132`	`136`	`{`
`133`		`- int i = 0;`
`134`	`137`	`},`
`135`	`138`	`OnTokenValidated = async ctx =>`
`136`	`139`	`{`
`137`		`- int i = 0;`
`138`	`140`	`}`
`139`	`141`	`};`
`140`	`142`	`});`
`@@ -166,15 +168,16 @@ public static IServiceCollection AddHttpServices(this IServiceCollection service`
`166`	`168`	`return services;`
`167`	`169`	`}`
`168`	`170`
`169`		`- static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy()`
	`171`	`+ private static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy()`
`170`	`172`	`{`
`171`	`173`	`return HttpPolicyExtensions`
`172`	`174`	`.HandleTransientHttpError()`
`173`	`175`	`.OrResult(msg => msg.StatusCode == System.Net.HttpStatusCode.NotFound)`
`174`	`176`	`.WaitAndRetryAsync(6, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));`
`175`	`177`
`176`	`178`	`}`
`177`		`- static IAsyncPolicy<HttpResponseMessage> GetCircuitBreakerPolicy()`
	`179`	`+`
	`180`	`+ private static IAsyncPolicy<HttpResponseMessage> GetCircuitBreakerPolicy()`
`178`	`181`	`{`
`179`	`182`	`return HttpPolicyExtensions`
`180`	`183`	`.HandleTransientHttpError()`