From e9a23ddfb82aea4ef5dc291bc871fa941b0b0328 Mon Sep 17 00:00:00 2001 From: Collin Barrett Date: Wed, 6 Jun 2018 21:20:59 -0500 Subject: [PATCH] try fixing swagger in prod ref #131 --- src/FilterLists.Api/Startup.cs | 23 ++++++++----------- .../V1/Controllers/BaseController.cs | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/FilterLists.Api/Startup.cs b/src/FilterLists.Api/Startup.cs index 4cc9ba244..863ebd88c 100644 --- a/src/FilterLists.Api/Startup.cs +++ b/src/FilterLists.Api/Startup.cs @@ -40,27 +40,14 @@ public void ConfigureServices(IServiceCollection services) public void Configure(IApplicationBuilder app, IHostingEnvironment env) { - app.UseSwagger(UseLowercaseControllerNameInSwaggerHack); if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - app.UseSwaggerUI(c => - { - c.SwaggerEndpoint("/../swagger/v1/swagger.json", "FilterLists API V1"); - c.RoutePrefix = "docs"; - c.DocumentTitle = "FilterLists API"; - }); } else { app.UseExceptionHandler("/Error"); app.UseHsts(); - app.UseSwaggerUI(c => - { - c.SwaggerEndpoint("https://filterlists.com/api/swagger/v1/swagger.json", "FilterLists API V1"); - c.RoutePrefix = "docs"; - c.DocumentTitle = "FilterLists API"; - }); } app.UseForwardedHeaders(new ForwardedHeadersOptions @@ -71,6 +58,16 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); app.UseCookiePolicy(); app.UseMvc(); + app.UseSwagger(UseLowercaseControllerNameInSwaggerHack); + app.UseSwaggerUI(c => + { + c.SwaggerEndpoint( + env.IsDevelopment() + ? "/../swagger/v1/swagger.json" + : "https://filterlists.com/api/swagger/v1/swagger.json", "FilterLists API V1"); + c.RoutePrefix = "docs"; + c.DocumentTitle = "FilterLists API"; + }); MigrateAndSeedDatabase(app); } diff --git a/src/FilterLists.Api/V1/Controllers/BaseController.cs b/src/FilterLists.Api/V1/Controllers/BaseController.cs index bdebc15d5..1d16b1e4e 100644 --- a/src/FilterLists.Api/V1/Controllers/BaseController.cs +++ b/src/FilterLists.Api/V1/Controllers/BaseController.cs @@ -5,7 +5,7 @@ namespace FilterLists.Api.V1.Controllers { [ApiVersion("1.0")] //https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/370 - [Route("v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/[controller]")] public class BaseController : Controller { protected readonly SeedService SeedService;