From 0fe6f152d81801fb769ecdde11d484844fc2c337 Mon Sep 17 00:00:00 2001
From: NachoEscrig <nacho.escrig@rocksolidknowledge.com>
Date: Wed, 10 Jun 2026 14:53:27 +0100
Subject: [PATCH 1/3] Add support for Duende IdentityServer v8

---
 src/Rsk.Audit.EF/Rsk.Audit.EF.csproj                        | 2 +-
 src/Rsk.Audit/Rsk.Audit.csproj                              | 2 +-
 src/Rsk.DuendeIdentityServer.AuditEventSink/AuditSink.cs    | 3 ++-
 .../EventSinkAgregator.cs                                   | 5 +++--
 .../Rsk.DuendeIdentityServer.AuditEventSink.csproj          | 6 ++++--
 .../Rsk.Audit.Tests.Integration.csproj                      | 6 +++---
 .../EventSinkAggregatorTests.cs                             | 5 +++--
 7 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/Rsk.Audit.EF/Rsk.Audit.EF.csproj b/src/Rsk.Audit.EF/Rsk.Audit.EF.csproj
index cf16ece..5f70330 100644
--- a/src/Rsk.Audit.EF/Rsk.Audit.EF.csproj
+++ b/src/Rsk.Audit.EF/Rsk.Audit.EF.csproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Rsk.Audit/Rsk.Audit.csproj b/src/Rsk.Audit/Rsk.Audit.csproj
index 14a8612..1f151b5 100644
--- a/src/Rsk.Audit/Rsk.Audit.csproj
+++ b/src/Rsk.Audit/Rsk.Audit.csproj
@@ -23,7 +23,7 @@
   </PropertyGroup>
     
   <ItemGroup>
