ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix catalog

Browse Source
This commit is contained in:
Erik Pique 2019-07-26 15:39:50 +02:00
parent 9e97fb415b
commit e9811980f3
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Services/Catalog/Catalog.API/Startup.cs
View File

@ -26,10 +26,8 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.OpenApi.Models;
using RabbitMQ.Client;
using System;
using System.Collections.Generic;
using System.Data.Common;
using System.IO;
using System.Reflection;
@ -77,8 +75,15 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
app.UsePathBase(pathBase);
}
app.UseSwagger()
.UseSwaggerUI(c =>
{
c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Catalog.API V1");
});
app.UseCors("CorsPolicy");
app.UseAuthorization();
app.UseAuthentication();
app.UseRouting();
app.UseEndpoints(endpoints =>
{
@ -110,12 +115,6 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
});
});
app.UseSwagger()
.UseSwaggerUI(c =>
{
c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Catalog.API V1");
});
ConfigureEventBus(app);
}
@ -142,7 +141,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
services.AddControllers(options =>
{
options.Filters.Add(typeof(HttpGlobalExceptionFilter));
});
}).AddNewtonsoftJson();
services.AddCors(options =>
{
@ -269,22 +268,6 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
Version = "v1",
Description = "The Catalog Microservice HTTP API. This is a Data-Driven/CRUD microservice sample"
});
options.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme
{
Type = SecuritySchemeType.OAuth2,
Flows = new OpenApiOAuthFlows()
{
Implicit = new OpenApiOAuthFlow()
{
AuthorizationUrl = new Uri($"{configuration.GetValue<string>("IdentityUrlExternal")}/connect/authorize"),
TokenUrl = new Uri($"{configuration.GetValue<string>("IdentityUrlExternal")}/connect/token"),
Scopes = new Dictionary<string, string>()
{
{ "catalog", "Catalog API" }
}
}
}
});
});
return services;