mirror of https://github.com/jellyfin/jellyfin
Remove legacy API route middleware (#15669)
This commit is contained in:
parent
428beda1c7
commit
6b6d54a07c
|
|
@ -1,53 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.AspNetCore.Http;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace Jellyfin.Api.Middleware;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Removes /emby and /mediabrowser from requested route.
|
|
||||||
/// </summary>
|
|
||||||
public class LegacyEmbyRouteRewriteMiddleware
|
|
||||||
{
|
|
||||||
private const string EmbyPath = "/emby";
|
|
||||||
private const string MediabrowserPath = "/mediabrowser";
|
|
||||||
|
|
||||||
private readonly RequestDelegate _next;
|
|
||||||
private readonly ILogger<LegacyEmbyRouteRewriteMiddleware> _logger;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Initializes a new instance of the <see cref="LegacyEmbyRouteRewriteMiddleware"/> class.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="next">The next delegate in the pipeline.</param>
|
|
||||||
/// <param name="logger">The logger.</param>
|
|
||||||
public LegacyEmbyRouteRewriteMiddleware(
|
|
||||||
RequestDelegate next,
|
|
||||||
ILogger<LegacyEmbyRouteRewriteMiddleware> logger)
|
|
||||||
{
|
|
||||||
_next = next;
|
|
||||||
_logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Executes the middleware action.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="httpContext">The current HTTP context.</param>
|
|
||||||
/// <returns>The async task.</returns>
|
|
||||||
public async Task Invoke(HttpContext httpContext)
|
|
||||||
{
|
|
||||||
var localPath = httpContext.Request.Path.ToString();
|
|
||||||
if (localPath.StartsWith(EmbyPath, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
httpContext.Request.Path = localPath[EmbyPath.Length..];
|
|
||||||
_logger.LogDebug("Removing {EmbyPath} from route.", EmbyPath);
|
|
||||||
}
|
|
||||||
else if (localPath.StartsWith(MediabrowserPath, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
httpContext.Request.Path = localPath[MediabrowserPath.Length..];
|
|
||||||
_logger.LogDebug("Removing {MediabrowserPath} from route.", MediabrowserPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
await _next(httpContext).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -117,18 +117,5 @@ namespace Jellyfin.Server.Extensions
|
||||||
{
|
{
|
||||||
return appBuilder.UseMiddleware<RobotsRedirectionMiddleware>();
|
return appBuilder.UseMiddleware<RobotsRedirectionMiddleware>();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Adds /emby and /mediabrowser route trimming to the application pipeline.
|
|
||||||
/// </summary>
|
|
||||||
/// <remarks>
|
|
||||||
/// This must be injected before any path related middleware.
|
|
||||||
/// </remarks>
|
|
||||||
/// <param name="appBuilder">The application builder.</param>
|
|
||||||
/// <returns>The updated application builder.</returns>
|
|
||||||
public static IApplicationBuilder UsePathTrim(this IApplicationBuilder appBuilder)
|
|
||||||
{
|
|
||||||
return appBuilder.UseMiddleware<LegacyEmbyRouteRewriteMiddleware>();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -173,9 +173,6 @@ namespace Jellyfin.Server
|
||||||
mainApp.UseHttpsRedirection();
|
mainApp.UseHttpsRedirection();
|
||||||
}
|
}
|
||||||
|
|
||||||
// This must be injected before any path related middleware.
|
|
||||||
mainApp.UsePathTrim();
|
|
||||||
|
|
||||||
if (appConfig.HostWebClient())
|
if (appConfig.HostWebClient())
|
||||||
{
|
{
|
||||||
var extensionProvider = new FileExtensionContentTypeProvider();
|
var extensionProvider = new FileExtensionContentTypeProvider();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue