Adding SaveChangesGetAudit() methods to the AuditIdentityDbContext (

#707)
thepirat000 · Oct 24, 2024 · 236aa68 · 236aa68
1 parent 5bdf8a1
commit 236aa68
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to Audit.NET and its extensions will be documented in this f
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [27.1.0] - 2024-10-24:
+- Audit.EntityFramework.Identity and Audit.EntityFramework.Identity.Core: Adding `SaveChangesGetAudit()` methods to the `AuditIdentityDbContext` (#707)
+- Audit.NET: Upgrading System.Text.Json 6.0.9 to the latest 6.0.10 ([CVE-2024-43485](https://www.cve.org/CVERecord?id=CVE-2024-43485))
+
 ## [27.0.3] - 2024-09-25:
 - Audit.EntityFramework.Core: Fixing issue with Complex Type properties when using the EF DataProvider Property Matching (#697)
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-	 <Version>27.0.3</Version>
+	 <Version>27.1.0</Version>
 	 <PackageReleaseNotes></PackageReleaseNotes>
 	 <CheckEolTargetFramework>false</CheckEolTargetFramework>
  </PropertyGroup>

diff --git a/src/Audit.EntityFramework.Core/Audit.EntityFramework.Core.csproj b/src/Audit.EntityFramework.Core/Audit.EntityFramework.Core.csproj
@@ -52,7 +52,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-		<PackageReference Include="System.Text.Json" Version="6.0.9" />
+		<PackageReference Include="System.Text.Json" Version="6.0.10" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.17" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.17" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />

diff --git a/src/Audit.EntityFramework.Identity/AuditIdentityDbContext.cs b/src/Audit.EntityFramework.Identity/AuditIdentityDbContext.cs
@@ -239,6 +239,27 @@ public override int SaveChanges()
             return _helper.SaveChanges(this, () => base.SaveChanges());
         }
 
+        /// <summary>
+        /// Executes the SaveChanges operation in the DbContext and returns the EF audit event generated
+        /// </summary>
+        /// <returns>The generated EF audit event</returns>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public EntityFrameworkEvent SaveChangesGetAudit()
+        {
+            return _helper.SaveChangesGetAudit(this, () => base.SaveChanges());
+        }
+
+        /// <summary>
+        /// Executes the SaveChanges operation in the DbContext and returns the EF audit event generated
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token</param>
+        /// <returns>The generated EF audit event</returns>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public async Task<EntityFrameworkEvent> SaveChangesGetAuditAsync(CancellationToken cancellationToken = default)
+        {
+            return await _helper.SaveChangesGetAuditAsync(this, () => base.SaveChangesAsync(cancellationToken), cancellationToken);
+        }
+
         /// <summary>
         /// Saves the changes asynchronously.
         /// </summary>

diff --git a/src/Audit.EntityFramework/Audit.EntityFramework.csproj b/src/Audit.EntityFramework/Audit.EntityFramework.csproj
@@ -58,7 +58,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' != 'net6.0' ">
-		<PackageReference Include="System.Text.Json" Version="6.0.9" />
+		<PackageReference Include="System.Text.Json" Version="6.0.10" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Audit.FileSystem/Audit.FileSystem.csproj b/src/Audit.FileSystem/Audit.FileSystem.csproj
@@ -32,7 +32,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' ">
-		<PackageReference Include="System.Text.Json" Version="6.0.9" />
+		<PackageReference Include="System.Text.Json" Version="6.0.10" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Audit.MongoClient/Audit.MongoClient.csproj b/src/Audit.MongoClient/Audit.MongoClient.csproj
@@ -32,7 +32,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' != 'net6.0' ">
-		<PackageReference Include="System.Text.Json" Version="6.0.9" />
+		<PackageReference Include="System.Text.Json" Version="6.0.10" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Audit.Mvc.Core/Audit.Mvc.Core.csproj b/src/Audit.Mvc.Core/Audit.Mvc.Core.csproj
@@ -65,7 +65,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' != 'net6.0' ">
-		<PackageReference Include="System.Text.Json" Version="6.0.9" />
+		<PackageReference Include="System.Text.Json" Version="6.0.10" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Audit.Mvc/Audit.Mvc.csproj b/src/Audit.Mvc/Audit.Mvc.csproj
@@ -40,7 +40,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.3.0" />
-		<PackageReference Include="System.Text.Json" Version="6.0.9" />
+		<PackageReference Include="System.Text.Json" Version="6.0.10" />
 		<Reference Include="System.Web" />
 		<Reference Include="System" />
 		<Reference Include="Microsoft.CSharp" />

diff --git a/src/Audit.NET.AzureStorageBlobs/Audit.NET.AzureStorageBlobs.csproj b/src/Audit.NET.AzureStorageBlobs/Audit.NET.AzureStorageBlobs.csproj
@@ -35,7 +35,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-		<PackageReference Include="System.Text.Json" Version="6.0.9" />
+		<PackageReference Include="System.Text.Json" Version="6.0.10" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Audit.NET.JsonNewtonsoftAdapter/Audit.NET.JsonNewtonsoftAdapter.csproj b/src/Audit.NET.JsonNewtonsoftAdapter/Audit.NET.JsonNewtonsoftAdapter.csproj
@@ -40,7 +40,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' ">
-		<PackageReference Include="System.Text.Json" Version="6.0.9" />
+		<PackageReference Include="System.Text.Json" Version="6.0.10" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

diff --git a/src/Audit.NET/Audit.NET.csproj b/src/Audit.NET/Audit.NET.csproj
@@ -43,7 +43,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
-		<PackageReference Include="System.Text.Json" Version="6.0.9" />
+		<PackageReference Include="System.Text.Json" Version="6.0.10" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Audit.WebApi.Core/Audit.WebApi.Core.csproj b/src/Audit.WebApi.Core/Audit.WebApi.Core.csproj
@@ -44,7 +44,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' != 'net6.0' ">
-		<PackageReference Include="System.Text.Json" Version="6.0.9" />
+		<PackageReference Include="System.Text.Json" Version="6.0.10" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

diff --git a/src/Audit.WebApi/Audit.WebApi.csproj b/src/Audit.WebApi/Audit.WebApi.csproj
@@ -39,7 +39,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="System.Text.Json" Version="6.0.9" />
+		<PackageReference Include="System.Text.Json" Version="6.0.10" />
 		<PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.3.0" />
 		<PackageReference Include="Microsoft.AspNet.WebApi.Owin" Version="5.3.0" />
 		<Reference Include="System.Web" />

diff --git a/test/Audit.UnitTest/Audit.UnitTest.csproj b/test/Audit.UnitTest/Audit.UnitTest.csproj
@@ -28,7 +28,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'netcoreapp3.1' ">
-		<PackageReference Include="System.Text.Json" Version="6.0.9" />
+		<PackageReference Include="System.Text.Json" Version="6.0.10" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' != 'net462' and '$(TargetFramework)' != 'net472' ">