Reduce AutoApiLogonOperators to a read-only public surface

TransactionProcessor.Tests/General/BootstrapperTests.cs

@@ -1,8 +1,9 @@
-namespace TransactionProcessor.Tests.General
+namespace TransactionProcessor.Tests.General
 {
     using System;
     using System.Collections.Generic;
     using System.Diagnostics;
+    using System.Linq;
     using Lamar;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.Extensions.Configuration;
@@ -38,6 +39,30 @@ public void VerifyBootstrapperIsValid()
             Startup.Container.AssertConfigurationIsValid(AssertMode.Full);
         }
 
+        [Fact]
+        public void ConfigureContainer_PopulatesAutoApiLogonOperators_WithoutDuplicates()
+        {
+            Mock<IWebHostEnvironment> hostingEnvironment = new Mock<IWebHostEnvironment>();
+            hostingEnvironment.Setup(he => he.EnvironmentName).Returns("Development");
+            hostingEnvironment.Setup(he => he.ContentRootPath).Returns("/home");
+            hostingEnvironment.Setup(he => he.ApplicationName).Returns("Test Application");
+
+            Startup s = new Startup(hostingEnvironment.Object);
+            Startup.Configuration = this.SetupMemoryConfiguration();
+
+            ServiceRegistry firstServices = new ServiceRegistry();
+            this.AddTestRegistrations(firstServices, hostingEnvironment.Object);
+            s.ConfigureContainer(firstServices);
+
+            Assert.Equal(new[] { "Safaricom", "PataPawaPostPay" }, Startup.AutoApiLogonOperators.ToArray());
+
+            ServiceRegistry secondServices = new ServiceRegistry();
+            this.AddTestRegistrations(secondServices, hostingEnvironment.Object);
+            s.ConfigureContainer(secondServices);
+
+            Assert.Equal(new[] { "Safaricom", "PataPawaPostPay" }, Startup.AutoApiLogonOperators.ToArray());
+        }
+
         private IConfigurationRoot SetupMemoryConfiguration()
         {
             Dictionary<String, String> configuration = new Dictionary<String, String>();
@@ -54,6 +79,9 @@ private IConfigurationRoot SetupMemoryConfiguration()
             configuration.Add("AppSettings:SecurityService", "http://localhost");
             configuration.Add("SecurityConfiguration:Authority", "http://localhost");
             configuration.Add("ConnectionStrings:TransactionProcessorReadModel", "dbconnstring");
+            configuration.Add("OperatorConfiguration:Safaricom:ApiLogonRequired", "true");
+            configuration.Add("OperatorConfiguration:PataPawaPostPay:ApiLogonRequired", "true");
+            configuration.Add("OperatorConfiguration:PataPawaPrePay:ApiLogonRequired", "false");
 
             builder.AddInMemoryCollection(configuration);
 
@@ -103,4 +131,4 @@ private void AddTestRegistrations(IServiceCollection services,
     //        }
     //    }
     //}
-}
+}

TransactionProcessor/Bootstrapper/OperatorRegistry.cs

@@ -68,10 +68,10 @@ private void ConfigureOperator<T>(String operatorId) where T : class {
             BaseOperatorConfiguration cfg = configObject as BaseOperatorConfiguration;
 
             if (cfg.ApiLogonRequired) {
-                Startup.AutoApiLogonOperators.Add(operatorId);
+                Startup.AddAutoApiLogonOperator(operatorId);
             }
         }
 
         #endregion
     }
-}
+}

TransactionProcessor/Startup.cs

@@ -40,7 +40,7 @@ public class Startup
 
         public static Container Container;
 
-        public static List<String> AutoApiLogonOperators = new List<String>();
+        private static readonly List<String> AutoApiLogonOperatorsInternal = new List<String>();
 
         #endregion
 
@@ -77,6 +77,8 @@ public Startup(IWebHostEnvironment webHostEnvironment) {
 
         public static IServiceProvider ServiceProvider { get; set; }
 
+        public static IReadOnlyCollection<String> AutoApiLogonOperators => AutoApiLogonOperatorsInternal.AsReadOnly();
+
         /// <summary>
         /// Gets or sets the web host environment.
         /// </summary>
@@ -135,6 +137,7 @@ public void Configure(IApplicationBuilder app,
         public void ConfigureContainer(ServiceRegistry services) {
 
             ConfigurationReader.Initialise(Startup.Configuration);
+            Startup.AutoApiLogonOperatorsInternal.Clear();
 
             services.IncludeRegistry<MiscRegistry>();
             services.IncludeRegistry<MediatorRegistry>();
@@ -154,6 +157,12 @@ public void ConfigureContainer(ServiceRegistry services) {
             Startup.ServiceProvider = services.BuildServiceProvider();
         }
 
+        internal static void AddAutoApiLogonOperator(String operatorId) {
+            if (Startup.AutoApiLogonOperatorsInternal.Contains(operatorId) == false) {
+                Startup.AutoApiLogonOperatorsInternal.Add(operatorId);
+            }
+        }
+
         private void ConfigureEndpoints(IApplicationBuilder app) {
             app.UseEndpoints(endpoints => {
                                  endpoints.MapControllers();