aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Jellyfin.Api/Middleware/BaseUrlRedirectionMiddleware.cs (renamed from Jellyfin.Server/Middleware/BaseUrlRedirectionMiddleware.cs)2
-rw-r--r--Jellyfin.Api/Middleware/ExceptionMiddleware.cs (renamed from Jellyfin.Server/Middleware/ExceptionMiddleware.cs)2
-rw-r--r--Jellyfin.Api/Middleware/IpBasedAccessValidationMiddleware.cs (renamed from Jellyfin.Server/Middleware/IpBasedAccessValidationMiddleware.cs)2
-rw-r--r--Jellyfin.Api/Middleware/LanFilteringMiddleware.cs (renamed from Jellyfin.Server/Middleware/LanFilteringMiddleware.cs)2
-rw-r--r--Jellyfin.Api/Middleware/LegacyEmbyRouteRewriteMiddleware.cs (renamed from Jellyfin.Server/Middleware/LegacyEmbyRouteRewriteMiddleware.cs)2
-rw-r--r--Jellyfin.Api/Middleware/QueryStringDecodingMiddleware.cs (renamed from Jellyfin.Server/Middleware/QueryStringDecodingMiddleware.cs)2
-rw-r--r--Jellyfin.Api/Middleware/ResponseTimeMiddleware.cs (renamed from Jellyfin.Server/Middleware/ResponseTimeMiddleware.cs)2
-rw-r--r--Jellyfin.Api/Middleware/RobotsRedirectionMiddleware.cs (renamed from Jellyfin.Server/Middleware/RobotsRedirectionMiddleware.cs)2
-rw-r--r--Jellyfin.Api/Middleware/ServerStartupMessageMiddleware.cs (renamed from Jellyfin.Server/Middleware/ServerStartupMessageMiddleware.cs)2
-rw-r--r--Jellyfin.Api/Middleware/UrlDecodeQueryFeature.cs (renamed from Jellyfin.Server/Middleware/UrlDecodeQueryFeature.cs)2
-rw-r--r--Jellyfin.Api/Middleware/WebSocketHandlerMiddleware.cs (renamed from Jellyfin.Server/Middleware/WebSocketHandlerMiddleware.cs)2
-rw-r--r--Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs2
-rw-r--r--Jellyfin.Server/Startup.cs2
-rw-r--r--tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs2
14 files changed, 14 insertions, 14 deletions
diff --git a/Jellyfin.Server/Middleware/BaseUrlRedirectionMiddleware.cs b/Jellyfin.Api/Middleware/BaseUrlRedirectionMiddleware.cs
index 6ee5bf38a..6bd9e0b08 100644
--- a/Jellyfin.Server/Middleware/BaseUrlRedirectionMiddleware.cs
+++ b/Jellyfin.Api/Middleware/BaseUrlRedirectionMiddleware.cs
@@ -7,7 +7,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using static MediaBrowser.Controller.Extensions.ConfigurationExtensions;
-namespace Jellyfin.Server.Middleware
+namespace Jellyfin.Api.Middleware
{
/// <summary>
/// Redirect requests without baseurl prefix to the baseurl prefixed URL.
diff --git a/Jellyfin.Server/Middleware/ExceptionMiddleware.cs b/Jellyfin.Api/Middleware/ExceptionMiddleware.cs
index 91dbce19a..6b3aeb187 100644
--- a/Jellyfin.Server/Middleware/ExceptionMiddleware.cs
+++ b/Jellyfin.Api/Middleware/ExceptionMiddleware.cs
@@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
-namespace Jellyfin.Server.Middleware
+namespace Jellyfin.Api.Middleware
{
/// <summary>
/// Exception Middleware.
diff --git a/Jellyfin.Server/Middleware/IpBasedAccessValidationMiddleware.cs b/Jellyfin.Api/Middleware/IpBasedAccessValidationMiddleware.cs
index 0afcd61a0..f7af91e48 100644
--- a/Jellyfin.Server/Middleware/IpBasedAccessValidationMiddleware.cs
+++ b/Jellyfin.Api/Middleware/IpBasedAccessValidationMiddleware.cs
@@ -4,7 +4,7 @@ using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Net;
using Microsoft.AspNetCore.Http;
-namespace Jellyfin.Server.Middleware
+namespace Jellyfin.Api.Middleware
{
/// <summary>
/// Validates the IP of requests coming from local networks wrt. remote access.
diff --git a/Jellyfin.Server/Middleware/LanFilteringMiddleware.cs b/Jellyfin.Api/Middleware/LanFilteringMiddleware.cs
index 67bf24d2a..18f13bbce 100644
--- a/Jellyfin.Server/Middleware/LanFilteringMiddleware.cs
+++ b/Jellyfin.Api/Middleware/LanFilteringMiddleware.cs
@@ -5,7 +5,7 @@ using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Configuration;
using Microsoft.AspNetCore.Http;
-namespace Jellyfin.Server.Middleware
+namespace Jellyfin.Api.Middleware
{
/// <summary>
/// Validates the LAN host IP based on application configuration.
diff --git a/Jellyfin.Server/Middleware/LegacyEmbyRouteRewriteMiddleware.cs b/Jellyfin.Api/Middleware/LegacyEmbyRouteRewriteMiddleware.cs
index b214299df..b73923c1e 100644
--- a/Jellyfin.Server/Middleware/LegacyEmbyRouteRewriteMiddleware.cs
+++ b/Jellyfin.Api/Middleware/LegacyEmbyRouteRewriteMiddleware.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
-namespace Jellyfin.Server.Middleware
+namespace Jellyfin.Api.Middleware
{
/// <summary>
/// Removes /emby and /mediabrowser from requested route.
diff --git a/Jellyfin.Server/Middleware/QueryStringDecodingMiddleware.cs b/Jellyfin.Api/Middleware/QueryStringDecodingMiddleware.cs
index 24807ce38..4b6304e0e 100644
--- a/Jellyfin.Server/Middleware/QueryStringDecodingMiddleware.cs
+++ b/Jellyfin.Api/Middleware/QueryStringDecodingMiddleware.cs
@@ -2,7 +2,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
-namespace Jellyfin.Server.Middleware
+namespace Jellyfin.Api.Middleware
{
/// <summary>
/// URL decodes the querystring before binding.
diff --git a/Jellyfin.Server/Middleware/ResponseTimeMiddleware.cs b/Jellyfin.Api/Middleware/ResponseTimeMiddleware.cs
index 531897cd4..3701d0f45 100644
--- a/Jellyfin.Server/Middleware/ResponseTimeMiddleware.cs
+++ b/Jellyfin.Api/Middleware/ResponseTimeMiddleware.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.Extensions.Logging;
-namespace Jellyfin.Server.Middleware
+namespace Jellyfin.Api.Middleware
{
/// <summary>
/// Response time middleware.
diff --git a/Jellyfin.Server/Middleware/RobotsRedirectionMiddleware.cs b/Jellyfin.Api/Middleware/RobotsRedirectionMiddleware.cs
index fabcd2da7..2e69580be 100644
--- a/Jellyfin.Server/Middleware/RobotsRedirectionMiddleware.cs
+++ b/Jellyfin.Api/Middleware/RobotsRedirectionMiddleware.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
-namespace Jellyfin.Server.Middleware
+namespace Jellyfin.Api.Middleware
{
/// <summary>
/// Redirect requests to robots.txt to web/robots.txt.
diff --git a/Jellyfin.Server/Middleware/ServerStartupMessageMiddleware.cs b/Jellyfin.Api/Middleware/ServerStartupMessageMiddleware.cs
index 2ec063392..dcd64401a 100644
--- a/Jellyfin.Server/Middleware/ServerStartupMessageMiddleware.cs
+++ b/Jellyfin.Api/Middleware/ServerStartupMessageMiddleware.cs
@@ -5,7 +5,7 @@ using MediaBrowser.Controller;
using MediaBrowser.Model.Globalization;
using Microsoft.AspNetCore.Http;
-namespace Jellyfin.Server.Middleware
+namespace Jellyfin.Api.Middleware
{
/// <summary>
/// Shows a custom message during server startup.
diff --git a/Jellyfin.Server/Middleware/UrlDecodeQueryFeature.cs b/Jellyfin.Api/Middleware/UrlDecodeQueryFeature.cs
index 2f1d79157..d35e0fcfd 100644
--- a/Jellyfin.Server/Middleware/UrlDecodeQueryFeature.cs
+++ b/Jellyfin.Api/Middleware/UrlDecodeQueryFeature.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.Extensions.Primitives;
-namespace Jellyfin.Server.Middleware
+namespace Jellyfin.Api.Middleware
{
/// <summary>
/// Defines the <see cref="UrlDecodeQueryFeature"/>.
diff --git a/Jellyfin.Server/Middleware/WebSocketHandlerMiddleware.cs b/Jellyfin.Api/Middleware/WebSocketHandlerMiddleware.cs
index b7a5d2b34..2cf1e5e4a 100644
--- a/Jellyfin.Server/Middleware/WebSocketHandlerMiddleware.cs
+++ b/Jellyfin.Api/Middleware/WebSocketHandlerMiddleware.cs
@@ -2,7 +2,7 @@ using System.Threading.Tasks;
using MediaBrowser.Controller.Net;
using Microsoft.AspNetCore.Http;
-namespace Jellyfin.Server.Middleware
+namespace Jellyfin.Api.Middleware
{
/// <summary>
/// Handles WebSocket requests.
diff --git a/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs b/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
index e29167747..463ca7321 100644
--- a/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
+using Jellyfin.Api.Middleware;
using Jellyfin.Networking.Configuration;
-using Jellyfin.Server.Middleware;
using MediaBrowser.Controller.Configuration;
using Microsoft.AspNetCore.Builder;
using Microsoft.OpenApi.Models;
diff --git a/Jellyfin.Server/Startup.cs b/Jellyfin.Server/Startup.cs
index f89f81c76..0062b8c05 100644
--- a/Jellyfin.Server/Startup.cs
+++ b/Jellyfin.Server/Startup.cs
@@ -5,6 +5,7 @@ using System.Net.Http;
using System.Net.Http.Headers;
using System.Net.Mime;
using System.Text;
+using Jellyfin.Api.Middleware;
using Jellyfin.MediaEncoding.Hls.Extensions;
using Jellyfin.Networking.Configuration;
using Jellyfin.Server.Extensions;
@@ -12,7 +13,6 @@ using Jellyfin.Server.HealthChecks;
using Jellyfin.Server.Implementations;
using Jellyfin.Server.Implementations.Extensions;
using Jellyfin.Server.Infrastructure;
-using Jellyfin.Server.Middleware;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration;
diff --git a/tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs b/tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs
index d15c9d6f5..797fc8f64 100644
--- a/tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs
+++ b/tests/Jellyfin.Server.Tests/UrlDecodeQueryFeatureTests.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using System.Linq;
-using Jellyfin.Server.Middleware;
+using Jellyfin.Api.Middleware;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.Extensions.Primitives;