1
0
mirror of https://github.com/bitwarden/server.git synced 2025-07-10 12:24:50 -05:00

Add support for new collection access, hide passwords

This commit is contained in:
hinton
2020-05-21 15:36:47 +02:00
parent 0cd90be83a
commit 36f15c67d0
26 changed files with 95 additions and 31 deletions

View File

@ -23,6 +23,13 @@ SELECT
THEN 1
ELSE 0
END [Edit],
CASE
WHEN
CU.[HidePasswords] = 0
OR CG.[HidePasswords] = 0
THEN 1
ELSE 0
END [ViewPassword],
CASE
WHEN O.[UseTotp] = 1
THEN 1
@ -55,6 +62,7 @@ UNION ALL
SELECT
*,
1 [Edit],
1 [ViewPassword],
0 [OrganizationUseTotp]
FROM
[dbo].[CipherDetails](@UserId)

View File

@ -11,7 +11,14 @@ SELECT
OR CG.[ReadOnly] = 0
THEN 0
ELSE 1
END [ReadOnly]
END [ReadOnly],
CASE
WHEN
CU.[HidePasswords] = 0
OR CG.[HidePasswords] = 0
THEN 0
ELSE 1
END [HidePasswords]
FROM
[dbo].[CollectionView] C
INNER JOIN

View File

@ -6,7 +6,8 @@ BEGIN
SELECT
[OrganizationUserId] [Id],
[ReadOnly]
[ReadOnly],
[HidePasswords]
FROM
[dbo].[CollectionUser]
WHERE

View File

@ -35,10 +35,15 @@ BEGIN
(
@CollectionId,
[Source].[Id],
[Source].[ReadOnly]
[Source].[ReadOnly],
[Source].[HidePasswords]
)
WHEN MATCHED AND [Target].[ReadOnly] != [Source].[ReadOnly] THEN
UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly]
WHEN MATCHED AND (
[Target].[ReadOnly] != [Source].[ReadOnly]
OR [Target].[HidePasswords] != [Source].[HidePasswords]
) THEN
UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly],
[Target].[HidePasswords] = [Source].[HidePasswords]
WHEN NOT MATCHED BY SOURCE
AND [Target].[CollectionId] = @CollectionId THEN
DELETE

View File

@ -24,12 +24,14 @@ BEGIN
(
[CollectionId],
[GroupId],
[ReadOnly]
[ReadOnly],
[HidePasswords]
)
SELECT
@Id,
[Id],
[ReadOnly]
[ReadOnly],
[HidePasswords]
FROM
@Groups
WHERE

View File

@ -8,7 +8,8 @@ BEGIN
SELECT
[GroupId] [Id],
[ReadOnly]
[ReadOnly],
[HidePasswords]
FROM
[dbo].[CollectionGroup]
WHERE

View File

@ -9,7 +9,8 @@ BEGIN
SELECT
[GroupId] [Id],
[ReadOnly]
[ReadOnly],
[HidePasswords]
FROM
[dbo].[CollectionGroup]
WHERE

View File

@ -33,10 +33,15 @@ BEGIN
(
@Id,
[Source].[Id],
[Source].[ReadOnly]
[Source].[ReadOnly],
[Source].[HidePasswords]
)
WHEN MATCHED AND [Target].[ReadOnly] != [Source].[ReadOnly] THEN
UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly]
WHEN MATCHED AND (
[Target].[ReadOnly] != [Source].[ReadOnly]
OR [Target].[HidePasswords] != [Source].[HidePasswords]
) THEN
UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly],
[Target].[HidePasswords] = [Source].[HidePasswords]
WHEN NOT MATCHED BY SOURCE
AND [Target].[CollectionId] = @Id THEN
DELETE

View File

@ -25,12 +25,14 @@ BEGIN
(
[CollectionId],
[GroupId],
[ReadOnly]
[ReadOnly],
[HidePasswords]
)
SELECT
[Id],
@Id,
[ReadOnly]
[ReadOnly],
[HidePasswords]
FROM
@Collections
WHERE

View File

@ -8,7 +8,8 @@ BEGIN
SELECT
[CollectionId] [Id],
[ReadOnly]
[ReadOnly],
[HidePasswords]
FROM
[dbo].[CollectionGroup]
WHERE

View File

