Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-29 13:25:17 +01:00
Code Issues Projects Releases Wiki Activity

org user remove fixes

Browse Source
This commit is contained in:
Kyle Spearrin 2017-04-18 15:27:54 -04:00
parent 9746bfb236
commit 2aa7c6cfe3
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -797,6 +797,11 @@ namespace Bit.Core.Services
throw new BadRequestException("User not valid."); throw new BadRequestException("User not valid.");
} }
if(orgUser.UserId == deletingUserId)
{
throw new BadRequestException("You cannot remove yourself.");
}
var confirmedOwners = (await GetConfirmedOwnersAsync(organizationId)).ToList(); var confirmedOwners = (await GetConfirmedOwnersAsync(organizationId)).ToList();
if(confirmedOwners.Count == 1 && confirmedOwners[0].Id == organizationUserId) if(confirmedOwners.Count == 1 && confirmedOwners[0].Id == organizationUserId)
{ {

6
src/Sql/dbo/Stored Procedures/OrganizationUser_DeleteById.sql
View File

@ -4,6 +4,12 @@ AS
BEGIN BEGIN
SET NOCOUNT ON SET NOCOUNT ON
DELETE
FROM
[dbo].[SubvaultUser]
WHERE
[OrganizationUserId] = @Id
DELETE DELETE
FROM FROM
[dbo].[OrganizationUser] [dbo].[OrganizationUser]