From 342de39d78431503a0429b76e0ba9d3501b746db Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Sat, 5 Sep 2020 13:02:53 -0600
Subject: Move CorsPolicyProvider to Jellyfin.Server.Configuration

---
 .../Configuration/CorsPolicyProvider.cs            | 49 ++++++++++++++++++++++
 .../Extensions/ApiServiceCollectionExtensions.cs   |  1 +
 Jellyfin.Server/Middleware/CorsPolicyProvider.cs   | 49 ----------------------
 3 files changed, 50 insertions(+), 49 deletions(-)
 create mode 100644 Jellyfin.Server/Configuration/CorsPolicyProvider.cs
 delete mode 100644 Jellyfin.Server/Middleware/CorsPolicyProvider.cs

diff --git a/Jellyfin.Server/Configuration/CorsPolicyProvider.cs b/Jellyfin.Server/Configuration/CorsPolicyProvider.cs
new file mode 100644
index 0000000000..0d04b6bb13
--- /dev/null
+++ b/Jellyfin.Server/Configuration/CorsPolicyProvider.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Configuration;
+using Microsoft.AspNetCore.Cors.Infrastructure;
+using Microsoft.AspNetCore.Http;
+
+namespace Jellyfin.Server.Configuration
+{
+    /// <summary>
+    /// Cors policy provider.
+    /// </summary>
+    public class CorsPolicyProvider : ICorsPolicyProvider
+    {
+        private readonly IServerConfigurationManager _serverConfigurationManager;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CorsPolicyProvider"/> class.
+        /// </summary>
+        /// <param name="serverConfigurationManager">Instance of the <see cref="IServerConfigurationManager"/> interface.</param>
+        public CorsPolicyProvider(IServerConfigurationManager serverConfigurationManager)
+        {
+            _serverConfigurationManager = serverConfigurationManager;
+        }
+
+        /// <inheritdoc />
+        public Task<CorsPolicy> GetPolicyAsync(HttpContext context, string policyName)
+        {
+            var corsHosts = _serverConfigurationManager.Configuration.CorsHosts;
+            var builder = new CorsPolicyBuilder()
+                .AllowAnyMethod()
+                .AllowAnyHeader();
+
+            // No hosts configured or only default configured.
+            if (corsHosts.Length == 0
+                || (corsHosts.Length == 1
+                    && string.Equals(corsHosts[0], CorsConstants.AnyOrigin, StringComparison.Ordinal)))
+            {
+                builder.AllowAnyOrigin();
+            }
+            else
+            {
+                builder.WithOrigins(corsHosts)
+                    .AllowCredentials();
+            }
+
+            return Task.FromResult(builder.Build());
+        }
+    }
+}
diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index ce9e245588..9319b573a4 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -15,6 +15,7 @@ using Jellyfin.Api.Auth.LocalAccessPolicy;
 using Jellyfin.Api.Auth.RequiresElevationPolicy;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Controllers;
+using Jellyfin.Server.Configuration;
 using Jellyfin.Server.Formatters;
 using Jellyfin.Server.Middleware;
 using MediaBrowser.Common.Json;
diff --git a/Jellyfin.Server/Middleware/CorsPolicyProvider.cs b/Jellyfin.Server/Middleware/CorsPolicyProvider.cs
deleted file mode 100644
index 02178e29c7..0000000000
--- a/Jellyfin.Server/Middleware/CorsPolicyProvider.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Configuration;
-using Microsoft.AspNetCore.Cors.Infrastructure;
-using Microsoft.AspNetCore.Http;
-
-namespace Jellyfin.Server.Middleware
-{
-    /// <summary>
-    /// Cors policy provider.
-    /// </summary>
-    public class CorsPolicyProvider : ICorsPolicyProvider
-    {
-        private readonly IServerConfigurationManager _serverConfigurationManager;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CorsPolicyProvider"/> class.
-        /// </summary>
-        /// <param name="serverConfigurationManager">Instance of the <see cref="IServerConfigurationManager"/> interface.</param>
-        public CorsPolicyProvider(IServerConfigurationManager serverConfigurationManager)
-        {
-            _serverConfigurationManager = serverConfigurationManager;
-        }
-
-        /// <inheritdoc />
-        public Task<CorsPolicy> GetPolicyAsync(HttpContext context, string policyName)
-        {
-            var corsHosts = _serverConfigurationManager.Configuration.CorsHosts;
-            var builder = new CorsPolicyBuilder()
-                .AllowAnyMethod()
-                .AllowAnyHeader();
-
-            // No hosts configured or only default configured.
-            if (corsHosts.Length == 0
-                || (corsHosts.Length == 1
-                    && string.Equals(corsHosts[0], CorsConstants.AnyOrigin, StringComparison.Ordinal)))
-            {
-                builder.AllowAnyOrigin();
-            }
-            else
-            {
-                builder.WithOrigins(corsHosts)
-                    .AllowCredentials();
-            }
-
-            return Task.FromResult(builder.Build());
-        }
-    }
-}
-- 
cgit v1.2.3