lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix documentation endpoint for use with baseUrl

Browse Source
This commit is contained in:
crobibero 2020-04-21 16:15:31 -06:00
parent 3ab61dbdc2
commit 2542a27bd5
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
View File

@ -1,3 +1,4 @@
using MediaBrowser.Controller.Configuration;
using Microsoft.AspNetCore.Builder;
namespace Jellyfin.Server.Extensions
@ -11,23 +12,36 @@ namespace Jellyfin.Server.Extensions
/// Adds swagger and swagger UI to the application pipeline.
/// </summary>
/// <param name="applicationBuilder">The application builder.</param>
/// <param name="serverConfigurationManager">The server configuration.</param>
/// <returns>The updated application builder.</returns>
public static IApplicationBuilder UseJellyfinApiSwagger(this IApplicationBuilder applicationBuilder)
public static IApplicationBuilder UseJellyfinApiSwagger(
this IApplicationBuilder applicationBuilder,
IServerConfigurationManager serverConfigurationManager)
{
// Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.),
// specifying the Swagger JSON endpoint.
const string specEndpoint = "/swagger/v1/swagger.json";
var baseUrl = serverConfigurationManager.Configuration.BaseUrl.Trim('/');
if (!string.IsNullOrEmpty(baseUrl))
{
baseUrl += '/';
}
return applicationBuilder
.UseSwagger()
.UseSwagger(c =>
{
c.RouteTemplate = $"/{baseUrl}api-docs/{{documentName}}/openapi.json";
})
.UseSwaggerUI(c =>
{
c.SwaggerEndpoint(specEndpoint, "Jellyfin API V1");
c.RoutePrefix = "api-docs/swagger";
c.SwaggerEndpoint($"/{baseUrl}api-docs/v1/openapi.json", "Jellyfin API v1");
c.RoutePrefix = $"{baseUrl}api-docs/v1/swagger";
})
.UseReDoc(c =>
{
c.SpecUrl(specEndpoint);
c.RoutePrefix = "api-docs/redoc";
c.DocumentTitle = "Jellyfin API v1";
c.SpecUrl($"/{baseUrl}api-docs/v1/openapi.json");
c.RoutePrefix = $"{baseUrl}api-docs/v1/redoc";
});
}
}

2
Jellyfin.Server/Startup.cs
View File

@ -66,7 +66,7 @@ namespace Jellyfin.Server
app.Use(serverApplicationHost.ExecuteWebsocketHandlerAsync);
// TODO use when old API is removed: app.UseAuthentication();
app.UseJellyfinApiSwagger();
app.UseJellyfinApiSwagger(_serverConfigurationManager);
app.UseRouting();
app.UseAuthorization();
app.UseEndpoints(endpoints =>