From 12fe14e842acb0d6e4e8f942aed8ec4f7d188334 Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1development@outlook.com>
Date: Fri, 11 Jul 2025 07:38:14 +0100
Subject: [PATCH] End to End Correlation Id

---
 .../ApiResourceRequestHandler.cs              |  4 +-
 .../RequestHandlers/ClientRequestHandler.cs   |  2 +-
 .../RequestHandlers/UserRequestHandler.cs     |  9 +---
 .../SecurityService.BusinessLogic.csproj      |  6 +--
 .../SecurityService.Client.csproj             |  4 +-
 .../SecurityService.Database.csproj           |  2 +-
 .../ReqnrollExtensions.cs                     |  2 -
 ...yService.IntegrationTesting.Helpers.csproj |  2 +-
 .../SecurityService.IntegrationTests.csproj   |  2 +-
 ...vice.OpenIdConnect.IntegrationTests.csproj |  2 +-
 .../RequestHandlerTests.cs                    |  1 -
 .../SecurityService.UnitTests.csproj          |  2 +-
 .../Pages/Account/Logout/Index.cshtml.cs      |  2 +-
 .../Pages/Consent/Index.cshtml.cs             |  2 +-
 .../Pages/Diagnostics/ViewModel.cs            |  2 +-
 .../Pages/ExternalLogin/Callback.cshtml.cs    |  2 +-
 .../SecurityService.UserInterface.csproj      |  4 +-
 SecurityService/Bootstrapper/MiscRegistry.cs  |  5 ++-
 SecurityService/Config.cs                     |  2 +-
 SecurityService/Program.cs                    | 43 ++++++++++++++-----
 SecurityService/SecurityService.csproj        |  8 ++--
 SecurityService/Startup.cs                    | 21 +++------
 SecurityService/nlog.config                   |  2 +-
 .../SecurityServiceTestUI.csproj              |  2 +-
 24 files changed, 71 insertions(+), 62 deletions(-)