-	<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="10.0.8" />
+	<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="10.0.9" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Rsk.DuendeIdentityServer.AuditEventSink/AuditSink.cs b/src/Rsk.DuendeIdentityServer.AuditEventSink/AuditSink.cs
index 5e36457..706b845 100644
--- a/src/Rsk.DuendeIdentityServer.AuditEventSink/AuditSink.cs
+++ b/src/Rsk.DuendeIdentityServer.AuditEventSink/AuditSink.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using System.Threading.Tasks;
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Services;
@@ -19,7 +20,7 @@ public class AuditSink(
 
     internal IAdapterFactory Factory { get; init; } = new AdapterFactory(customEventAdapters);
 
-    public Task PersistAsync(Event evt)
+    public Task PersistAsync(Event evt, CancellationToken cancellationToken = default)
     {
         var auditArgument = Factory.Create(evt);
 
diff --git a/src/Rsk.DuendeIdentityServer.AuditEventSink/EventSinkAgregator.cs b/src/Rsk.DuendeIdentityServer.AuditEventSink/EventSinkAgregator.cs
index 4c2baf9..773867d 100644
--- a/src/Rsk.DuendeIdentityServer.AuditEventSink/EventSinkAgregator.cs
+++ b/src/Rsk.DuendeIdentityServer.AuditEventSink/EventSinkAgregator.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Services;
@@ -17,13 +18,13 @@ public EventSinkAggregator(ILogger logger)
             this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
 
-        public Task PersistAsync(Event evt)
+        public Task PersistAsync(Event evt, CancellationToken cancellationToken = default)
         {
             var eventSinkTasks = new List<Task>();
 
             foreach (var eventSink in EventSinks)
             {
-                eventSinkTasks.Add(ProtectedExecution(() => eventSink.PersistAsync(evt)));    
+                eventSinkTasks.Add(ProtectedExecution(() => eventSink.PersistAsync(evt, cancellationToken)));    
             }
 
             return Task.WhenAll(eventSinkTasks);
diff --git a/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj b/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj
index afbfe8b..7c10ad7 100644
--- a/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj
+++ b/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj
@@ -14,8 +14,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-	    <PackageReference Include="Duende.IdentityServer" Version="7.4.7" />
-        <PackageReference Include="Rsk.Audit" Version="4.0.0" />
+	    <PackageReference Include="Duende.IdentityServer" Version="8.0.0" />
+        
+        <!--TODO: update to v4.0.0 when released-->
+        <PackageReference Include="Rsk.Audit" Version="3.0.0" />
     </ItemGroup>
 
 	<ItemGroup>
diff --git a/tests/Rsk.Audit.Tests.Integration/Rsk.Audit.Tests.Integration.csproj b/tests/Rsk.Audit.Tests.Integration/Rsk.Audit.Tests.Integration.csproj
index 7f36c45..d987004 100644
--- a/tests/Rsk.Audit.Tests.Integration/Rsk.Audit.Tests.Integration.csproj
+++ b/tests/Rsk.Audit.Tests.Integration/Rsk.Audit.Tests.Integration.csproj
@@ -21,15 +21,15 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/tests/Rsk.DuendeIdentityServer.AuditEventSink.Tests/EventSinkAggregatorTests.cs b/tests/Rsk.DuendeIdentityServer.AuditEventSink.Tests/EventSinkAggregatorTests.cs
index 2136d2d..f9934a4 100644
--- a/tests/Rsk.DuendeIdentityServer.AuditEventSink.Tests/EventSinkAggregatorTests.cs
+++ b/tests/Rsk.DuendeIdentityServer.AuditEventSink.Tests/EventSinkAggregatorTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Duende.IdentityServer.Events;
 using Duende.IdentityServer.Services;
@@ -60,7 +61,7 @@ private class StubSink : IEventSink
         {
             public int WasCalled { get; private set; }
 
-            public Task PersistAsync(Event evt)
+            public Task PersistAsync(Event evt, CancellationToken cancellationToken = default)
             {
                 WasCalled++;
                 return Task.CompletedTask;
@@ -71,7 +72,7 @@ private class StubSinkThrowsException : IEventSink
         {
             public int WasCalled { get; private set; }
 
-            public Task PersistAsync(Event evt)
+            public Task PersistAsync(Event evt, CancellationToken cancellationToken = default)
             {
                 WasCalled++;
                 throw new Exception("Blah");

From 088f0af92c025b5e17a36bdc30091a67cea56c01 Mon Sep 17 00:00:00 2001
From: NachoEscrig <nacho.escrig@rocksolidknowledge.com>
Date: Fri, 12 Jun 2026 11:07:02 +0100
Subject: [PATCH 2/3] Bump version and update the base Rsk.Audit package

---
 .../Rsk.DuendeIdentityServer.AuditEventSink.csproj           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj b/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj
index 7c10ad7..07add64 100644
--- a/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj
+++ b/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj
@@ -10,14 +10,13 @@
         <IncludeSymbols>true</IncludeSymbols>
         <PackageIcon>icon.png</PackageIcon>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-        <Version>5.0.0</Version>
+        <Version>6.0.0</Version>
     </PropertyGroup>
 
     <ItemGroup>
 	    <PackageReference Include="Duende.IdentityServer" Version="8.0.0" />
         
-        <!--TODO: update to v4.0.0 when released-->
-        <PackageReference Include="Rsk.Audit" Version="3.0.0" />
+        <PackageReference Include="Rsk.Audit" Version="4.0.0" />
     </ItemGroup>
 
 	<ItemGroup>

From 3012ea7c9050bd15a1e2aa05589fa1ac92c658cb Mon Sep 17 00:00:00 2001
From: NachoEscrig <nacho.escrig@rocksolidknowledge.com>
Date: Fri, 12 Jun 2026 13:27:55 +0100
Subject: [PATCH 3/3] update duende patch package

---
 .../Rsk.DuendeIdentityServer.AuditEventSink.csproj              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj b/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj
index 07add64..7594a11 100644
--- a/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj
+++ b/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj
@@ -14,7 +14,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-	    <PackageReference Include="Duende.IdentityServer" Version="8.0.0" />
+	    <PackageReference Include="Duende.IdentityServer" Version="8.0.1" />
         
         <PackageReference Include="Rsk.Audit" Version="4.0.0" />
     </ItemGroup>