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 @@ - + 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 @@ - + 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(); 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..7594a11 100644 --- a/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj +++ b/src/Rsk.DuendeIdentityServer.AuditEventSink/Rsk.DuendeIdentityServer.AuditEventSink.csproj @@ -10,11 +10,12 @@ true icon.png Apache-2.0 - 5.0.0 + 6.0.0 - + + 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 @@ - + - + - + 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");