2 files changed, 1 insertions, 67 deletions
diff --git a/Jellyfin.Server/Middleware/DynamicCorsMiddleware.cs b/Jellyfin.Server/Middleware/DynamicCorsMiddleware.cs
deleted file mode 100644
index c4c491cdd..000000000
--- a/Jellyfin.Server/Middleware/DynamicCorsMiddleware.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Cors.Infrastructure;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Net.Http.Headers;
-
-namespace Jellyfin.Server.Middleware
-{
-    /// <summary>
-    /// Dynamic cors middleware.
-    /// </summary>
-    public class DynamicCorsMiddleware
-    {
-        private readonly RequestDelegate _next;
-        private readonly ILogger<DynamicCorsMiddleware> _logger;
-        private readonly CorsMiddleware _corsMiddleware;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DynamicCorsMiddleware"/> class.
-        /// </summary>
-        /// <param name="next">Next request delegate.</param>
-        /// <param name="corsService">Instance of the <see cref="ICorsService"/> interface.</param>
-        /// <param name="loggerFactory">Instance of the <see cref="ILoggerFactory"/> interface.</param>
-        /// <param name="policyName">The cors policy name.</param>
-        public DynamicCorsMiddleware(
-            RequestDelegate next,
-            ICorsService corsService,
-            ILoggerFactory loggerFactory,
-            string policyName)
-        {
-            _corsMiddleware = new CorsMiddleware(next, corsService, loggerFactory, policyName);
-            _next = next;
-            _logger = loggerFactory.CreateLogger<DynamicCorsMiddleware>();
-        }
-
-        /// <summary>
-        /// Invoke request.
-        /// </summary>
-        /// <param name="context">Request context.</param>
-        /// <param name="corsPolicyProvider">Instance of the <see cref="ICorsPolicyProvider"/> interface.</param>
-        /// <returns>Task.</returns>
-        ///
-        public async Task Invoke(HttpContext context, ICorsPolicyProvider corsPolicyProvider)
-        {
-            // Only execute if is preflight request.
-            if (string.Equals(context.Request.Method, CorsConstants.PreflightHttpMethod, StringComparison.OrdinalIgnoreCase))
-            {
-                // Invoke original cors middleware.
-                await _corsMiddleware.Invoke(context, corsPolicyProvider).ConfigureAwait(false);
-                if (context.Response.Headers.TryGetValue(HeaderNames.AccessControlAllowOrigin, out var headerValue)
-                    && string.Equals(headerValue, "*", StringComparison.Ordinal))
-                {
-                    context.Response.Headers[HeaderNames.AccessControlAllowOrigin] = context.Request.Host.Value;
-
-                    // Always allow credentials.
-                    context.Response.Headers[HeaderNames.AccessControlAllowCredentials] = "true";
-                    _logger.LogDebug("Overwriting CORS response header: {HeaderName}: {HeaderValue}", HeaderNames.AccessControlAllowOrigin, context.Request.Host.Value);
-                }
-            }
-
-            // Call the next delegate/middleware in the pipeline
-            await this._next(context).ConfigureAwait(false);
-        }
-    }
-}
diff --git a/Jellyfin.Server/Startup.cs b/Jellyfin.Server/Startup.cs
index 76f5e69ce..966587a6a 100644
--- a/Jellyfin.Server/Startup.cs
+++ b/Jellyfin.Server/Startup.cs
@@ -80,7 +80,7 @@ namespace Jellyfin.Server
             app.UseAuthentication();
             app.UseJellyfinApiSwagger(_serverConfigurationManager);
             app.UseRouting();
-            app.UseMiddleware<DynamicCorsMiddleware>(ServerCorsPolicy.DefaultPolicyName);
+            app.UseCors(ServerCorsPolicy.DefaultPolicyName);
             app.UseAuthorization();
             if (_serverConfigurationManager.Configuration.EnableMetrics)
             {