diff --git a/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj b/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj index eb781937..6c8f3d23 100644 --- a/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj +++ b/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj @@ -13,7 +13,7 @@ - + diff --git a/SecurityService.Client/SecurityService.Client.csproj b/SecurityService.Client/SecurityService.Client.csproj index 4e05c275..7447c44d 100644 --- a/SecurityService.Client/SecurityService.Client.csproj +++ b/SecurityService.Client/SecurityService.Client.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/SecurityService.Client/SecurityServiceClient.cs b/SecurityService.Client/SecurityServiceClient.cs index 287e7fd8..f1eea49c 100644 --- a/SecurityService.Client/SecurityServiceClient.cs +++ b/SecurityService.Client/SecurityServiceClient.cs @@ -20,15 +20,15 @@ namespace SecurityService.Client /// public class SecurityServiceClient : ClientBase, ISecurityServiceClient { - private static String Serialise(Object arg) - { - return JsonConvert.SerializeObject(arg); - } + //private static String Serialise(Object arg) + //{ + // return JsonConvert.SerializeObject(arg); + //} - private static Object Deserialise(String arg, Type type) - { - return JsonConvert.DeserializeObject(arg, type); - } + //private static Object Deserialise(String arg, Type type) + //{ + // return JsonConvert.DeserializeObject(arg, type); + //} #region Fields @@ -52,13 +52,12 @@ private static Object Deserialise(String arg, Type type) /// The base address resolver. /// The HTTP client. public SecurityServiceClient(Func baseAddressResolver, - HttpClient httpClient) : base(httpClient, Serialise, Deserialise) + HttpClient httpClient, + Func serialise, + Func deserialise) : base(httpClient, serialise, deserialise) { this.BaseAddressResolver = baseAddressResolver; this.BaseAddress = baseAddressResolver("SecurityService"); - - // Add the API version header - //this.HttpClient.DefaultRequestHeaders.Add("api-version", "1.0"); } #endregion diff --git a/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj b/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj index 3711b820..535f77b4 100644 --- a/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj +++ b/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj @@ -10,7 +10,7 @@ - + diff --git a/SecurityService.IntegrationTests/Common/DockerHelper.cs b/SecurityService.IntegrationTests/Common/DockerHelper.cs index e830d4d6..56ca172b 100644 --- a/SecurityService.IntegrationTests/Common/DockerHelper.cs +++ b/SecurityService.IntegrationTests/Common/DockerHelper.cs @@ -1,17 +1,10 @@ using System; using System.Collections.Generic; using System.Text; +using Shared.Serialisation; namespace SecurityService.IntergrationTests.Common { - using System.Data.SqlClient; - using System.Linq; - using System.Net; - using System.Net.Http; - using System.Net.Security; - using System.Security.Cryptography.X509Certificates; - using System.Threading; - using System.Threading.Tasks; using Client; using Ductus.FluentDocker; using Ductus.FluentDocker.Builders; @@ -22,18 +15,36 @@ namespace SecurityService.IntergrationTests.Common using Ductus.FluentDocker.Services.Extensions; using Microsoft.EntityFrameworkCore; using Shared.IntegrationTesting; + using System.Data.SqlClient; + using System.Linq; + using System.Net; + using System.Net.Http; + using System.Net.Security; + using System.Security.Cryptography.X509Certificates; + using System.Threading; + using System.Threading.Tasks; public class DockerHelper : Shared.IntegrationTesting.TestContainers.DockerHelper { public ISecurityServiceClient SecurityServiceClient; - + + String Serialise(Object arg) + { + return StringSerialiser.Serialise(arg); + } + + Object Deserialise(String arg, Type type) + { + return StringSerialiser.DeserializeObject(arg, type); + } + public async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices) { await base.StartContainersForScenarioRun(scenarioName, dockerServices); Func securityServiceBaseAddressResolver = api => $"https://localhost:{this.SecurityServicePort}"; HttpClient httpClient = new HttpClient(); - this.SecurityServiceClient = new SecurityServiceClient(securityServiceBaseAddressResolver,httpClient); + this.SecurityServiceClient = new SecurityServiceClient(securityServiceBaseAddressResolver,httpClient, Serialise, Deserialise); ServicePointManager.SecurityProtocol = SecurityProtocolType.SystemDefault; } diff --git a/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj b/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj index 81eb67f5..0827d0a8 100644 --- a/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj +++ b/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj @@ -24,7 +24,7 @@ - + diff --git a/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs b/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs index 60a4229b..35a47a2f 100644 --- a/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs +++ b/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs @@ -1,12 +1,19 @@ -using System.Runtime.InteropServices; -using DotNet.Testcontainers.Builders; +using DotNet.Testcontainers.Builders; using DotNet.Testcontainers.Configurations; using DotNet.Testcontainers.Containers; using DotNet.Testcontainers.Networks; using Shared.IntegrationTesting.TestContainers; +using System.Runtime.InteropServices; namespace SecurityService.IntergrationTests.Common { + using Client; + using Newtonsoft.Json; + using Shared.HealthChecks; + using Shared.IntegrationTesting; + using Shared.Logger; + using Shared.Serialisation; + using Shouldly; using System; using System.Collections.Generic; using System.Diagnostics; @@ -16,12 +23,6 @@ namespace SecurityService.IntergrationTests.Common using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; - using Client; - using Newtonsoft.Json; - using Shared.HealthChecks; - using Shared.IntegrationTesting; - using Shared.Logger; - using Shouldly; /// /// @@ -79,6 +80,16 @@ public override async Task CreateSubscriptions(){ // Nothing to set up here } + String Serialise(Object arg) + { + return StringSerialiser.Serialise(arg); + } + + Object Deserialise(String arg, Type type) + { + return StringSerialiser.DeserializeObject(arg, type); + } + /// /// Starts the containers for scenario run. /// @@ -93,7 +104,7 @@ public override async Task StartContainersForScenarioRun(String scenarioName, Do securityServiceBaseAddressResolver = api => $"https://localhost:{this.SecurityServicePort}"; - this.SecurityServiceClient = new SecurityServiceClient(securityServiceBaseAddressResolver, httpClient); + this.SecurityServiceClient = new SecurityServiceClient(securityServiceBaseAddressResolver, httpClient, Serialise, Deserialise); DockerHelper.AddEntryToHostsFile("127.0.0.1", SecurityServiceContainerName); DockerHelper.AddEntryToHostsFile("localhost", SecurityServiceContainerName); diff --git a/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj b/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj index 8fcc786e..bbf1025d 100644 --- a/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj +++ b/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj @@ -24,7 +24,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SecurityService/SecurityService.csproj b/SecurityService/SecurityService.csproj index 74fbf732..3d039bda 100644 --- a/SecurityService/SecurityService.csproj +++ b/SecurityService/SecurityService.csproj @@ -33,8 +33,8 @@ - - + + diff --git a/SecurityServiceTestUI/SecurityServiceTestUI.csproj b/SecurityServiceTestUI/SecurityServiceTestUI.csproj index 4af76670..2ed8e586 100644 --- a/SecurityServiceTestUI/SecurityServiceTestUI.csproj +++ b/SecurityServiceTestUI/SecurityServiceTestUI.csproj @@ -11,7 +11,7 @@ - +