Migrate IOptions<T> to IOptionsMonitor<T> for live AppConfig reload

spokenbird · spokenbird · commit 53a6daccb407 · 2026-04-06T16:53:59.000-07:00
diff --git a/src/SEBT.Portal.Infrastructure/Dependencies.cs b/src/SEBT.Portal.Infrastructure/Dependencies.cs
@@ -40,7 +40,7 @@ public static IServiceCollection AddPortalInfrastructureServices(this IServiceCo
 
         services.AddHttpClient("Smarty", (sp, client) =>
         {
-            var smarty = sp.GetRequiredService<IOptions<SmartySettings>>().Value;
+            var smarty = sp.GetRequiredService<IOptionsMonitor<SmartySettings>>().CurrentValue;
             var baseUrl = string.IsNullOrWhiteSpace(smarty.BaseUrl)
                 ? "https://us-street.api.smartystreets.com"
                 : smarty.BaseUrl.TrimEnd('/');
@@ -52,16 +52,17 @@ public static IServiceCollection AddPortalInfrastructureServices(this IServiceCo
         services.AddTransient<PassThroughAddressUpdateService>();
         services.AddTransient<IAddressUpdateService>(sp =>
         {
-            var smarty = sp.GetRequiredService<IOptions<SmartySettings>>().Value;
+            var smarty = sp.GetRequiredService<IOptionsMonitor<SmartySettings>>().CurrentValue;
             return smarty.Enabled
                 ? sp.GetRequiredService<SmartyAddressUpdateService>()
                 : sp.GetRequiredService<PassThroughAddressUpdateService>();
         });
         services.AddTransient<IAddressValidationService, AddressValidationServiceAdapter>();
         services.AddSingleton<IIdentifierHasher, IdentifierHasher>();
 
-        // Expose SocureSettings directly for use case injection (avoids IOptions dependency in UseCases layer)
-        services.AddSingleton(sp => sp.GetRequiredService<IOptions<SocureSettings>>().Value);
+        // Expose SocureSettings directly for use case injection (avoids IOptions dependency in UseCases layer).
+        // Transient so each request gets the current value from IOptionsMonitor, supporting live AppConfig reload.
+        services.AddTransient(sp => sp.GetRequiredService<IOptionsMonitor<SocureSettings>>().CurrentValue);
 
         // Socure client — disabled, stub, or real based on configuration
         var socureEnabled = configuration.GetValue<bool>("Socure:Enabled");
@@ -71,7 +72,7 @@ public static IServiceCollection AddPortalInfrastructureServices(this IServiceCo
             services.AddTransient<HttpSocureClient>();
             services.AddTransient<ISocureClient>(sp =>
             {
-                var settings = sp.GetRequiredService<IOptions<SocureSettings>>().Value;
+                var settings = sp.GetRequiredService<IOptionsMonitor<SocureSettings>>().CurrentValue;
                 if (settings.UseStub)
                     return sp.GetRequiredService<StubSocureClient>();
 
diff --git a/src/SEBT.Portal.Infrastructure/Services/HouseholdIdentifierResolver.cs b/src/SEBT.Portal.Infrastructure/Services/HouseholdIdentifierResolver.cs
@@ -24,12 +24,12 @@ public class HouseholdIdentifierResolver : IHouseholdIdentifierResolver
     private readonly ILogger<HouseholdIdentifierResolver>? _logger;
 
     public HouseholdIdentifierResolver(
-        IOptions<StateHouseholdIdSettings> settings,
+        IOptionsMonitor<StateHouseholdIdSettings> optionsMonitor,
         IUserRepository userRepository,
         IPhoneOverrideProvider phoneOverrideProvider,
         ILogger<HouseholdIdentifierResolver>? logger = null)
     {
-        _settings = settings.Value;
+        _settings = optionsMonitor.CurrentValue;
         _userRepository = userRepository;
         _phoneOverrideProvider = phoneOverrideProvider;
         _logger = logger;
diff --git a/src/SEBT.Portal.Infrastructure/Services/HttpSocureClient.cs b/src/SEBT.Portal.Infrastructure/Services/HttpSocureClient.cs
@@ -19,7 +19,7 @@ namespace SEBT.Portal.Infrastructure.Services;
 /// </summary>
 public class HttpSocureClient(
     IHttpClientFactory httpClientFactory,
-    IOptions<SocureSettings> socureSettings,
+    IOptionsMonitor<SocureSettings> socureSettings,
     ILogger<HttpSocureClient> logger) : ISocureClient
 {
     private static readonly JsonSerializerOptions JsonOptions = new()
@@ -36,7 +36,7 @@ public async Task<Result<IdProofingAssessmentResult>> RunIdProofingAssessmentAsy
         string? idValue,
         CancellationToken cancellationToken = default)
     {
-        var settings = socureSettings.Value;
+        var settings = socureSettings.CurrentValue;
 
         var request = BuildEvaluationRequest(userId, email, dateOfBirth, idType, idValue, settings);
         var jsonContent = JsonSerializer.Serialize(request, JsonOptions);
diff --git a/src/SEBT.Portal.Infrastructure/Services/IdProofingRequirementsService.cs b/src/SEBT.Portal.Infrastructure/Services/IdProofingRequirementsService.cs
@@ -13,24 +13,25 @@ namespace SEBT.Portal.Infrastructure.Services;
 /// </summary>
 public class IdProofingRequirementsService : IIdProofingRequirementsService
 {
-    private readonly IdProofingRequirementsSettings _settings;
+    private readonly IOptionsMonitor<IdProofingRequirementsSettings> _optionsMonitor;
     private readonly ILogger<IdProofingRequirementsService> _logger;
 
     public IdProofingRequirementsService(
-        IOptions<IdProofingRequirementsSettings> settings,
+        IOptionsMonitor<IdProofingRequirementsSettings> optionsMonitor,
         ILogger<IdProofingRequirementsService> logger)
     {
-        _settings = settings.Value;
+        _optionsMonitor = optionsMonitor;
         _logger = logger;
     }
 
     /// <inheritdoc />
     public PiiVisibility GetPiiVisibility(UserIalLevel userIalLevel)
     {
+        var settings = _optionsMonitor.CurrentValue;
         return new PiiVisibility(
-            IncludeAddress: MeetsRequirement("Address", _settings.AddressView, userIalLevel),
-            IncludeEmail: MeetsRequirement("Email", _settings.EmailView, userIalLevel),
-            IncludePhone: MeetsRequirement("Phone", _settings.PhoneView, userIalLevel));
+            IncludeAddress: MeetsRequirement("Address", settings.AddressView, userIalLevel),
+            IncludeEmail: MeetsRequirement("Email", settings.EmailView, userIalLevel),
+            IncludePhone: MeetsRequirement("Phone", settings.PhoneView, userIalLevel));
     }
 
     private bool MeetsRequirement(string fieldName, IalLevel requirement, UserIalLevel userIalLevel)
diff --git a/src/SEBT.Portal.Infrastructure/Services/PassThroughAddressUpdateService.cs b/src/SEBT.Portal.Infrastructure/Services/PassThroughAddressUpdateService.cs
@@ -11,7 +11,7 @@ namespace SEBT.Portal.Infrastructure.Services;
 /// When Smarty is disabled, performs trimming/ZIP formatting and enforces <see cref="AddressValidationPolicySettings"/>
 /// (e.g. General Delivery) without calling an external API.
 /// </summary>
-public sealed class PassThroughAddressUpdateService(IOptions<AddressValidationPolicySettings> policySettings)
+public sealed class PassThroughAddressUpdateService(IOptionsMonitor<AddressValidationPolicySettings> policySettings)
     : IAddressUpdateService
 {
     public Task<Result<AddressUpdateSuccess>> ValidateAndNormalizeAsync(
@@ -20,7 +20,7 @@ public Task<Result<AddressUpdateSuccess>> ValidateAndNormalizeAsync(
     {
         cancellationToken.ThrowIfCancellationRequested();
 
-        var policy = policySettings.Value;
+        var policy = policySettings.CurrentValue;
         var normalized = AddressNormalizationHelper.TrimToAddress(
             request.StreetAddress1,
             request.StreetAddress2,
diff --git a/src/SEBT.Portal.Infrastructure/Services/SmartyAddressUpdateService.cs b/src/SEBT.Portal.Infrastructure/Services/SmartyAddressUpdateService.cs
@@ -18,8 +18,8 @@ namespace SEBT.Portal.Infrastructure.Services;
 /// </summary>
 public sealed class SmartyAddressUpdateService(
     IHttpClientFactory httpClientFactory,
-    IOptions<SmartySettings> smartySettings,
-    IOptions<AddressValidationPolicySettings> policySettings,
+    IOptionsMonitor<SmartySettings> smartySettings,
+    IOptionsMonitor<AddressValidationPolicySettings> policySettings,
     ILogger<SmartyAddressUpdateService> logger) : IAddressUpdateService
 {
     private static readonly JsonSerializerOptions SmartyRequestJsonOptions = new()
@@ -31,8 +31,8 @@ public async Task<Result<AddressUpdateSuccess>> ValidateAndNormalizeAsync(
         AddressUpdateOperationRequest request,
         CancellationToken cancellationToken = default)
     {
-        var policy = policySettings.Value;
-        var settings = smartySettings.Value;
+        var policy = policySettings.CurrentValue;
+        var settings = smartySettings.CurrentValue;
 
         var inputAddress = AddressNormalizationHelper.TrimToAddress(
             request.StreetAddress1,
diff --git a/test/SEBT.Portal.Tests/Integration/HttpSocureClientSmokeTests.cs b/test/SEBT.Portal.Tests/Integration/HttpSocureClientSmokeTests.cs
@@ -3,6 +3,7 @@
 using System.Text.Json;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using NSubstitute;
 using SEBT.Portal.Core.AppSettings;
 using SEBT.Portal.Core.Services;
 using SEBT.Portal.Infrastructure.Services;
@@ -38,7 +39,10 @@ private HttpSocureClient CreateRealClient(SocureSettings? settingsOverride = nul
         var factory = new SingleClientFactory(httpClient);
         var logger = new TestOutputLogger<HttpSocureClient>(output);
 
-        return new HttpSocureClient(factory, Options.Create(settings), logger);
+        var monitor = Substitute.For<IOptionsMonitor<SocureSettings>>();
+        monitor.CurrentValue.Returns(settings);
+
+        return new HttpSocureClient(factory, monitor, logger);
     }
 
     [Fact]
diff --git a/test/SEBT.Portal.Tests/Unit/Infrastructure/Services/HttpSocureClientTests.cs b/test/SEBT.Portal.Tests/Unit/Infrastructure/Services/HttpSocureClientTests.cs
@@ -30,9 +30,12 @@ private HttpSocureClient CreateClient(HttpMessageHandler handler)
         var factory = Substitute.For<IHttpClientFactory>();
         factory.CreateClient("Socure").Returns(httpClient);
 
+        var monitor = Substitute.For<IOptionsMonitor<SocureSettings>>();
+        monitor.CurrentValue.Returns(settings);
+
         return new HttpSocureClient(
             factory,
-            Options.Create(settings),
+            monitor,
             NullLogger<HttpSocureClient>.Instance);
     }
 
diff --git a/test/SEBT.Portal.Tests/Unit/Infrastructure/Services/PassThroughAddressUpdateServiceTests.cs b/test/SEBT.Portal.Tests/Unit/Infrastructure/Services/PassThroughAddressUpdateServiceTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Options;
+using NSubstitute;
 using SEBT.Portal.Core.AppSettings;
 using SEBT.Portal.Core.Models.AddressUpdate;
 using SEBT.Portal.Infrastructure.Services;
@@ -8,11 +9,17 @@ namespace SEBT.Portal.Tests.Unit.Infrastructure.Services;
 
 public class PassThroughAddressUpdateServiceTests
 {
+    private static PassThroughAddressUpdateService CreateService(AddressValidationPolicySettings policy)
+    {
+        var monitor = Substitute.For<IOptionsMonitor<AddressValidationPolicySettings>>();
+        monitor.CurrentValue.Returns(policy);
+        return new PassThroughAddressUpdateService(monitor);
+    }
+
     [Fact]
     public async Task ValidateAndNormalizeAsync_AllowsGeneralDelivery_WhenPolicyAllows()
     {
-        var service = new PassThroughAddressUpdateService(
-            Options.Create(new AddressValidationPolicySettings { AllowGeneralDelivery = true }));
+        var service = CreateService(new AddressValidationPolicySettings { AllowGeneralDelivery = true });
 
         var request = new AddressUpdateOperationRequest
         {
@@ -32,8 +39,7 @@ public async Task ValidateAndNormalizeAsync_AllowsGeneralDelivery_WhenPolicyAllo
     [Fact]
     public async Task ValidateAndNormalizeAsync_RejectsGeneralDelivery_WhenPolicyDisallows()
     {
-        var service = new PassThroughAddressUpdateService(
-            Options.Create(new AddressValidationPolicySettings { AllowGeneralDelivery = false }));
+        var service = CreateService(new AddressValidationPolicySettings { AllowGeneralDelivery = false });
 
         var request = new AddressUpdateOperationRequest
         {
diff --git a/test/SEBT.Portal.Tests/Unit/Infrastructure/Services/SmartyAddressUpdateServiceTests.cs b/test/SEBT.Portal.Tests/Unit/Infrastructure/Services/SmartyAddressUpdateServiceTests.cs
@@ -41,10 +41,15 @@ private static SmartyAddressUpdateService CreateService(
         var factory = Substitute.For<IHttpClientFactory>();
         factory.CreateClient("Smarty").Returns(httpClient);
 
+        var smartyMonitor = Substitute.For<IOptionsMonitor<SmartySettings>>();
+        smartyMonitor.CurrentValue.Returns(SmartySettings);
+        var policyMonitor = Substitute.For<IOptionsMonitor<AddressValidationPolicySettings>>();
+        policyMonitor.CurrentValue.Returns(policy ?? AllowGeneralDelivery);
+
         return new SmartyAddressUpdateService(
             factory,
-            Options.Create(SmartySettings),
-            Options.Create(policy ?? AllowGeneralDelivery),
+            smartyMonitor,
+            policyMonitor,
             NullLogger<SmartyAddressUpdateService>.Instance);
     }
 
diff --git a/test/SEBT.Portal.Tests/Unit/Services/HouseholdIdentifierResolverTests.cs b/test/SEBT.Portal.Tests/Unit/Services/HouseholdIdentifierResolverTests.cs
@@ -18,25 +18,32 @@ public class HouseholdIdentifierResolverTests
     private readonly IUserRepository _userRepository = Substitute.For<IUserRepository>();
     private static readonly IPhoneOverrideProvider NoOverride = NullPhoneOverrideProvider.Instance;
 
+    private static IOptionsMonitor<StateHouseholdIdSettings> MonitorFor(StateHouseholdIdSettings settings)
+    {
+        var monitor = Substitute.For<IOptionsMonitor<StateHouseholdIdSettings>>();
+        monitor.CurrentValue.Returns(settings);
+        return monitor;
+    }
+
     private static HouseholdIdentifierResolver CreateResolver(StateHouseholdIdSettings settings)
     {
         return new HouseholdIdentifierResolver(
-            Options.Create(settings),
+            MonitorFor(settings),
             Substitute.For<IUserRepository>(),
             NoOverride);
     }
 
     private static HouseholdIdentifierResolver CreateResolver(IUserRepository userRepository, StateHouseholdIdSettings settings)
     {
-        return new HouseholdIdentifierResolver(Options.Create(settings), userRepository, NoOverride);
+        return new HouseholdIdentifierResolver(MonitorFor(settings), userRepository, NoOverride);
     }
 
     private static HouseholdIdentifierResolver CreateResolver(
         IUserRepository userRepository,
         StateHouseholdIdSettings settings,
         IPhoneOverrideProvider phoneOverride)
     {
-        return new HouseholdIdentifierResolver(Options.Create(settings), userRepository, phoneOverride);
+        return new HouseholdIdentifierResolver(MonitorFor(settings), userRepository, phoneOverride);
     }
 
     private static ClaimsPrincipal CreatePrincipal(string email, string claimType = ClaimTypes.Email)
diff --git a/test/SEBT.Portal.Tests/Unit/Services/IdProofingRequirementsServiceTests.cs b/test/SEBT.Portal.Tests/Unit/Services/IdProofingRequirementsServiceTests.cs
@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
+using NSubstitute;
 using SEBT.Portal.Core.AppSettings;
 using SEBT.Portal.Core.Models.Auth;
 using SEBT.Portal.Infrastructure.Services;
@@ -9,8 +10,12 @@ namespace SEBT.Portal.Tests.Unit.Services;
 
 public class IdProofingRequirementsServiceTests
 {
-    private static IdProofingRequirementsService CreateService(IdProofingRequirementsSettings settings) =>
-        new(Options.Create(settings), NullLogger<IdProofingRequirementsService>.Instance);
+    private static IdProofingRequirementsService CreateService(IdProofingRequirementsSettings settings)
+    {
+        var monitor = Substitute.For<IOptionsMonitor<IdProofingRequirementsSettings>>();
+        monitor.CurrentValue.Returns(settings);
+        return new(monitor, NullLogger<IdProofingRequirementsService>.Instance);
+    }
 
     [Fact]
     public void GetPiiVisibility_WhenCompleted_AndAllRequireIal1_ReturnsAllTrue()

Original file line number	Diff line number	Diff line change
`@@ -13,24 +13,25 @@ namespace SEBT.Portal.Infrastructure.Services;`
`13`	`13`	`/// </summary>`
`14`	`14`	`public class IdProofingRequirementsService : IIdProofingRequirementsService`
`15`	`15`	`{`
`16`		`- private readonly IdProofingRequirementsSettings _settings;`
	`16`	`+ private readonly IOptionsMonitor<IdProofingRequirementsSettings> _optionsMonitor;`
`17`	`17`	`private readonly ILogger<IdProofingRequirementsService> _logger;`
`18`	`18`
`19`	`19`	`public IdProofingRequirementsService(`
`20`		`- IOptions<IdProofingRequirementsSettings> settings,`
	`20`	`+ IOptionsMonitor<IdProofingRequirementsSettings> optionsMonitor,`
`21`	`21`	`ILogger<IdProofingRequirementsService> logger)`
`22`	`22`	`{`
`23`		`- _settings = settings.Value;`
	`23`	`+ _optionsMonitor = optionsMonitor;`
`24`	`24`	`_logger = logger;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`/// <inheritdoc />`
`28`	`28`	`public PiiVisibility GetPiiVisibility(UserIalLevel userIalLevel)`
`29`	`29`	`{`
	`30`	`+ var settings = _optionsMonitor.CurrentValue;`
`30`	`31`	`return new PiiVisibility(`
`31`		`- IncludeAddress: MeetsRequirement("Address", _settings.AddressView, userIalLevel),`
`32`		`- IncludeEmail: MeetsRequirement("Email", _settings.EmailView, userIalLevel),`
`33`		`- IncludePhone: MeetsRequirement("Phone", _settings.PhoneView, userIalLevel));`
	`32`	`+ IncludeAddress: MeetsRequirement("Address", settings.AddressView, userIalLevel),`
	`33`	`+ IncludeEmail: MeetsRequirement("Email", settings.EmailView, userIalLevel),`
	`34`	`+ IncludePhone: MeetsRequirement("Phone", settings.PhoneView, userIalLevel));`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`private bool MeetsRequirement(string fieldName, IalLevel requirement, UserIalLevel userIalLevel)`