nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00
Code Activity

fix availablecollections queries for groups join

Browse Source
This commit is contained in:
Kyle Spearrin
2018-08-23 23:46:18 -04:00
parent 0816c609db
commit 53caacb870
4 changed files with 251 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Sql/dbo/Stored Procedures/Cipher_UpdateWithCollections.sql
View File

@ -34,7 +34,7 @@ BEGIN
LEFT JOIN
[dbo].[Group] G ON G.[Id] = GU.[GroupId]
LEFT JOIN
[dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId]
[dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
WHERE
O.[Id] = @OrganizationId
AND O.[Enabled] = 1

2
src/Sql/dbo/Stored Procedures/CollectionCipher_UpdateCollections.sql
View File

@ -31,7 +31,7 @@ BEGIN
LEFT JOIN
[dbo].[Group] G ON G.[Id] = GU.[GroupId]
LEFT JOIN
[dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId]
[dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
WHERE
O.[Id] = @OrgId
AND O.[Enabled] = 1

2
src/Sql/dbo/Stored Procedures/CollectionCipher_UpdateCollectionsForCiphers.sql
View File

@ -27,7 +27,7 @@ BEGIN
LEFT JOIN
[dbo].[Group] G ON G.[Id] = GU.[GroupId]
LEFT JOIN
[dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId]
[dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
WHERE
O.[Id] = @OrganizationId
AND O.[Enabled] = 1