Unify picture configuration and options registration

backend/Hosts/Musify.Api/Authentication/AuthenticationConfiguration.cs

@@ -1,10 +1,11 @@
 using System.ComponentModel.DataAnnotations;
+using Musify.Application.Configuration;
 
 namespace Musify.Api.Authentication;
 
-public sealed class AuthenticationConfiguration
+public sealed class AuthenticationConfiguration : IConfigurationOptions
 {
-    public const string SectionName = "Authentication";
+    public static string SectionName => "Authentication";
 
     [Required]
     [Url]

backend/Hosts/Musify.Api/Authentication/AuthenticationExtensions.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.Extensions.Options;
+using Musify.Application.Configuration;
 
 namespace Musify.Api.Authentication;
 
@@ -9,13 +9,7 @@ public static class AuthenticationExtensions
         this IServiceCollection services,
         IConfiguration configuration)
     {
-        services
-            .AddOptionsWithValidateOnStart<AuthenticationConfiguration>()
-            .Bind(configuration.GetRequiredSection(AuthenticationConfiguration.SectionName))
-            .ValidateDataAnnotations();
-
-        services.AddSingleton(serviceProvider =>
-            serviceProvider.GetRequiredService<IOptions<AuthenticationConfiguration>>().Value);
+        services.AddValidatedOptions<AuthenticationConfiguration>(configuration);
 
         services.AddMemoryCache();
         services.AddHttpClient();

backend/Hosts/Musify.Api/appsettings.json

@@ -59,37 +59,37 @@
     "PlayList": {
         "Routes": {
             "UploadsFolder": "uploads",
-            "ParentFolders": "PlayLists",
+            "ParentFolder": "PlayLists",
             "OriginalPicturesFolder": "OriginalPictures",
             "SmallPicturesFolder": "SmallPictures",
             "MediumPicturesFolder": "MediumPictures",
             "LargePicturesFolder": "LargePictures"
         },
         "PicturesSizes": {
-            "SmallPictureWidth": 128,
-            "SmallPictureHeight": 128,
-            "MediumPictureWidth": 256,
-            "MediumPictureHeight": 256,
-            "LargePictureWidth": 512,
-            "LargePictureHeight": 512
+            "SmallWidth": 128,
+            "SmallHeight": 128,
+            "MediumWidth": 256,
+            "MediumHeight": 256,
+            "LargeWidth": 512,
+            "LargeHeight": 512
         }
     },
     "Album": {
         "Routes": {
             "UploadsFolder": "uploads",
-            "ParentFolders": "Albums",
+            "ParentFolder": "Albums",
             "OriginalPicturesFolder": "OriginalPictures",
             "SmallPicturesFolder": "SmallPictures",
             "MediumPicturesFolder": "MediumPictures",
             "LargePicturesFolder": "LargePictures"
         },
         "PicturesSizes": {
-            "SmallPictureWidth": 128,
-            "SmallPictureHeight": 128,
-            "MediumPictureWidth": 256,
-            "MediumPictureHeight": 256,
-            "LargePictureWidth": 512,
-            "LargePictureHeight": 512
+            "SmallWidth": 128,
+            "SmallHeight": 128,
+            "MediumWidth": 256,
+            "MediumHeight": 256,
+            "LargeWidth": 512,
+            "LargeHeight": 512
         }
     },
     "Track": {
@@ -105,15 +105,15 @@
             "PresetMediumPicture": "PresetMediumPicture.webp",
             "PresetLargePicture": "PresetLargePicture.webp",
             "OriginalAudiosFolder": "OriginalAudios",
-            "ProcessedAudioFolder": "ProcessedAudios"
+            "ProcessedAudiosFolder": "ProcessedAudios"
         },
         "PicturesSizes": {
-            "SmallPictureWidth": 128,
-            "SmallPictureHeight": 128,
-            "MediumPictureWidth": 256,
-            "MediumPictureHeight": 256,
-            "LargePictureWidth": 512,
-            "LargePictureHeight": 512
+            "SmallWidth": 128,
+            "SmallHeight": 128,
+            "MediumWidth": 256,
+            "MediumHeight": 256,
+            "LargeWidth": 512,
+            "LargeHeight": 512
         }
     },
     "UploadIntent": {

backend/Hosts/Musify.StreamingGateway/Authentication/TicketValidator.cs

@@ -1,5 +1,4 @@
 using System.Security.Cryptography;
-using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.JsonWebTokens;
 using Microsoft.IdentityModel.Tokens;
 using Musify.StreamingGateway.Configuration;
@@ -15,14 +14,14 @@ public sealed record TicketValidationResult(string Prefix, long? MaxBytes)
 
 public sealed class TicketValidator : IDisposable
 {
-    private readonly StreamTicketValidationOptions _options;
+    private readonly StreamTicketValidationConfiguration _options;
     private readonly RSA _rsa;
     private readonly TokenValidationParameters _validationParameters;
     private readonly JsonWebTokenHandler _handler = new();
 
-    public TicketValidator(IOptions<StreamTicketValidationOptions> options)
+    public TicketValidator(StreamTicketValidationConfiguration options)
     {
-        _options = options.Value;
+        _options = options;
 
         _rsa = RSA.Create();
         _rsa.ImportFromPem(File.ReadAllText(_options.PublicKeyPath));

backend/Hosts/Musify.StreamingGateway/Configuration/StreamTicketValidationConfiguration.cs

@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
 
 namespace Musify.StreamingGateway.Configuration;
 
-public sealed class StreamTicketValidationOptions
+public sealed class StreamTicketValidationConfiguration
 {
     public const string SectionName = "StreamTicket";
 

backend/Hosts/Musify.StreamingGateway/Middleware/TicketValidationMiddleware.cs

@@ -1,4 +1,3 @@
-using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
 using Musify.StreamingGateway.Authentication;
@@ -9,11 +8,9 @@ namespace Musify.StreamingGateway.Middleware;
 public sealed class TicketValidationMiddleware(
     RequestDelegate next,
     TicketValidator ticketValidator,
-    IOptions<StreamTicketValidationOptions> options,
+    StreamTicketValidationConfiguration options,
     ILogger<TicketValidationMiddleware> logger)
 {
-    private readonly StreamTicketValidationOptions options = options.Value;
-
     public async Task InvokeAsync(HttpContext context)
     {
         var path = context.Request.Path;

backend/Hosts/Musify.StreamingGateway/Program.cs

@@ -1,3 +1,4 @@
+using Microsoft.Extensions.Options;
 using Musify.StreamingGateway.Authentication;
 using Musify.StreamingGateway.Configuration;
 using Musify.StreamingGateway.Middleware;
@@ -5,11 +6,14 @@ using Musify.StreamingGateway.Middleware;
 var builder = WebApplication.CreateBuilder();
 
 builder.Services
-    .AddOptions<StreamTicketValidationOptions>()
-    .Bind(builder.Configuration.GetRequiredSection(StreamTicketValidationOptions.SectionName))
+    .AddOptions<StreamTicketValidationConfiguration>()
+    .Bind(builder.Configuration.GetRequiredSection(StreamTicketValidationConfiguration.SectionName))
     .ValidateDataAnnotations()
     .ValidateOnStart();
 
+builder.Services.AddSingleton(serviceProvider =>
+    serviceProvider.GetRequiredService<IOptions<StreamTicketValidationConfiguration>>().Value);
+
 builder.Services.AddSingleton<TicketValidator>();
 
 const string corsPolicy = "media-clients";

backend/Hosts/Musify.Worker/Program.cs

@@ -17,10 +17,10 @@ var configuration = builder.Configuration;
 
 var services = builder.Services;
 
-services.AddValidatedOptions<ApplicationStorageConfiguration>(configuration, ApplicationStorageConfiguration.SectionName);
-services.AddValidatedOptions<PlayListConfiguration>(configuration, PlayListConfiguration.SectionName);
-services.AddValidatedOptions<TrackConfiguration>(configuration, TrackConfiguration.SectionName);
-services.AddValidatedOptions<MixConfiguration>(configuration, MixConfiguration.SectionName);
+services.AddValidatedOptions<ApplicationStorageConfiguration>(configuration);
+services.AddValidatedOptions<PlayListConfiguration>(configuration);
+services.AddValidatedOptions<TrackConfiguration>(configuration);
+services.AddValidatedOptions<MixConfiguration>(configuration);
 services.AddStorageService(configuration);
 services.AddAudioTranscoder(configuration);
 services.AddPictureService();

backend/Hosts/Musify.Worker/appsettings.json

@@ -31,19 +31,19 @@
     },
     "PlayList": {
         "Routes": {
-            "ParentFolders": "PlayLists",
+            "ParentFolder": "PlayLists",
             "OriginalPicturesFolder": "OriginalPictures",
             "SmallPicturesFolder": "SmallPictures",
             "MediumPicturesFolder": "MediumPictures",
             "LargePicturesFolder": "LargePictures"
         },
         "PicturesSizes": {
-            "SmallPictureWidth": 128,
-            "SmallPictureHeight": 128,
-            "MediumPictureWidth": 256,
-            "MediumPictureHeight": 256,
-            "LargePictureWidth": 512,
-            "LargePictureHeight": 512
+            "SmallWidth": 128,
+            "SmallHeight": 128,
+            "MediumWidth": 256,
+            "MediumHeight": 256,
+            "LargeWidth": 512,
+            "LargeHeight": 512
         }
     },
     "Track": {
@@ -58,15 +58,15 @@
             "PresetMediumPicture": "PresetMediumPicture.webp",
             "PresetLargePicture": "PresetLargePicture.webp",
             "OriginalAudiosFolder": "OriginalAudios",
-            "ProcessedAudioFolder": "ProcessedAudios"
+            "ProcessedAudiosFolder": "ProcessedAudios"
         },
         "PicturesSizes": {
-            "SmallPictureWidth": 128,
-            "SmallPictureHeight": 128,
-            "MediumPictureWidth": 256,
-            "MediumPictureHeight": 256,
-            "LargePictureWidth": 512,
-            "LargePictureHeight": 512
+            "SmallWidth": 128,
+            "SmallHeight": 128,
+            "MediumWidth": 256,
+            "MediumHeight": 256,
+            "LargeWidth": 512,
+            "LargeHeight": 512
         }
     },
     "AudioTranscoder": {