Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-18 02:11:22 +01:00
Code Issues Projects Releases Wiki 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
No known key found for this signature in database
GPG Key ID: 526239D96A8EC066
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
util/MySqlMigrations/HelperScripts/2024-03-22_00_EnableOrgsCollectionEnhancements.sql
View File

@ -41,7 +41,7 @@
SET `CG`.`ReadOnly` = 0, SET `CG`.`ReadOnly` = 0,
`CG`.`HidePasswords` = 0, `CG`.`HidePasswords` = 0,
`CG`.`Manage` = 0 `CG`.`Manage` = 0
WHERE `C`.`OrganizationId` = `TG`.`OrganizationId`; WHERE `CG`.`CollectionId` = `C`.`Id` AND `C`.`OrganizationId` = `TG`.`OrganizationId`;
-- Insert new rows into `CollectionGroups` -- Insert new rows into `CollectionGroups`
INSERT INTO `CollectionGroups` (`CollectionId`, `GroupId`, `ReadOnly`, `HidePasswords`, `Manage`) INSERT INTO `CollectionGroups` (`CollectionId`, `GroupId`, `ReadOnly`, `HidePasswords`, `Manage`)
@ -58,13 +58,14 @@
-- Step 2 -- Step 2
-- Update existing rows in `CollectionUsers` -- Update existing rows in `CollectionUsers`
UPDATE `CollectionUsers` `target` UPDATE `CollectionUsers` `CU`
INNER JOIN `Collection` `C` ON `target`.`CollectionId` = `C`.`Id` INNER JOIN `Collection` `C` ON `CU`.`CollectionId` = `C`.`Id`
INNER JOIN `TempUsersAccessAll` `TU` INNER JOIN `TempUsersAccessAll` `TU`
ON `C`.`OrganizationId` = `TU`.`OrganizationId` AND `target`.`OrganizationUserId` = `TU`.`OrganizationUserId` ON `C`.`OrganizationId` = `TU`.`OrganizationId` AND `CU`.`OrganizationUserId` = `TU`.`OrganizationUserId`
SET `target`.`ReadOnly` = 0, SET `CU`.`ReadOnly` = 0,
`target`.`HidePasswords` = 0, `CU`.`HidePasswords` = 0,
`target`.`Manage` = 0; `CU`.`Manage` = 0
WHERE `CU`.`CollectionId` = `C`.`Id`;
-- Insert new rows into `CollectionUsers` -- Insert new rows into `CollectionUsers`
INSERT INTO `CollectionUsers` (`CollectionId`, `OrganizationUserId`, `ReadOnly`, `HidePasswords`, `Manage`) INSERT INTO `CollectionUsers` (`CollectionId`, `OrganizationUserId`, `ReadOnly`, `HidePasswords`, `Manage`)

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

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

14
util/SqliteMigrations/HelperScripts/2024-03-22_00_EnableOrgsCollectionEnhancements.sql
View File

@ -62,16 +62,14 @@
-- Step 2 -- Step 2
-- Update existing rows in "CollectionUsers" -- Update existing rows in "CollectionUsers"
UPDATE "CollectionUsers" UPDATE "CollectionUsers" "CU"
SET SET "ReadOnly" = 0,
"ReadOnly" = 0,
"HidePasswords" = 0, "HidePasswords" = 0,
"Manage" = 0 "Manage" = 0
WHERE "CollectionId" IN ( FROM "Collection" "C"
SELECT "C"."Id" INNER JOIN "TempUsersAccessAll" AS "TU" ON "CU"."OrganizationUserId" = "TU"."OrganizationUserId" AND
FROM "Collection" "C" "C"."OrganizationId" = "TU"."OrganizationId"
INNER JOIN "TempUsersAccessAll" "TU" ON "C"."OrganizationId" = "TU"."OrganizationId" WHERE "CU"."CollectionId" = "C"."Id";
);
-- Insert new rows into "CollectionUsers" -- Insert new rows into "CollectionUsers"
INSERT INTO "CollectionUsers" ("CollectionId", "OrganizationUserId", "ReadOnly", "HidePasswords", "Manage") INSERT INTO "CollectionUsers" ("CollectionId", "OrganizationUserId", "ReadOnly", "HidePasswords", "Manage")