Correcting ownership of EF transaction (it disposes of the context itself later)

Author: jrmccannon

bitwarden_license/test/Scim.IntegrationTest/Controllers/v2/UsersControllerConcurrencyTests.cs

@@ -29,8 +29,9 @@ public async Task Post_ConcurrentInvites_DoNotOvershootMaxAutoscaleSeats()
         {
             TestDatabase = new SqlServerTestDatabase()
         };
-        factory.SubstituteService((IFeatureService f)
-            => f.IsEnabled(FeatureFlagKeys.ScimInviteUserOptimization).Returns(true));
+
+        factory.SubstituteService((IFeatureService f) => f.IsEnabled(FeatureFlagKeys.ScimInviteUserOptimization)
+            .Returns(true));
 
         try
         {
@@ -74,7 +75,7 @@ public async Task Post_ConcurrentInvites_DoNotOvershootMaxAutoscaleSeats()
         }
         finally
         {
-            factory.Dispose();
+            await factory.DisposeAsync();
         }
     }
 

src/Core/Platform/Data/TransactionState.cs

@@ -21,6 +21,13 @@ public sealed class TransactionHolder : IAsyncDisposable
     public bool Committed { get; set; }
     public bool Doomed { get; set; }
 
+    /// <summary>
+    /// True when this holder is responsible for disposing <see cref="Connection"/>.
+    /// EF reuses the DbContext's connection and must leave its lifetime to the scope;
+    /// Dapper opens its own connection and must dispose it here.
+    /// </summary>
+    public bool OwnsConnection { get; init; } = true;
+
     /// <summary>
     /// For EF: the DatabaseContext associated with this transaction.
     /// </summary>
@@ -46,7 +53,11 @@ public async ValueTask DisposeAsync()
         }
 
         await Transaction.DisposeAsync();
-        await Connection.DisposeAsync();
+
+        if (OwnsConnection)
+        {
+            await Connection.DisposeAsync();
+        }
 
         if (Scope is not null)
         {

src/Infrastructure.EntityFramework/Data/EfTransactionManager.cs

@@ -40,6 +40,7 @@ public async Task<ITransactionScope> BeginTransactionAsync(
         {
             Connection = connection,
             Transaction = transaction,
+            OwnsConnection = false,
             DbContext = dbContext,
             Scope = scope,
         };