bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-28 06:03:29 +00:00
Code Issues Releases Wiki Activity

update collections admin proc and repo (#6374)

Browse Source
This commit is contained in:
Jordan Aasen
2025-09-26 10:05:56 -07:00
committed by GitHub
parent 80e7f4d85c
commit b9e8b11311
4 changed files with 109 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Infrastructure.EntityFramework/Repositories/CollectionCipherRepository.cs
View File

@@ -1,4 +1,5 @@
using AutoMapper;
using Bit.Core.Enums;
using Bit.Core.Repositories;
using Bit.Infrastructure.EntityFramework.Repositories.Queries;
using Microsoft.EntityFrameworkCore;
@@ -145,9 +146,11 @@ public class CollectionCipherRepository : BaseEntityFrameworkRepository, ICollec
using (var scope = ServiceScopeFactory.CreateScope())
{
var dbContext = GetDatabaseContext(scope);
var availableCollections = await (from c in dbContext.Collections
where c.OrganizationId == organizationId
select c).ToListAsync();
var availableCollectionIds = await (from c in dbContext.Collections
where c.OrganizationId == organizationId
&& c.Type != CollectionType.DefaultUserCollection
select c.Id).ToListAsync();
var currentCollectionCiphers = await (from cc in dbContext.CollectionCiphers
where cc.CipherId == cipherId
@@ -155,6 +158,8 @@ public class CollectionCipherRepository : BaseEntityFrameworkRepository, ICollec
foreach (var requestedCollectionId in collectionIds)
{
if (!availableCollectionIds.Contains(requestedCollectionId)) continue;
var requestedCollectionCipher = currentCollectionCiphers
.FirstOrDefault(cc => cc.CollectionId == requestedCollectionId);
@@ -168,7 +173,7 @@ public class CollectionCipherRepository : BaseEntityFrameworkRepository, ICollec
}
}
dbContext.RemoveRange(currentCollectionCiphers.Where(cc => !collectionIds.Contains(cc.CollectionId)));
dbContext.RemoveRange(currentCollectionCiphers.Where(cc => availableCollectionIds.Contains(cc.CollectionId) && !collectionIds.Contains(cc.CollectionId)));
await dbContext.UserBumpAccountRevisionDateByOrganizationIdAsync(organizationId);
await dbContext.SaveChangesAsync();
}