Skip to content

use new client base and latest shared nugets #1613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 1 commit into from
May 4, 2026
Merged

use new client base and latest shared nugets #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageReference Include="OpenIddict.Server" Version="7.3.0" />
<PackageReference Include="OpenIddict.Server.AspNetCore" Version="7.3.0" />
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="7.3.0" />
<PackageReference Include="Shared.Results" Version="2026.3.1" />
<PackageReference Include="Shared.Results" Version="2026.5.4" />
<PackageReference Include="SimpleResults" Version="4.0.0" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions SecurityService.Client/SecurityService.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2026.3.1" />
<PackageReference Include="Shared.Results" Version="2026.3.1" />
<PackageReference Include="ClientProxyBase" Version="2026.5.4" />
<PackageReference Include="Shared.Results" Version="2026.5.4" />
</ItemGroup>

<ItemGroup>
Expand Down
23 changes: 11 additions & 12 deletions SecurityService.Client/SecurityServiceClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
/// <seealso cref="SecurityService.Client.ISecurityServiceClient" />
public class SecurityServiceClient : ClientBase, ISecurityServiceClient
{
private static String Serialise(Object arg)
{
return JsonConvert.SerializeObject(arg);
}
//private static String Serialise(Object arg)
//{

Check notice on line 24 in SecurityService.Client/SecurityServiceClient.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

SecurityService.Client/SecurityServiceClient.cs#L24 

Remove this commented out code.
// 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

Expand All @@ -52,13 +52,12 @@
/// <param name="baseAddressResolver">The base address resolver.</param>
/// <param name="httpClient">The HTTP client.</param>
public SecurityServiceClient(Func<String, String> baseAddressResolver,
HttpClient httpClient) : base(httpClient, Serialise, Deserialise)
HttpClient httpClient,
Func<object, string> serialise,
Func<string, Type, object> 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
Expand Down
2 changes: 1 addition & 1 deletion SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.5" />
<PackageReference Include="Shared.IntegrationTesting" Version="2026.3.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2026.5.4" />
</ItemGroup>

<ItemGroup>
Expand Down
31 changes: 21 additions & 10 deletions SecurityService.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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<Object>(arg);
}

Object Deserialise(String arg, Type type)
{
return StringSerialiser.DeserializeObject<Object>(arg, type);
}

public async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices)
{
await base.StartContainersForScenarioRun(scenarioName, dockerServices);

Func<String, String> 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;
}
Expand Down
2 changes: 1 addition & 1 deletion SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
<PackageReference Include="Reqnroll.NUnit" Version="3.3.3" />

<PackageReference Include="Shared.IntegrationTesting" Version="2026.3.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2026.5.4" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.5" />

Expand Down
29 changes: 20 additions & 9 deletions SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

/// <summary>
///
Expand Down Expand Up @@ -79,6 +80,16 @@ public override async Task CreateSubscriptions(){
// Nothing to set up here
}

String Serialise(Object arg)
{
return StringSerialiser.Serialise<Object>(arg);
}

Object Deserialise(String arg, Type type)
{
return StringSerialiser.DeserializeObject<Object>(arg, type);
}

/// <summary>
/// Starts the containers for scenario run.
/// </summary>
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...vice.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<PackageReference Include="Selenium.Support" Version="4.41.0" />
<PackageReference Include="Selenium.WebDriver" Version="4.41.0" />
<PackageReference Include="Shared.IntegrationTesting" Version="2026.3.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2026.5.4" />
<PackageReference Include="coverlet.collector" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
4 changes: 2 additions & 2 deletions SecurityService/SecurityService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="7.3.0" />
<PackageReference Include="OpenIddict.Server.AspNetCore" Version="7.3.0" />
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="7.3.0" />
<PackageReference Include="Shared" Version="2026.3.1" />
<PackageReference Include="Shared.Results.Web" Version="2026.3.1" />
<PackageReference Include="Shared" Version="2026.5.4" />
<PackageReference Include="Shared.Results.Web" Version="2026.5.4" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
<PackageReference Include="Sentry.AspNetCore" Version="6.2.0" />
<PackageReference Include="NLog.Web.AspNetCore" Version="6.1.2" />
Expand Down
2 changes: 1 addition & 1 deletion SecurityServiceTestUI/SecurityServiceTestUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.3" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
<PackageReference Include="Shared" Version="2026.3.1" />
<PackageReference Include="Shared" Version="2026.5.4" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading