Config changes

Infrastructure/Configuration/ConfigurationDependencyInjection.cs

@@ -1,20 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Musify.Infrastructure.Configuration
-{
-    public static class ConfigurationDependencyInjection
-    {
-        public static void AddKeycloakConfiguration(this IServiceCollection serviceDescriptors, IConfiguration configuration)
-        {
-            var keycloakConfiguration = KeycloakConfiguration.Load(configuration);
-            serviceDescriptors.AddSingleton(keycloakConfiguration);
-        }
-
-        public static void AddDatabaseConfiguration(this IServiceCollection serviceDescriptors, IConfiguration configuration)
-        {
-            var databaseConfiguration = DatabaseConfiguration.Load(configuration);
-            serviceDescriptors.AddSingleton(databaseConfiguration);
-        }
-    }
-}

Infrastructure/Configuration/DatabaseConfiguration.cs

@@ -1,31 +1,13 @@
-using Microsoft.Extensions.Configuration;
+using System.ComponentModel.DataAnnotations;
 
 namespace Musify.Infrastructure.Configuration
 {
+#pragma warning disable CS8618
     public class DatabaseConfiguration
     {
         public const string SectionName = "Database";
 
-        public string ConnectionString { get; set; } = string.Empty;
-
-        public static DatabaseConfiguration Load(IConfiguration configuration)
-        {
-            var databaseConfiguration = configuration.GetSection(SectionName).Get<DatabaseConfiguration>()
-                ?? throw new InvalidOperationException($"{SectionName} configuration section not found.");
-
-            Validate(databaseConfiguration);
-            return databaseConfiguration;
-        }
-
-        static void Validate(DatabaseConfiguration configuration)
-        {
-            EnsureValue(configuration.ConnectionString, nameof(configuration.ConnectionString));
-        }
-
-        static void EnsureValue(string value, string name)
-        {
-            if (string.IsNullOrEmpty(value))
-                throw new InvalidOperationException($"{name} configuration value not found.");
-        }
+        [Required]
+        public string ConnectionString { get; set; }
     }
 }

Infrastructure/Configuration/KeycloakConfiguration.cs

@@ -1,40 +1,22 @@
-using Microsoft.Extensions.Configuration;
+using System.ComponentModel.DataAnnotations;
 
 namespace Musify.Infrastructure.Configuration
 {
+#pragma warning disable CS8618
     public class KeycloakConfiguration
     {
         public const string SectionName = "Keycloak";
 
-        public string BaseUrl { get; set; } = string.Empty;
+        [Required]
+        public string BaseUrl { get; set; }
 
-        public string Realm { get; set; } = string.Empty;
+        [Required]
+        public string Realm { get; set; }
 
-        public string Username { get; set; } = string.Empty;
+        [Required]
+        public string Username { get; set; }
 
-        public string Password { get; set; } = string.Empty;
-
-        public static KeycloakConfiguration Load(IConfiguration configuration)
-        {
-            var keycloakConfiguration = configuration.GetSection(SectionName).Get<KeycloakConfiguration>()
-                ?? throw new InvalidOperationException($"{SectionName} configuration section not found.");
-
-            Validate(keycloakConfiguration);
-            return keycloakConfiguration;
-        }
-
-        static void Validate(KeycloakConfiguration configuration)
-        {
-            EnsureValue(configuration.BaseUrl, nameof(configuration.BaseUrl));
-            EnsureValue(configuration.Realm, nameof(configuration.Realm));
-            EnsureValue(configuration.Username, nameof(configuration.Username));
-            EnsureValue(configuration.Password, nameof(configuration.Password));
-        }
-
-        static void EnsureValue(string value, string name)
-        {
-            if (string.IsNullOrEmpty(value))
-                throw new InvalidOperationException($"{name} configuration value not found.");
-        }
+        [Required]
+        public string Password { get; set; }
     }
 }

Infrastructure/Identity/KeycloakDependencyInjection.cs

@@ -10,10 +10,14 @@ namespace Musify.Infrastructure.Identity
     {
         public static void AddKeycloakAuthentication(this IServiceCollection serviceDescriptors, IConfiguration configuration)
         {
-            var keycloakConfiguration = KeycloakConfiguration.Load(configuration);
-            serviceDescriptors.AddSingleton(keycloakConfiguration);
+            var keycloakConfiguration = serviceDescriptors.AddOptionsWithValidateOnStart<KeycloakConfiguration>()
+                .Bind(configuration)
+                .ValidateDataAnnotations();
+
             serviceDescriptors.AddScoped(serviceProvider =>
             {
+                var keycloakConfiguration = serviceProvider.GetRequiredService<KeycloakConfiguration>();
+
                 return new KeycloakClient(
                     keycloakConfiguration.BaseUrl,
                     keycloakConfiguration.Username,

Infrastructure/Identity/KeycloakIdentityService.cs

@@ -23,15 +23,14 @@ namespace Musify.Infrastructure.Identity
             }
             catch (OperationCanceledException)
             {
-                throw;
+                logger.LogError("Operation to retrieve Keycloak user with id {KeycloakId} was cancelled.", keycloakId);
+                return Result.Error("Operation was cancelled.");
             }
             catch (Exception exception)
             {
                 logger.LogWarning(exception, "Keycloak user with id {KeycloakId} could not be retrieved.", keycloakId);
-
                 return Result.NotFound();
             }
-
             return Result.Success(KeycloakUserMapper.Map(keycloakUser));
         }