Merge pull request #14 from RockSolidKnowledge/duende-v8

Add support for Duende IdentityServer v8

Author: nachoRSK

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>

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>

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);
 

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);

src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj

@@ -10,11 +10,12 @@
         <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="7.4.7" />
+	    <PackageReference Include="Duende.IdentityServer" Version="8.0.1" />
+        
         <PackageReference Include="Rsk.Audit" Version="4.0.0" />
     </ItemGroup>
 

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>

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");