@ -34,10 +34,15 @@ BEGIN
(
[Source].[Id],
@Id,
[Source].[ReadOnly]
[Source].[ReadOnly],
[Source].[HidePasswords]
)
WHEN MATCHED AND [Target].[ReadOnly] != [Source].[ReadOnly] THEN
UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly]
WHEN MATCHED AND (
[Target].[ReadOnly] != [Source].[ReadOnly]
OR [Target].[HidePasswords] != [Source].[HidePasswords]
) THEN
UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly],
[Target].[HidePasswords] = [Source].[HidePasswords]
WHEN NOT MATCHED BY SOURCE
AND [Target].[GroupId] = @Id THEN
DELETE

View File

@ -8,7 +8,8 @@ BEGIN
SELECT
CU.[CollectionId] Id,
CU.[ReadOnly]
CU.[ReadOnly],
CU.[HidePasswords]
FROM
[dbo].[OrganizationUser] OU
INNER JOIN

View File

@ -29,12 +29,14 @@ BEGIN
(
[CollectionId],
[OrganizationUserId],
[ReadOnly]
[ReadOnly],
[HidePasswords]
)
SELECT
[Id],
@Id,
[ReadOnly]
[ReadOnly],
[HidePasswords]
FROM
@Collections
WHERE

View File

@ -8,7 +8,8 @@ BEGIN
SELECT
CU.[CollectionId] Id,
CU.[ReadOnly]
CU.[ReadOnly],
CU.[HidePasswords]
FROM
[dbo].[OrganizationUser] OU
INNER JOIN

View File

@ -38,10 +38,15 @@ BEGIN
(
[Source].[Id],
@Id,
[Source].[ReadOnly]
[Source].[ReadOnly],
[Source].[HidePasswords]
)
WHEN MATCHED AND [Target].[ReadOnly] != [Source].[ReadOnly] THEN
UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly]
WHEN MATCHED AND (
[Target].[ReadOnly] != [Source].[ReadOnly]
OR [Target].[HidePasswords] != [Source].[HidePasswords]
) THEN
UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly],
[Target].[HidePasswords] = [Source].[HidePasswords]
WHEN NOT MATCHED BY SOURCE
AND [Target].[OrganizationUserId] = @Id THEN
DELETE

View File

@ -1,7 +1,8 @@
CREATE TABLE [dbo].[CollectionGroup] (
[CollectionId] UNIQUEIDENTIFIER NOT NULL,
[GroupId] UNIQUEIDENTIFIER NOT NULL,
[ReadOnly] BIT NOT NULL,
[CollectionId] UNIQUEIDENTIFIER NOT NULL,
[GroupId] UNIQUEIDENTIFIER NOT NULL,
[ReadOnly] BIT NOT NULL,
[HidePasswords] BIT NOT NULL DEFAULT 0,
CONSTRAINT [PK_CollectionGroup] PRIMARY KEY CLUSTERED ([CollectionId] ASC, [GroupId] ASC),
CONSTRAINT [FK_CollectionGroup_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]),
CONSTRAINT [FK_CollectionGroup_Group] FOREIGN KEY ([GroupId]) REFERENCES [dbo].[Group] ([Id]) ON DELETE CASCADE

View File

@ -2,6 +2,7 @@
[CollectionId] UNIQUEIDENTIFIER NOT NULL,
[OrganizationUserId] UNIQUEIDENTIFIER NOT NULL,
[ReadOnly] BIT NOT NULL,
[HidePasswords] BIT NOT NULL DEFAULT 0,
CONSTRAINT [PK_CollectionUser] PRIMARY KEY CLUSTERED ([CollectionId] ASC, [OrganizationUserId] ASC),
CONSTRAINT [FK_CollectionUser_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]) ON DELETE CASCADE,
CONSTRAINT [FK_CollectionUser_OrganizationUser] FOREIGN KEY ([OrganizationUserId]) REFERENCES [dbo].[OrganizationUser] ([Id])

View File

@ -1,4 +1,5 @@
CREATE TYPE [dbo].[SelectionReadOnlyArray] AS TABLE (
[Id] UNIQUEIDENTIFIER NOT NULL,
[ReadOnly] BIT NOT NULL);
[Id] UNIQUEIDENTIFIER NOT NULL,
[ReadOnly] BIT NOT NULL,
[HidePasswords] BIT NOT NULL);