nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-03 09:02:48 -05:00
Code Activity

Apply suggestions from code review: Remove Manage permission from Collection assignments

Browse Source 
Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
This commit is contained in:
Rui Tomé
2023-12-06 15:46:37 +00:00
committed by GitHub
parent 23a3e5c83c
commit d693511b01
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/Migrator/DbScripts_transition/2023-11-10_00_AccessAllCollectionGroups.sql
View File

@ -9,7 +9,7 @@ UPDATE CG
SET SET
CG.[ReadOnly] = 0, CG.[ReadOnly] = 0,
CG.[HidePasswords] = 0, CG.[HidePasswords] = 0,
CG.[Manage] = 1 CG.[Manage] = 0
FROM [dbo].[CollectionGroup] CG FROM [dbo].[CollectionGroup] CG
INNER JOIN [dbo].[Collection] C ON CG.[CollectionId] = C.[Id] INNER JOIN [dbo].[Collection] C ON CG.[CollectionId] = C.[Id]
INNER JOIN #TempGroup TG ON CG.[GroupId] = TG.[GroupId] INNER JOIN #TempGroup TG ON CG.[GroupId] = TG.[GroupId]
@ -17,7 +17,7 @@ WHERE C.[OrganizationId] = TG.[OrganizationId];
-- Insert new rows into [dbo].[CollectionGroup] -- Insert new rows into [dbo].[CollectionGroup]
INSERT INTO [dbo].[CollectionGroup] ([CollectionId], [GroupId], [ReadOnly], [HidePasswords], [Manage]) INSERT INTO [dbo].[CollectionGroup] ([CollectionId], [GroupId], [ReadOnly], [HidePasswords], [Manage])
SELECT C.[Id], TG.[GroupId], 0, 0, 1 SELECT C.[Id], TG.[GroupId], 0, 0, 0
FROM [dbo].[Collection] C FROM [dbo].[Collection] C
JOIN #TempGroup TG ON C.[OrganizationId] = TG.[OrganizationId] JOIN #TempGroup TG ON C.[OrganizationId] = TG.[OrganizationId]
LEFT JOIN [dbo].[CollectionGroup] CG ON CG.[CollectionId] = C.[Id] AND CG.[GroupId] = TG.[GroupId] LEFT JOIN [dbo].[CollectionGroup] CG ON CG.[CollectionId] = C.[Id] AND CG.[GroupId] = TG.[GroupId]

4
util/Migrator/DbScripts_transition/2023-11-10_00_AccessAllCollectionUsers.sql
View File

@ -16,7 +16,7 @@ BEGIN
SET SET
target.[ReadOnly] = 0, target.[ReadOnly] = 0,
target.[HidePasswords] = 0, target.[HidePasswords] = 0,
target.[Manage] = 1 target.[Manage] = 0
FROM [dbo].[CollectionUser] AS target FROM [dbo].[CollectionUser] AS target
JOIN ( JOIN (
SELECT C.[Id] AS [CollectionId], T.[OrganizationUserId] SELECT C.[Id] AS [CollectionId], T.[OrganizationUserId]
@ -27,7 +27,7 @@ BEGIN
-- Insert new rows into [dbo].[CollectionUser] -- Insert new rows into [dbo].[CollectionUser]
INSERT INTO [dbo].[CollectionUser] ([CollectionId], [OrganizationUserId], [ReadOnly], [HidePasswords], [Manage]) INSERT INTO [dbo].[CollectionUser] ([CollectionId], [OrganizationUserId], [ReadOnly], [HidePasswords], [Manage])
SELECT source.[CollectionId], source.[OrganizationUserId], 0, 0, 1 SELECT source.[CollectionId], source.[OrganizationUserId], 0, 0, 0
FROM ( FROM (
SELECT C.[Id] AS [CollectionId], T.[OrganizationUserId] SELECT C.[Id] AS [CollectionId], T.[OrganizationUserId]
FROM [dbo].[Collection] C FROM [dbo].[Collection] C