Update ES registrations

Author: StuartFerguson

MessagingService/Bootstrapper/MiddlewareRegistry.cs

@@ -16,20 +16,24 @@
     using Microsoft.OpenApi.Models;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Serialization;
-    using Shared.EventStore.EventStore;
     using Shared.EventStore.Extensions;
     using Shared.General;
     using Swashbuckle.AspNetCore.Filters;
     using System.Collections.Generic;
     using System.Linq;
     using System.Diagnostics.CodeAnalysis;
+    using Microsoft.Extensions.Configuration;
 
     [ExcludeFromCodeCoverage]
     public class MiddlewareRegistry : ServiceRegistry
     {
         public MiddlewareRegistry() {
+
+            String connectionString = Startup.Configuration.GetValue<String>("EventStoreSettings:ConnectionString");
+            EventStoreClientSettings eventStoreConnectionSettings = EventStoreClientSettings.Create(connectionString);
+
             this.AddHealthChecks()
-                .AddEventStore(Startup.EventStoreClientSettings,
+                .AddEventStore(eventStoreConnectionSettings,
                                name: "Eventstore",
                                failureStatus: HealthStatus.Unhealthy,
                                tags: new string[] { "db", "eventstore" });

MessagingService/Bootstrapper/RepositoryRegistry.cs

@@ -39,32 +39,12 @@ public RepositoryRegistry()
         }
         else
         {
-            Boolean insecureES = Startup.Configuration.GetValue<Boolean>("EventStoreSettings:Insecure");
+            String connectionString = Startup.Configuration.GetValue<String>("EventStoreSettings:ConnectionString");
 
-            Func<SocketsHttpHandler> CreateHttpMessageHandler = () => new SocketsHttpHandler
-                                                                      {
-                                                                          SslOptions = new SslClientAuthenticationOptions
-                                                                                       {
-                                                                                           RemoteCertificateValidationCallback = (sender,
-                                                                                               certificate,
-                                                                                               chain,
-                                                                                               errors) => {
-                                                                                               return true;
-                                                                                           }
-                                                                                       }
-                                                                      };
+            this.AddEventStoreProjectionManagementClient(connectionString);
+            this.AddEventStorePersistentSubscriptionsClient(connectionString);
 
-            this.AddEventStoreProjectionManagementClient(Startup.ConfigureEventStoreSettings);
-            this.AddEventStorePersistentSubscriptionsClient(Startup.ConfigureEventStoreSettings);
-            
-            if (insecureES)
-            {
-                this.AddInSecureEventStoreClient(Startup.EventStoreClientSettings.ConnectivitySettings.Address, CreateHttpMessageHandler);
-            }
-            else
-            {
-                this.AddEventStoreClient(Startup.EventStoreClientSettings.ConnectivitySettings.Address, CreateHttpMessageHandler);
-            }
+            this.AddEventStoreClient(connectionString);
 
             this.AddSingleton<IConnectionStringConfigurationRepository, ConfigurationReaderConnectionStringRepository>();
         }

MessagingService/Common/Extensions.cs

@@ -19,19 +19,6 @@
 [ExcludeFromCodeCoverage]
 public static class Extensions
 {
-    public static IServiceCollection AddInSecureEventStoreClient(
-        this IServiceCollection services,
-        Uri address,
-        Func<HttpMessageHandler>? createHttpMessageHandler = null)
-    {
-        return services.AddEventStoreClient((Action<EventStoreClientSettings>)(options =>
-                                                                               {
-                                                                                   options.ConnectivitySettings.Address = address;
-                                                                                   options.ConnectivitySettings.Insecure = true;
-                                                                                   options.CreateHttpMessageHandler = createHttpMessageHandler;
-                                                                               }));
-    }
-
     static Action<TraceEventType, String, String> log = (tt,
                                                              subType,
                                                              message) => {
@@ -74,9 +61,12 @@ public static void PreWarm(this IApplicationBuilder applicationBuilder)
 
         Func<String, Int32, ISubscriptionRepository> subscriptionRepositoryResolver = Startup.Container.GetInstance<Func<String, Int32, ISubscriptionRepository>>();
 
+
+        String connectionString = Startup.Configuration.GetValue<String>("EventStoreSettings:ConnectionString");
+        EventStoreClientSettings eventStoreConnectionSettings = EventStoreClientSettings.Create(connectionString);
         applicationBuilder.ConfigureSubscriptionService(subscriptionWorkersRoot,
                                                         eventStoreConnectionString,
-                                                        Startup.EventStoreClientSettings,
+                                                        eventStoreConnectionSettings,
                                                         eventHandlerResolvers,
                                                         Extensions.log,
                                                         subscriptionRepositoryResolver,

MessagingService/Startup.cs

@@ -48,26 +48,12 @@ public Startup(IWebHostEnvironment webHostEnvironment)
         public static IConfigurationRoot Configuration { get; set; }
 
         public static IWebHostEnvironment WebHostEnvironment { get; set; }
-
-        internal static EventStoreClientSettings EventStoreClientSettings;
-
+        
         public static void LoadTypes()
         {
-            RequestSentToEmailProviderEvent e = new RequestSentToEmailProviderEvent(Guid.Parse("2AA2D43B-5E24-4327-8029-1135B20F35CE"), "", new List<String>(),
-                                                                                    "", "", true);
-
-            RequestSentToSMSProviderEvent s = new RequestSentToSMSProviderEvent(Guid.NewGuid(), "", "", "");
-
             TypeProvider.LoadDomainEventsTypeDynamically();
         }
 
-        public static void ConfigureEventStoreSettings(EventStoreClientSettings settings)
-        {
-            String connectionString = Startup.Configuration.GetValue<String>("EventStoreSettings:ConnectionString");
-            
-            Startup.EventStoreClientSettings = EventStoreClientSettings.Create(connectionString); ;
-        }
-
         public static Container Container;
 
         public void ConfigureContainer(ServiceRegistry services)
@@ -82,11 +68,7 @@ public void ConfigureContainer(ServiceRegistry services)
             services.IncludeRegistry<MessagingProxyRegistry>();
 
             Startup.Container = new Container(services);
-
-            //Startup.ServiceProvider = services.BuildServiceProvider();
         }
-
-        //public static IServiceProvider ServiceProvider { get; set; }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)