tweaks

Author: StuartFerguson

FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj

@@ -8,7 +8,7 @@
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.5" />
 		<PackageReference Include="EstateManagement.Client" Version="1.1.2" />
 		<PackageReference Include="EstateReporting.Database" Version="1.1.3" />
-		<PackageReference Include="SecurityService.Client" Version="1.1.1" />
+		<PackageReference Include="SecurityService.Client" Version="1.1.0" />
 		<PackageReference Include="Shared" Version="1.3.7" />
 		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.3.7" />
 		<PackageReference Include="MediatR" Version="10.0.1" />

FileProcessor.IntegrationTests/Common/DockerHelper.cs

@@ -286,18 +286,17 @@ public override async Task StartContainersForScenarioRun(String scenarioName)
             String FileProcessorBaseAddressResolver(String api) => $"http://127.0.0.1:{this.FileProcessorPort}";
             String EstateReportingBaseAddressResolver(String api) => $"http://127.0.0.1:{this.EstateReportingApiPort}";
 
-            HttpClientHandler clientHandler = new HttpClientHandler
-                                              {
-                                                  ServerCertificateCustomValidationCallback = (message,
-                                                                                               certificate2,
-                                                                                               arg3,
-                                                                                               arg4) =>
-                                                                                              {
-                                                                                                  return true;
-                                                                                              }
-
-                                              };
-            HttpClient httpClient = new HttpClient(clientHandler);
+            var httpMessageHandler = new SocketsHttpHandler
+                                     {
+                                         SslOptions =
+                                         {
+                                             RemoteCertificateValidationCallback = (sender,
+                                                                                    certificate,
+                                                                                    chain,
+                                                                                    errors) => true,
+                                         }
+                                     };
+            HttpClient httpClient = new HttpClient(httpMessageHandler);
             this.EstateClient = new EstateClient(EstateManagementBaseAddressResolver, httpClient);
             this.SecurityServiceClient = new SecurityServiceClient(SecurityServiceBaseAddressResolver, httpClient);
             this.EstateReportingClient = new EstateReportingClient(EstateReportingBaseAddressResolver, httpClient);
@@ -391,16 +390,6 @@ public async Task PopulateSubscriptionServiceConfiguration(String estateName, Bo
             await this.PopulateSubscriptionServiceConfiguration(this.EventStoreHttpPort, subscriptions, isSecureEventStore);
         }
 
-        public string ReplaceFirst(string text, string search, string replace)
-        {
-            int pos = text.IndexOf(search);
-            if (pos < 0)
-            {
-                return text;
-            }
-            return text.Substring(0, pos) + replace + text.Substring(pos + search.Length);
-        }
-        
         private async Task RemoveEstateReadModel()
         {
             List<Guid> estateIdList = this.TestingContext.GetAllEstateIds();