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

[AC-1682] Updated queries to check for OrganizationId

Browse Source
This commit is contained in:
Rui Tome
2024-03-29 14:10:57 +00:00
parent 28bba94d81
commit a957530d5e
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
util/PostgresMigrations/HelperScripts/2024-03-22_00_EnableOrgsCollectionEnhancements.psql
View File

@ -40,8 +40,8 @@
"HidePasswords" = false,
"Manage" = false
FROM "Collection" "C"
WHERE "CG"."CollectionId" = "C"."Id"
AND "C"."OrganizationId" IN (SELECT "OrganizationId" FROM "TempGroupsAccessAll");
JOIN "TempGroupsAccessAll" "TG" ON "CG"."GroupId" = "TG"."GroupId"
WHERE "CG"."CollectionId" = "C"."Id" AND "C"."OrganizationId" = TG."OrganizationId";
-- Insert new rows into CollectionGroups
INSERT INTO "CollectionGroups" ("CollectionId", "GroupId", "ReadOnly", "HidePasswords", "Manage")
@ -58,14 +58,14 @@
-- Step 2
-- Update existing rows in CollectionUsers
UPDATE "CollectionUsers" "target"
UPDATE "CollectionUsers" "CU"
SET "ReadOnly" = false,
"HidePasswords" = false,
"Manage" = false
FROM "Collection" "C"
WHERE "target"."CollectionId" = "C"."Id"
AND "C"."OrganizationId" IN (SELECT "OrganizationId" FROM "TempUsersAccessAll")
AND "target"."OrganizationUserId" IN (SELECT "OrganizationUserId" FROM "TempUsersAccessAll");
INNER JOIN "TempUsersAccessAll" "TU" ON "C"."OrganizationId" = "TU"."OrganizationId" AND
"CU"."OrganizationUserId" = "TU"."OrganizationUserId"
WHERE "CU"."CollectionId" = "C"."Id";
-- Insert new rows into CollectionUsers
INSERT INTO "CollectionUsers" ("CollectionId", "OrganizationUserId", "ReadOnly", "HidePasswords", "Manage")