nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-20 20:45:10 -05:00
Code

Resolve review comments

Browse Source
This commit is contained in:
hinton 2020-05-22 22:16:01 +02:00
parent 28fe86ecff
commit f2348d2264
4 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Models/Api/Request/SelectionReadOnlyRequestModel.cs
View File

@ -19,7 +19,7 @@ namespace Bit.Core.Models.Api
{ {
Id = new Guid(Id), Id = new Guid(Id),
ReadOnly = ReadOnly, ReadOnly = ReadOnly,
HidePasswords = HidePasswords HidePasswords = HidePasswords,
}; };
} }
} }

18
src/Sql/dbo/Functions/UserCollectionDetails.sql
View File

@ -3,22 +3,8 @@ RETURNS TABLE
AS RETURN AS RETURN
SELECT SELECT
C.*, C.*,
CASE COALESCE(CU.[ReadOnly], CG.[ReadOnly], 0) AS [ReadOnly],
WHEN COALESCE(CU.[HidePasswords], CG.[HidePasswords], 0) AS [HidePasswords]
OU.[AccessAll] = 1
OR G.[AccessAll] = 1
OR CU.[ReadOnly] = 0
OR CG.[ReadOnly] = 0
THEN 0
ELSE 1
END [ReadOnly],
CASE
WHEN
CU.[HidePasswords] = 0
OR CG.[HidePasswords] = 0
THEN 0
ELSE 1
END [HidePasswords]
FROM FROM
[dbo].[CollectionView] C [dbo].[CollectionView] C
INNER JOIN INNER JOIN

2
src/Sql/dbo/Tables/CollectionGroup.sql
View File

@ -2,7 +2,7 @@
[CollectionId] UNIQUEIDENTIFIER NOT NULL, [CollectionId] UNIQUEIDENTIFIER NOT NULL,
[GroupId] UNIQUEIDENTIFIER NOT NULL, [GroupId] UNIQUEIDENTIFIER NOT NULL,
[ReadOnly] BIT NOT NULL, [ReadOnly] BIT NOT NULL,
[HidePasswords] BIT NOT NULL DEFAULT 0, [HidePasswords] BIT NOT NULL,
CONSTRAINT [PK_CollectionGroup] PRIMARY KEY CLUSTERED ([CollectionId] ASC, [GroupId] ASC), CONSTRAINT [PK_CollectionGroup] PRIMARY KEY CLUSTERED ([CollectionId] ASC, [GroupId] ASC),
CONSTRAINT [FK_CollectionGroup_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]), 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 CONSTRAINT [FK_CollectionGroup_Group] FOREIGN KEY ([GroupId]) REFERENCES [dbo].[Group] ([Id]) ON DELETE CASCADE

2
src/Sql/dbo/Tables/CollectionUser.sql
View File

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