nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 09:32:48 -05:00
Code Activity

log event when removing user from group/collection

Browse Source
This commit is contained in:
Kyle Spearrin
2018-07-09 23:07:04 -04:00
parent 90df2f21e5
commit 9fee09e204
8 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,5 +84,16 @@ namespace Bit.Core.Services
await _collectionRepository.DeleteAsync(collection);
await _eventService.LogCollectionEventAsync(collection, Enums.EventType.Collection_Deleted);
}
public async Task DeleteUserAsync(Collection collection, Guid organizationUserId)
{
var orgUser = await _organizationUserRepository.GetByIdAsync(organizationUserId);
if(orgUser == null || orgUser.OrganizationId != collection.OrganizationId)
{
throw new NotFoundException();
}
await _collectionRepository.DeleteUserAsync(collection.Id, organizationUserId);
await _eventService.LogOrganizationUserEventAsync(orgUser, Enums.EventType.OrganizationUser_Updated);
}
}
}

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

@ -12,15 +12,18 @@ namespace Bit.Core.Services
{
private readonly IEventService _eventService;
private readonly IOrganizationRepository _organizationRepository;
private readonly IOrganizationUserRepository _organizationUserRepository;
private readonly IGroupRepository _groupRepository;
public GroupService(
IEventService eventService,
IOrganizationRepository organizationRepository,
IOrganizationUserRepository organizationUserRepository,
IGroupRepository groupRepository)
{
_eventService = eventService;
_organizationRepository = organizationRepository;
_organizationUserRepository = organizationUserRepository;
_groupRepository = groupRepository;
}
@ -65,5 +68,16 @@ namespace Bit.Core.Services
await _groupRepository.DeleteAsync(group);
await _eventService.LogGroupEventAsync(group, Enums.EventType.Group_Deleted);
}
public async Task DeleteUserAsync(Group group, Guid organizationUserId)
{
var orgUser = await _organizationUserRepository.GetByIdAsync(organizationUserId);
if(orgUser == null || orgUser.OrganizationId != group.OrganizationId)
{
throw new NotFoundException();
}
await _groupRepository.DeleteUserAsync(group.Id, organizationUserId);
await _eventService.LogOrganizationUserEventAsync(orgUser, Enums.EventType.OrganizationUser_UpdatedGroups);
}
}
}

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

@ -919,7 +919,7 @@ namespace Bit.Core.Services
organizationId, email, false);
if(existingOrgUserCount > 0)
{
throw new BadRequestException("User already invited.");
continue;
}
var orgUser = new OrganizationUser
@ -946,6 +946,7 @@ namespace Bit.Core.Services
}
await SendInviteAsync(orgUser);
await _eventService.LogOrganizationUserEventAsync(orgUser, EventType.OrganizationUser_Invited);
orgUsers.Add(orgUser);
}