5 files changed, 3 insertions, 126 deletions
diff --git a/Jellyfin.Api/Controllers/StartupController.cs b/Jellyfin.Api/Controllers/StartupController.cs
index 0e7d17a27..50f3dc83c 100644
--- a/Jellyfin.Api/Controllers/StartupController.cs
+++ b/Jellyfin.Api/Controllers/StartupController.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Jellyfin.Api.Models.Startup;
+using Jellyfin.Api.Models.StartupDtos;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using Microsoft.AspNetCore.Authorization;
diff --git a/Jellyfin.Api/Extensions/ApiApplicationBuilderExtensions.cs b/Jellyfin.Api/Extensions/ApiApplicationBuilderExtensions.cs
deleted file mode 100644
index f70466ebe..000000000
--- a/Jellyfin.Api/Extensions/ApiApplicationBuilderExtensions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-
-namespace Jellyfin.Api.Extensions
-{
-    /// <summary>
-    /// Extensions for adding API specific functionality to the application pipeline.
-    /// </summary>
-    public static class ApiApplicationBuilderExtensions
-    {
-        /// <summary>
-        /// Adds swagger and swagger UI to the application pipeline.
-        /// </summary>
-        /// <param name="applicationBuilder">The application builder.</param>
-        /// <returns>The updated application builder.</returns>
-        public static IApplicationBuilder UseJellyfinApiSwagger(this IApplicationBuilder applicationBuilder)
-        {
-            applicationBuilder.UseSwagger();
-
-            // Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.),
-            // specifying the Swagger JSON endpoint.
-            return applicationBuilder.UseSwaggerUI(c =>
-            {
-                c.SwaggerEndpoint("/swagger/v1/swagger.json", "Jellyfin API V1");
-            });
-        }
-    }
-}
diff --git a/Jellyfin.Api/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Api/Extensions/ApiServiceCollectionExtensions.cs
deleted file mode 100644
index 38f5f6d39..000000000
--- a/Jellyfin.Api/Extensions/ApiServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using Jellyfin.Api.Auth;
-using Jellyfin.Api.Auth.FirstTimeSetupOrElevatedPolicy;
-using Jellyfin.Api.Auth.RequiresElevationPolicy;
-using Jellyfin.Api.Controllers;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Authorization;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Models;
-
-namespace Jellyfin.Api.Extensions
-{
-    /// <summary>
-    /// API specific extensions for the service collection.
-    /// </summary>
-    public static class ApiServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Adds jellyfin API authorization policies to the DI container.
-        /// </summary>
-        /// <param name="serviceCollection">The service collection.</param>
-        /// <returns>The updated service collection.</returns>
-        public static IServiceCollection AddJellyfinApiAuthorization(this IServiceCollection serviceCollection)
-        {
-            serviceCollection.AddSingleton<IAuthorizationHandler, FirstTimeSetupOrElevatedHandler>();
-            serviceCollection.AddSingleton<IAuthorizationHandler, RequiresElevationHandler>();
-            return serviceCollection.AddAuthorizationCore(options =>
-            {
-                options.AddPolicy(
-                    "RequiresElevation",
-                    policy =>
-                    {
-                        policy.AddAuthenticationSchemes("CustomAuthentication");
-                        policy.AddRequirements(new RequiresElevationRequirement());
-                    });
-                options.AddPolicy(
-                    "FirstTimeSetupOrElevated",
-                    policy =>
-                    {
-                        policy.AddAuthenticationSchemes("CustomAuthentication");
-                        policy.AddRequirements(new FirstTimeSetupOrElevatedRequirement());
-                    });
-            });
-        }
-
-        /// <summary>
-        /// Adds custom legacy authentication to the service collection.
-        /// </summary>
-        /// <param name="serviceCollection">The service collection.</param>
-        /// <returns>The updated service collection.</returns>
-        public static AuthenticationBuilder AddCustomAuthentication(this IServiceCollection serviceCollection)
-        {
-            return serviceCollection.AddAuthentication("CustomAuthentication")
-                .AddScheme<AuthenticationSchemeOptions, CustomAuthenticationHandler>("CustomAuthentication", null);
-        }
-
-        /// <summary>
-        /// Extension method for adding the jellyfin API to the service collection.
-        /// </summary>
-        /// <param name="serviceCollection">The service collection.</param>
-        /// <param name="baseUrl">The base url for the API.</param>
-        /// <returns>The MVC builder.</returns>
-        public static IMvcBuilder AddJellyfinApi(this IServiceCollection serviceCollection, string baseUrl)
-        {
-            return serviceCollection.AddMvc(opts =>
-                {
-                    var policy = new AuthorizationPolicyBuilder()
-                        .RequireAuthenticatedUser()
-                        .Build();
-                    opts.Filters.Add(new AuthorizeFilter(policy));
-                    opts.EnableEndpointRouting = false;
-                    opts.UseGeneralRoutePrefix(baseUrl);
-                })
-                .SetCompatibilityVersion(CompatibilityVersion.Version_2_2)
-
-                // Clear app parts to avoid other assemblies being picked up
-                .ConfigureApplicationPartManager(a => a.ApplicationParts.Clear())
-                .AddApplicationPart(typeof(StartupController).Assembly)
-                .AddControllersAsServices();
-        }
-
-        /// <summary>
-        /// Adds Swagger to the service collection.
-        /// </summary>
-        /// <param name="serviceCollection">The service collection.</param>
-        /// <returns>The updated service collection.</returns>
-        public static IServiceCollection AddJellyfinApiSwagger(this IServiceCollection serviceCollection)
-        {
-            return serviceCollection.AddSwaggerGen(c =>
-            {
-                c.SwaggerDoc("v1", new OpenApiInfo { Title = "Jellyfin API", Version = "v1" });
-            });
-        }
-    }
-}
diff --git a/Jellyfin.Api/Models/Startup/StartupConfigurationDto.cs b/Jellyfin.Api/Models/StartupDtos/StartupConfigurationDto.cs
index dac15e412..d048dad0a 100644
--- a/Jellyfin.Api/Models/Startup/StartupConfigurationDto.cs
+++ b/Jellyfin.Api/Models/StartupDtos/StartupConfigurationDto.cs
@@ -1,4 +1,4 @@
-namespace Jellyfin.Api.Models.Startup
+namespace Jellyfin.Api.Models.StartupDtos
 {
     /// <summary>
     /// The startup configuration DTO.
diff --git a/Jellyfin.Api/Models/Startup/StartupUserDto.cs b/Jellyfin.Api/Models/StartupDtos/StartupUserDto.cs
index 7e890d76a..3a9348037 100644
--- a/Jellyfin.Api/Models/Startup/StartupUserDto.cs
+++ b/Jellyfin.Api/Models/StartupDtos/StartupUserDto.cs
@@ -1,4 +1,4 @@
-namespace Jellyfin.Api.Models.Startup
+namespace Jellyfin.Api.Models.StartupDtos
 {
     /// <summary>
     /// The startup user DTO.