Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-03-14 13:49:30 +01:00
Code Issues Projects Releases Wiki Activity

Fix bulk api (#1335)

Browse Source
This commit is contained in:
Oscar Hinton 2021-05-17 20:07:41 +02:00 committed by GitHub
parent 785e788cb6
commit 2b6c5bcd31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1539,7 +1539,7 @@ namespace Bit.Core.Services
}
var owners = filteredUsers.Where(u => u.Type == OrganizationUserType.Owner);
if (!owners.Any() && deletingUserId.HasValue && !await UserIsOwnerAsync(organizationId, deletingUserId.Value))
if (owners.Any() && deletingUserId.HasValue && !await UserIsOwnerAsync(organizationId, deletingUserId.Value))
{
throw new BadRequestException("Only owners can delete other owners.");
}

1
test/Core.Test/Services/OrganizationServiceTests.cs
View File

@ -462,6 +462,7 @@ namespace Bit.Core.Test.Services
var organizationUserRepository = sutProvider.GetDependency<IOrganizationUserRepository>();
deletingUser.Type = OrganizationUserType.Admin;
orgUser1.Type = OrganizationUserType.Owner;
orgUser1.OrganizationId = orgUser2.OrganizationId = deletingUser.OrganizationId;
var organizationUsers = new[] { orgUser1, orgUser2 };
var organizationUserIds = organizationUsers.Select(u => u.Id);