mirror of
https://github.com/bitwarden/server
synced 2025-12-24 04:03:25 +00:00
* Integration test around getting and saving collection with group/user permissions * This adds groups to the collections returned. * Added new stored procedures so we don't accidentally wipe out access due to null parameters. * wrapping all calls in transaction in the event that there is an error.
152 lines
3.8 KiB
Transact-SQL
152 lines
3.8 KiB
Transact-SQL
CREATE OR ALTER PROCEDURE [dbo].[Collection_UpdateWithUsers]
|
|
@Id UNIQUEIDENTIFIER,
|
|
@OrganizationId UNIQUEIDENTIFIER,
|
|
@Name VARCHAR(MAX),
|
|
@ExternalId NVARCHAR(300),
|
|
@CreationDate DATETIME2(7),
|
|
@RevisionDate DATETIME2(7),
|
|
@Users AS [dbo].[CollectionAccessSelectionType] READONLY,
|
|
@DefaultUserCollectionEmail NVARCHAR(256) = NULL,
|
|
@Type TINYINT = 0
|
|
AS
|
|
BEGIN
|
|
SET NOCOUNT ON
|
|
|
|
EXEC [dbo].[Collection_Update] @Id, @OrganizationId, @Name, @ExternalId, @CreationDate, @RevisionDate, @DefaultUserCollectionEmail, @Type
|
|
|
|
-- Users
|
|
-- Delete users that are no longer in source
|
|
DELETE
|
|
cu
|
|
FROM
|
|
[dbo].[CollectionUser] cu
|
|
LEFT JOIN
|
|
@Users u ON cu.OrganizationUserId = u.Id
|
|
WHERE
|
|
cu.CollectionId = @Id
|
|
AND u.Id IS NULL;
|
|
|
|
-- Update existing users
|
|
UPDATE
|
|
cu
|
|
SET
|
|
cu.ReadOnly = u.ReadOnly,
|
|
cu.HidePasswords = u.HidePasswords,
|
|
cu.Manage = u.Manage
|
|
FROM
|
|
[dbo].[CollectionUser] cu
|
|
INNER JOIN
|
|
@Users u ON cu.OrganizationUserId = u.Id
|
|
WHERE
|
|
cu.CollectionId = @Id
|
|
AND (
|
|
cu.ReadOnly != u.ReadOnly
|
|
OR cu.HidePasswords != u.HidePasswords
|
|
OR cu.Manage != u.Manage
|
|
);
|
|
|
|
-- Insert new users
|
|
INSERT INTO [dbo].[CollectionUser]
|
|
(
|
|
[CollectionId],
|
|
[OrganizationUserId],
|
|
[ReadOnly],
|
|
[HidePasswords],
|
|
[Manage]
|
|
)
|
|
SELECT
|
|
@Id,
|
|
u.Id,
|
|
u.ReadOnly,
|
|
u.HidePasswords,
|
|
u.Manage
|
|
FROM
|
|
@Users u
|
|
INNER JOIN
|
|
[dbo].[OrganizationUser] ou ON ou.Id = u.Id
|
|
LEFT JOIN
|
|
[dbo].[CollectionUser] cu ON cu.CollectionId = @Id AND cu.OrganizationUserId = u.Id
|
|
WHERE
|
|
ou.OrganizationId = @OrganizationId
|
|
AND cu.CollectionId IS NULL;
|
|
|
|
EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @Id, @OrganizationId
|
|
END
|
|
GO
|
|
|
|
CREATE OR ALTER PROCEDURE [dbo].[Collection_UpdateWithGroups]
|
|
@Id UNIQUEIDENTIFIER,
|
|
@OrganizationId UNIQUEIDENTIFIER,
|
|
@Name VARCHAR(MAX),
|
|
@ExternalId NVARCHAR(300),
|
|
@CreationDate DATETIME2(7),
|
|
@RevisionDate DATETIME2(7),
|
|
@Groups AS [dbo].[CollectionAccessSelectionType] READONLY,
|
|
@DefaultUserCollectionEmail NVARCHAR(256) = NULL,
|
|
@Type TINYINT = 0
|
|
AS
|
|
BEGIN
|
|
SET NOCOUNT ON
|
|
|
|
EXEC [dbo].[Collection_Update] @Id, @OrganizationId, @Name, @ExternalId, @CreationDate, @RevisionDate, @DefaultUserCollectionEmail, @Type
|
|
|
|
-- Groups
|
|
-- Delete groups that are no longer in source
|
|
DELETE
|
|
cg
|
|
FROM
|
|
[dbo].[CollectionGroup] cg
|
|
LEFT JOIN
|
|
@Groups g ON cg.GroupId = g.Id
|
|
WHERE
|
|
cg.CollectionId = @Id
|
|
AND g.Id IS NULL;
|
|
|
|
-- Update existing groups
|
|
UPDATE
|
|
cg
|
|
SET
|
|
cg.ReadOnly = g.ReadOnly,
|
|
cg.HidePasswords = g.HidePasswords,
|
|
cg.Manage = g.Manage
|
|
FROM
|
|
[dbo].[CollectionGroup] cg
|
|
INNER JOIN
|
|
@Groups g ON cg.GroupId = g.Id
|
|
WHERE
|
|
cg.CollectionId = @Id
|
|
AND (
|
|
cg.ReadOnly != g.ReadOnly
|
|
OR cg.HidePasswords != g.HidePasswords
|
|
OR cg.Manage != g.Manage
|
|
);
|
|
|
|
-- Insert new groups
|
|
INSERT INTO [dbo].[CollectionGroup]
|
|
(
|
|
[CollectionId],
|
|
[GroupId],
|
|
[ReadOnly],
|
|
[HidePasswords],
|
|
[Manage]
|
|
)
|
|
SELECT
|
|
@Id,
|
|
g.Id,
|
|
g.ReadOnly,
|
|
g.HidePasswords,
|
|
g.Manage
|
|
FROM
|
|
@Groups g
|
|
INNER JOIN
|
|
[dbo].[Group] grp ON grp.Id = g.Id
|
|
LEFT JOIN
|
|
[dbo].[CollectionGroup] cg ON cg.CollectionId = @Id AND cg.GroupId = g.Id
|
|
WHERE
|
|
grp.OrganizationId = @OrganizationId
|
|
AND cg.CollectionId IS NULL;
|
|
|
|
EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @Id, @OrganizationId
|
|
END
|
|
GO
|