nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 01:22:50 -05:00
Code Activity

[PS-1928] Cipher Collections Fix (#2462)

Browse Source 
* Simplify UpdateCollectionsAsync

* Make final JOIN a LEFT JOIN
This commit is contained in:
Justin Baur
2022-12-02 17:04:01 -05:00
committed by GitHub
parent efe91fd0d8
commit 1652669667
2 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Infrastructure.EntityFramework/Repositories/CipherRepository.cs
View File

@ -484,7 +484,7 @@ public class CipherRepository : Repository<Core.Entities.Cipher, Cipher, Guid>,
join o in context.Organizations
on c.OrganizationId equals o.Id
join ou in context.OrganizationUsers
on new { OrganizationId = o.Id, UserId = (Guid?)userId.Value } equals
on new { OrganizationId = o.Id, UserId = userId } equals
new { ou.OrganizationId, ou.UserId }
join cu in context.CollectionUsers
on new { ou.AccessAll, CollectionId = c.Id, OrganizationUserId = ou.Id } equals
@ -499,7 +499,8 @@ public class CipherRepository : Repository<Core.Entities.Cipher, Cipher, Guid>,
from g in g_g.DefaultIfEmpty()
join cg in context.CollectionGroups
on new { g.AccessAll, CollectionId = c.Id, gu.GroupId } equals
new { AccessAll = false, cg.CollectionId, cg.GroupId }
new { AccessAll = false, cg.CollectionId, cg.GroupId } into cg_g
from cg in cg_g.DefaultIfEmpty()
where o.Id == organizationId &&
o.Enabled &&
ou.Status == OrganizationUserStatusType.Confirmed &&