nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-21 03:24:31 -05:00
Code

[EC-495] Updated GroupService.SaveAsync to check if collections are supplied and prevent deleting Group-to-Collection associations. Added unit test. (#2234)

Browse Source
This commit is contained in:
Rui Tomé 2022-08-31 16:03:13 +01:00 committed by GitHub
parent a6d97118fa
commit e0f9d99b49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Core/Services/Implementations/GroupService.cs
View File

@ -61,7 +61,16 @@ public class GroupService : IGroupService
else else
{ {
group.RevisionDate = DateTime.UtcNow; group.RevisionDate = DateTime.UtcNow;
await _groupRepository.ReplaceAsync(group, collections ?? new List<SelectionReadOnly>());
if (collections == null)
{
await _groupRepository.ReplaceAsync(group);
}
else
{
await _groupRepository.ReplaceAsync(group, collections);
}
await _eventService.LogGroupEventAsync(group, Enums.EventType.Group_Updated); await _eventService.LogGroupEventAsync(group, Enums.EventType.Group_Updated);
} }
} }

14
test/Core.Test/Services/GroupServiceTests.cs
View File

@ -64,6 +64,20 @@ public class GroupServiceTests
Assert.True(group.RevisionDate - DateTime.UtcNow < TimeSpan.FromSeconds(1)); Assert.True(group.RevisionDate - DateTime.UtcNow < TimeSpan.FromSeconds(1));
} }
[Theory, BitAutoData]
public async Task SaveAsync_NonDefaultGroupId_ReplaceGroupInRepository_NoCollections(Group group, Organization organization, SutProvider<GroupService> sutProvider)
{
organization.UseGroups = true;
sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organization.Id).Returns(organization);
await sutProvider.Sut.SaveAsync(group, null);
await sutProvider.GetDependency<IGroupRepository>().Received().ReplaceAsync(group);
await sutProvider.GetDependency<IEventService>().Received()
.LogGroupEventAsync(group, EventType.Group_Updated);
Assert.True(group.RevisionDate - DateTime.UtcNow < TimeSpan.FromSeconds(1));
}
[Theory, BitAutoData] [Theory, BitAutoData]
public async Task SaveAsync_NonExistingOrganizationId_ThrowsBadRequest(Group group, SutProvider<GroupService> sutProvider) public async Task SaveAsync_NonExistingOrganizationId_ThrowsBadRequest(Group group, SutProvider<GroupService> sutProvider)
{ {