diff --git a/SecurityService.BusinessLogic/RequestHandlers/ApiResourceRequestHandler.cs b/SecurityService.BusinessLogic/RequestHandlers/ApiResourceRequestHandler.cs
index f907dbab..148fe5d3 100644
--- a/SecurityService.BusinessLogic/RequestHandlers/ApiResourceRequestHandler.cs
+++ b/SecurityService.BusinessLogic/RequestHandlers/ApiResourceRequestHandler.cs
@@ -1,4 +1,5 @@
-using SecurityService.DataTransferObjects.Requests;
+using Duende.IdentityModel;
+using SecurityService.DataTransferObjects.Requests;
 using SimpleResults;
 
 namespace SecurityService.BusinessLogic.RequestHandlers{
@@ -10,7 +11,6 @@ namespace SecurityService.BusinessLogic.RequestHandlers{
     using Duende.IdentityServer.EntityFramework.DbContexts;
     using Duende.IdentityServer.EntityFramework.Mappers;
     using Duende.IdentityServer.Models;
-    using IdentityModel;
     using MediatR;
     using Microsoft.EntityFrameworkCore;
     using Requests;
diff --git a/SecurityService.BusinessLogic/RequestHandlers/ClientRequestHandler.cs b/SecurityService.BusinessLogic/RequestHandlers/ClientRequestHandler.cs
index 4cb71922..99b42665 100644
--- a/SecurityService.BusinessLogic/RequestHandlers/ClientRequestHandler.cs
+++ b/SecurityService.BusinessLogic/RequestHandlers/ClientRequestHandler.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Duende.IdentityModel;
 using SecurityService.DataTransferObjects.Requests;
 using SimpleResults;
 
@@ -13,7 +14,6 @@ namespace SecurityService.BusinessLogic.RequestHandlers
     using Duende.IdentityServer.EntityFramework.Entities;
     using Duende.IdentityServer.EntityFramework.Mappers;
     using Duende.IdentityServer.Models;
-    using IdentityModel;
     using MediatR;
     using Microsoft.EntityFrameworkCore;
     using Requests;
diff --git a/SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs b/SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs
index ca6b84f7..3e162352 100644
--- a/SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs
+++ b/SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs
@@ -1,4 +1,5 @@
-using Shared.Results;
+using Duende.IdentityModel;
+using Shared.Results;
 
 namespace SecurityService.BusinessLogic.RequestHandlers{
     using System;
@@ -9,13 +10,10 @@ namespace SecurityService.BusinessLogic.RequestHandlers{
     using System.Text.Encodings.Web;
     using System.Threading;
     using System.Threading.Tasks;
-    using Azure.Core;
     using DataTransferObjects.Responses;
     using Duende.IdentityServer;
     using Duende.IdentityServer.EntityFramework.DbContexts;
     using Duende.IdentityServer.EntityFramework.Entities;
-    using Exceptions;
-    using IdentityModel;
     using MediatR;
     using MessagingService.Client;
     using MessagingService.DataTransferObjects;
@@ -23,11 +21,8 @@ namespace SecurityService.BusinessLogic.RequestHandlers{
     using Microsoft.EntityFrameworkCore;
     using Requests;
     using SecurityService.Models;
-    using Shared.Exceptions;
-    using Shared.General;
     using Shared.Logger;
     using SimpleResults;
-    using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
     using UserDetails = Models.UserDetails;
 
     public class UserRequestHandler : IRequestHandler<SecurityServiceCommands.CreateUserCommand, Result>,
diff --git a/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj b/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj
index 2cc69031..5774883b 100644
--- a/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj
+++ b/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj
@@ -9,15 +9,15 @@
     <PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="7.2.3" />
     <PackageReference Include="Duende.IdentityServer.Storage" Version="7.2.3" />
     <PackageReference Include="MediatR" Version="12.5.0" />
-    <PackageReference Include="MessagingService.Client" Version="2025.3.1" />
+    <PackageReference Include="MessagingService.Client" Version="2025.7.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.3.1" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.5" />
-    <PackageReference Include="Shared" Version="2025.6.1" />
-    <PackageReference Include="Shared.Results" Version="2025.6.1" />
+    <PackageReference Include="Shared" Version="2025.7.9" />
+    <PackageReference Include="Shared.Results" Version="2025.7.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SecurityService.Client/SecurityService.Client.csproj b/SecurityService.Client/SecurityService.Client.csproj
index 3c17bf36..06c05e47 100644
--- a/SecurityService.Client/SecurityService.Client.csproj
+++ b/SecurityService.Client/SecurityService.Client.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2025.6.1" />
-    <PackageReference Include="Shared.Results" Version="2025.6.1" />
+    <PackageReference Include="ClientProxyBase" Version="2025.7.9" />
+    <PackageReference Include="Shared.Results" Version="2025.7.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SecurityService.Database/SecurityService.Database.csproj b/SecurityService.Database/SecurityService.Database.csproj
index 9ae71e04..cf7dadad 100644
--- a/SecurityService.Database/SecurityService.Database.csproj
+++ b/SecurityService.Database/SecurityService.Database.csproj
@@ -22,7 +22,7 @@
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
-		<PackageReference Include="Shared" Version="2025.6.1" />
+		<PackageReference Include="Shared" Version="2025.7.9" />
 	</ItemGroup>
 	<ItemGroup>
     <Folder Include="DbContexts\" />
diff --git a/SecurityService.IntegrationTesting.Helpers/ReqnrollExtensions.cs b/SecurityService.IntegrationTesting.Helpers/ReqnrollExtensions.cs
index 5106f632..abdcbac3 100644
--- a/SecurityService.IntegrationTesting.Helpers/ReqnrollExtensions.cs
+++ b/SecurityService.IntegrationTesting.Helpers/ReqnrollExtensions.cs
@@ -7,8 +7,6 @@
     using System.Collections.Generic;
     using DataTransferObjects;
     using Reqnroll;
-    using static IdentityModel.OidcConstants;
-    using static System.Formats.Asn1.AsnWriter;
 
     public static class ReqnrollExtensions{
         public static List<CreateApiScopeRequest> ToCreateApiScopeRequests(this DataTableRows tableRows){
diff --git a/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj b/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj
index df5a962a..3f1c98fe 100644
--- a/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj
+++ b/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj
@@ -19,7 +19,7 @@
     <!--<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="1.0.1" />
     <PackageReference Include="Reqnroll.xUnit" Version="1.0.1" />-->
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.6.1" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.7.9" />
     <!--<PackageReference Include="Shouldly" Version="4.2.1" />-->
     <!--<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
 	    <PrivateAssets>all</PrivateAssets>
diff --git a/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj b/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
index 5e832e86..193985b0 100644
--- a/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
+++ b/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
     <PackageReference Include="Reqnroll.NUnit" Version="2.4.1" />
 
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.6.1" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.7.9" />
     <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     
diff --git a/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj b/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj
index 6f741849..a43c1cb5 100644
--- a/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj
+++ b/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj
@@ -24,7 +24,7 @@
     
     <PackageReference Include="Selenium.Support" Version="4.33.0" />
     <PackageReference Include="Selenium.WebDriver" Version="4.33.0" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.6.1" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.7.9" />
     <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/SecurityService.UnitTests/RequestHandlerTests.cs b/SecurityService.UnitTests/RequestHandlerTests.cs
index d0ee7759..2a940f6d 100644
--- a/SecurityService.UnitTests/RequestHandlerTests.cs
+++ b/SecurityService.UnitTests/RequestHandlerTests.cs
@@ -25,7 +25,6 @@ namespace SecurityService.UnitTests {
     using Microsoft.Extensions.Options;
     using Moq;
     using SecurityService.Database.DbContexts;
-    using static IdentityModel.ClaimComparer;
 
     //public class TestRoleValidator : IRoleValidator<IdentityRole>{
     //    public async Task<IdentityResult> ValidateAsync(RoleManager<IdentityRole> manager, IdentityRole role){
diff --git a/SecurityService.UnitTests/SecurityService.UnitTests.csproj b/SecurityService.UnitTests/SecurityService.UnitTests.csproj
index 872018c6..c1d6cf22 100644
--- a/SecurityService.UnitTests/SecurityService.UnitTests.csproj
+++ b/SecurityService.UnitTests/SecurityService.UnitTests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
     <PackageReference Include="MockQueryable.Moq" Version="7.0.3" />
diff --git a/SecurityService.UserInterface/Pages/Account/Logout/Index.cshtml.cs b/SecurityService.UserInterface/Pages/Account/Logout/Index.cshtml.cs
index 4c49ab3e..c9662bc4 100644
--- a/SecurityService.UserInterface/Pages/Account/Logout/Index.cshtml.cs
+++ b/SecurityService.UserInterface/Pages/Account/Logout/Index.cshtml.cs
@@ -1,7 +1,7 @@
+using Duende.IdentityModel;
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Extensions;
 using Duende.IdentityServer.Services;
-using IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
diff --git a/SecurityService.UserInterface/Pages/Consent/Index.cshtml.cs b/SecurityService.UserInterface/Pages/Consent/Index.cshtml.cs
index cf2a478e..4b82c0ad 100644
--- a/SecurityService.UserInterface/Pages/Consent/Index.cshtml.cs
+++ b/SecurityService.UserInterface/Pages/Consent/Index.cshtml.cs
@@ -1,9 +1,9 @@
+using Duende.IdentityModel;
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Extensions;
 using Duende.IdentityServer.Models;
 using Duende.IdentityServer.Services;
 using Duende.IdentityServer.Validation;
-using IdentityModel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
diff --git a/SecurityService.UserInterface/Pages/Diagnostics/ViewModel.cs b/SecurityService.UserInterface/Pages/Diagnostics/ViewModel.cs
index e0c7f01b..7ef99703 100644
--- a/SecurityService.UserInterface/Pages/Diagnostics/ViewModel.cs
+++ b/SecurityService.UserInterface/Pages/Diagnostics/ViewModel.cs
@@ -2,10 +2,10 @@
 // See LICENSE in the project root for license information.
 
 
-using IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using System.Text;
 using System.Text.Json;
+using Duende.IdentityModel;
 
 namespace IdentityServerHost.Pages.Diagnostics;
 
diff --git a/SecurityService.UserInterface/Pages/ExternalLogin/Callback.cshtml.cs b/SecurityService.UserInterface/Pages/ExternalLogin/Callback.cshtml.cs
index 45ed5472..47ae9193 100644
--- a/SecurityService.UserInterface/Pages/ExternalLogin/Callback.cshtml.cs
+++ b/SecurityService.UserInterface/Pages/ExternalLogin/Callback.cshtml.cs
@@ -1,13 +1,13 @@
 using Duende.IdentityServer;
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Services;
-using IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using System.Security.Claims;
+using Duende.IdentityModel;
 
 namespace IdentityServerHost.Pages.ExternalLogin;
 
diff --git a/SecurityService.UserInterface/SecurityService.UserInterface.csproj b/SecurityService.UserInterface/SecurityService.UserInterface.csproj
index 91af300d..82fd15bc 100644
--- a/SecurityService.UserInterface/SecurityService.UserInterface.csproj
+++ b/SecurityService.UserInterface/SecurityService.UserInterface.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
 	  <TargetFramework>net9.0</TargetFramework>
@@ -16,7 +16,7 @@
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.5" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
-		<PackageReference Include="Shared" Version="2025.6.1" />
+		<PackageReference Include="Shared" Version="2025.7.9" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/SecurityService/Bootstrapper/MiscRegistry.cs b/SecurityService/Bootstrapper/MiscRegistry.cs
index e41d9bca..20e34b39 100644
--- a/SecurityService/Bootstrapper/MiscRegistry.cs
+++ b/SecurityService/Bootstrapper/MiscRegistry.cs
@@ -6,6 +6,7 @@ namespace SecurityService.Bootstrapper
     using System.Collections.Generic;
     using System.Diagnostics.CodeAnalysis;
     using BusinessLogic;
+    using ClientProxyBase;
     using Factories;
     using Lamar;
     using MessagingService.Client;
@@ -24,13 +25,15 @@ public class MiscRegistry : ServiceRegistry
         /// </summary>
         public MiscRegistry()
         {
+            this.AddHttpContextAccessor();
+
             this.AddSingleton<IModelFactory, ModelFactory>();
 
             if (Startup.WebHostEnvironment.IsEnvironment("IntegrationTest")) {
                 this.AddSingleton<IMessagingServiceClient, TestMessagingServiceClient>();
             }
             else {
-                this.AddSingleton<IMessagingServiceClient, MessagingServiceClient>();
+                this.RegisterHttpClient<IMessagingServiceClient, MessagingServiceClient>();
             }
 
             this.AddSingleton<Func<String, String>>(container => serviceName => { return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString; });
diff --git a/SecurityService/Config.cs b/SecurityService/Config.cs
index 407bea04..9f003241 100644
--- a/SecurityService/Config.cs
+++ b/SecurityService/Config.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Duende.IdentityModel;
 
 namespace SecurityService
 {
@@ -11,7 +12,6 @@ namespace SecurityService
     using Duende.IdentityServer;
     using Duende.IdentityServer.Models;
     using Duende.IdentityServer.Test;
-    using IdentityModel;
 
     [ExcludeFromCodeCoverage]
     public static class Config
diff --git a/SecurityService/Program.cs b/SecurityService/Program.cs
index 2b497091..50444916 100644
--- a/SecurityService/Program.cs
+++ b/SecurityService/Program.cs
@@ -8,16 +8,12 @@
 using Serilog.Events;
 using Serilog.Sinks.SystemConsole.Themes;
 using System;
+using NLog.Extensions.Logging;
+using Shared.Logger;
+using Shared.Middleware;
 
 namespace SecurityService
 {
-    using System.Diagnostics.CodeAnalysis;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Reflection;
-    using System.Security.Authentication;
-    using System.Security.Cryptography.X509Certificates;
     using Lamar.Microsoft.DependencyInjection;
     using Microsoft.AspNetCore.Server.Kestrel.Core;
     using Microsoft.AspNetCore.Server.Kestrel.Https;
@@ -26,6 +22,14 @@ namespace SecurityService
     using Microsoft.Extensions.Logging;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Serialization;
+    using NLog;
+    using System.Diagnostics.CodeAnalysis;
+    using System.IO;
+    using System.Linq;
+    using System.Net;
+    using System.Reflection;
+    using System.Security.Authentication;
+    using System.Security.Cryptography.X509Certificates;
 
     [ExcludeFromCodeCoverage]
     public class Program
@@ -36,11 +40,30 @@ public static IHostBuilder CreateHostBuilder(String[] args)
             FileInfo fi = new FileInfo(System.Reflection.Assembly.GetExecutingAssembly().Location);
             IConfigurationRoot config = new ConfigurationBuilder().SetBasePath(fi.Directory.FullName).AddJsonFile("hosting.json", optional:false)
                                                                   .AddJsonFile("hosting.development.json", optional:true).AddEnvironmentVariables().Build();
-            
+
+            String contentRoot = Directory.GetCurrentDirectory();
+            String nlogConfigPath = Path.Combine(contentRoot, "nlog.config");
+
+            LogManager.Setup(b =>
+            {
+                b.SetupLogFactory(setup =>
+                {
+                    setup.AddCallSiteHiddenAssembly(typeof(NlogLogger).Assembly);
+                    setup.AddCallSiteHiddenAssembly(typeof(Shared.Logger.Logger).Assembly);
+                    setup.AddCallSiteHiddenAssembly(typeof(TenantMiddleware).Assembly);
+                });
+                b.LoadConfigurationFromFile(nlogConfigPath);
+            });
+
             IHostBuilder hostBuilder = Host.CreateDefaultBuilder(args);
             hostBuilder.UseWindowsService();
-            hostBuilder = hostBuilder.UseLamar();
-            hostBuilder = hostBuilder.ConfigureWebHostDefaults(webBuilder =>
+            hostBuilder.UseLamar();
+            hostBuilder.ConfigureLogging(logging => {
+                logging.AddConsole();
+                logging.AddNLog();
+
+            });
+            hostBuilder.ConfigureWebHostDefaults(webBuilder =>
                                                             {
                                                                 webBuilder.UseStartup<Startup>();
                                                                 webBuilder.ConfigureServices(services =>
diff --git a/SecurityService/SecurityService.csproj b/SecurityService/SecurityService.csproj
index 83bc4e52..82c24279 100644
--- a/SecurityService/SecurityService.csproj
+++ b/SecurityService/SecurityService.csproj
@@ -14,7 +14,7 @@
 	  <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.5" />
 	  <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
 	  <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.5" />
-	  <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
+	  <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
 	  <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
 	  <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
 	  <PackageReference Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
@@ -32,10 +32,10 @@
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
-
+	  <PackageReference Include="ClientProxyBase" Version="2025.7.9" />
     <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
-
-    <PackageReference Include="Shared.Results.Web" Version="2025.6.1" />
+	  <PackageReference Include="Shared" Version="2025.7.9" />
+    <PackageReference Include="Shared.Results.Web" Version="2025.7.9" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.2" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.2" />
     <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.3" />
diff --git a/SecurityService/Startup.cs b/SecurityService/Startup.cs
index cc4e06b4..0f8a7c77 100644
--- a/SecurityService/Startup.cs
+++ b/SecurityService/Startup.cs
@@ -1,8 +1,5 @@
 namespace SecurityService
 {
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-    using System.IO;
     using Bootstrapper;
     using Database.DbContexts;
     using Duende.IdentityServer.EntityFramework.DbContexts;
@@ -21,6 +18,10 @@
     using Shared.Extensions;
     using Shared.General;
     using Shared.Logger;
+    using Shared.Middleware;
+    using System;
+    using System.Diagnostics.CodeAnalysis;
+    using System.IO;
     using ILogger = Microsoft.Extensions.Logging.ILogger;
 
     [ExcludeFromCodeCoverage]
@@ -89,26 +90,16 @@ public void Configure(IApplicationBuilder app,
                               IWebHostEnvironment env,
                               ILoggerFactory loggerFactory)
         {
-            String nlogConfigFilename = "nlog.config";
             if (env.IsDevelopment())
             {
-                var developmentNlogConfigFilename = "nlog.development.config";
-                if (File.Exists(Path.Combine(env.ContentRootPath, developmentNlogConfigFilename)))
-                {
-                    nlogConfigFilename = developmentNlogConfigFilename;
-                }
-
                 app.UseDeveloperExceptionPage();
             }
-
-            loggerFactory.ConfigureNLog(Path.Combine(Startup.WebHostEnvironment.ContentRootPath, nlogConfigFilename));
-            loggerFactory.AddNLog();
-
+            
             ILogger logger = loggerFactory.CreateLogger("Security Service");
 
             Logger.Initialise(logger);
             Startup.Configuration.LogConfiguration(Logger.LogWarning);
-
+            app.UseMiddleware<TenantMiddleware>();
             app.AddRequestLogging();
             app.AddResponseLogging();
             app.AddExceptionHandler();
diff --git a/SecurityService/nlog.config b/SecurityService/nlog.config
index eda6c111..1e7940b8 100644
--- a/SecurityService/nlog.config
+++ b/SecurityService/nlog.config
@@ -5,7 +5,7 @@
     <target name="asyncFile" xsi:type="AsyncWrapper">
       <target name="logfile" xsi:type="File"
               fileName="/home/txnproc/trace/securityservice.log"
-              layout="${date:format=dd/MM/yyyy HH\:mm\:ss.ffff} | ${level} | ${callsite:className=true} | ${message} | ${exception:format=type,method:maxInnerExceptionLevel=5:innerFormat=shortType,message,method:InnerExceptionSeparator= | }"
+              layout="${date:format=dd/MM/yyyy HH\:mm\:ss.ffff} | ${level} |${mdlc:CorrelationId:fallback=NO-ID}| ${callsite:className=true} | ${message} | ${exception:format=type,method:maxInnerExceptionLevel=5:innerFormat=shortType,message,method:InnerExceptionSeparator= | }"
               archiveFileName="/home/txnproc/trace/securityservice.{#####}.log"
               archiveAboveSize="104857600"
               archiveNumbering="Sequence"
diff --git a/SecurityServiceTestUI/SecurityServiceTestUI.csproj b/SecurityServiceTestUI/SecurityServiceTestUI.csproj
index c51e165f..f997d0a2 100644
--- a/SecurityServiceTestUI/SecurityServiceTestUI.csproj
+++ b/SecurityServiceTestUI/SecurityServiceTestUI.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
-    <PackageReference Include="Shared" Version="2025.6.1" />
+    <PackageReference Include="Shared" Version="2025.7.9" />
   </ItemGroup>
 
   <ItemGroup>