From 0face3a06e462879b13fd7420543903f21a863da Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Fri, 2 Jan 2026 13:39:34 +1000
Subject: [PATCH] Add explicit transaction in EF

---
 .../Repositories/CollectionRepository.cs                       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
index e7806f5e77..786e5cbd8b 100644
--- a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
@@ -809,6 +809,7 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
 
         using var scope = ServiceScopeFactory.CreateScope();
         var dbContext = GetDatabaseContext(scope);
+        await using var transaction = await dbContext.Database.BeginTransactionAsync();
 
         try
         {
@@ -819,9 +820,11 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
             await dbContext.BulkCopyAsync(Mapper.Map<IEnumerable<CollectionUser>>(collectionUsers));
 
             await dbContext.SaveChangesAsync();
+            await transaction.CommitAsync();
         }
         catch (Exception ex) when (DatabaseExceptionHelpers.IsDuplicateKeyException(ex))
         {
+            await transaction.RollbackAsync();
             throw new DuplicateDefaultCollectionException();
         }
     }