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

events for collections, groups, and org users

Browse Source
This commit is contained in:
Kyle Spearrin
2017-12-01 16:00:30 -05:00
parent a8fefb54c4
commit 28770d3761
20 changed files with 182 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Services/ICollectionService.cs
View File

@ -1,7 +1,6 @@
using System.Threading.Tasks;
using Bit.Core.Models.Table;
using System.Collections.Generic;
using System;
using Bit.Core.Models.Data;
namespace Bit.Core.Services
@ -9,5 +8,6 @@ namespace Bit.Core.Services
public interface ICollectionService
{
Task SaveAsync(Collection collection, IEnumerable<SelectionReadOnly> groups = null);
Task DeleteAsync(Collection collection);
}
}

4
src/Core/Services/IEventService.cs
View File

@ -9,5 +9,9 @@ namespace Bit.Core.Services
{
Task LogUserEventAsync(Guid userId, EventType type);
Task LogCipherEventAsync(Cipher cipher, EventType type);
Task LogCollectionEventAsync(Collection collection, EventType type);
Task LogGroupEventAsync(Group group, EventType type);
Task LogOrganizationUserEventAsync(OrganizationUser organizationUser, EventType type);
Task LogOrganizationEventAsync(Organization organization, EventType type);
}
}

1
src/Core/Services/IGroupService.cs
View File

@ -8,5 +8,6 @@ namespace Bit.Core.Services
public interface IGroupService
{
Task SaveAsync(Group group, IEnumerable<SelectionReadOnly> collections = null);
Task DeleteAsync(Group group);
}
}

1
src/Core/Services/IOrganizationService.cs
View File

@ -36,6 +36,7 @@ namespace Bit.Core.Services
Task SaveUserAsync(OrganizationUser user, Guid savingUserId, IEnumerable<SelectionReadOnly> collections);
Task DeleteUserAsync(Guid organizationId, Guid organizationUserId, Guid deletingUserId);
Task DeleteUserAsync(Guid organizationId, Guid userId);
Task UpdateUserGroupsAsync(OrganizationUser organizationUser, IEnumerable<Guid> groupIds);
Task<OrganizationLicense> GenerateLicenseAsync(Guid organizationId, Guid installationId);
Task<OrganizationLicense> GenerateLicenseAsync(Organization organization, Guid installationId);
Task ImportAsync(Guid organizationId, Guid importingUserId, IEnumerable<ImportedGroup> groups,

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

@ -10,6 +10,7 @@ namespace Bit.Core.Services
{
public class CollectionService : ICollectionService
{
private readonly IEventService _eventService;
private readonly IOrganizationRepository _organizationRepository;
private readonly IOrganizationUserRepository _organizationUserRepository;
private readonly ICollectionRepository _collectionRepository;
@ -17,12 +18,14 @@ namespace Bit.Core.Services
private readonly IMailService _mailService;
public CollectionService(
IEventService eventService,
IOrganizationRepository organizationRepository,
IOrganizationUserRepository organizationUserRepository,
ICollectionRepository collectionRepository,
IUserRepository userRepository,
IMailService mailService)
{
_eventService = eventService;
_organizationRepository = organizationRepository;
_organizationUserRepository = organizationUserRepository;
_collectionRepository = collectionRepository;
@ -58,6 +61,8 @@ namespace Bit.Core.Services
{
await _collectionRepository.CreateAsync(collection, groups);
}
await _eventService.LogCollectionEventAsync(collection, Enums.EventType.Collection_Created);
}
else
{
@ -69,7 +74,15 @@ namespace Bit.Core.Services
{
await _collectionRepository.ReplaceAsync(collection, groups ?? new List<SelectionReadOnly>());
}
await _eventService.LogCollectionEventAsync(collection, Enums.EventType.Collection_Updated);
}
}
public async Task DeleteAsync(Collection collection)
{
await _collectionRepository.DeleteAsync(collection);
await _eventService.LogCollectionEventAsync(collection, Enums.EventType.Collection_Deleted);
}
}
}

26
src/Core/Services/Implementations/EventService.cs
View File

@ -63,7 +63,31 @@ namespace Bit.Core.Services
return;
}
var e = new CipherEvent(cipher, type, _currentContext?.UserId);
var e = new CipherEvent(cipher, _currentContext?.UserId, type);
await _eventRepository.CreateAsync(e);
}
public async Task LogCollectionEventAsync(Collection collection, EventType type)
{
var e = new CollectionEvent(collection, _currentContext.UserId.Value, type);
await _eventRepository.CreateAsync(e);
}
public async Task LogGroupEventAsync(Group group, EventType type)
{
var e = new GroupEvent(group, _currentContext.UserId.Value, type);
await _eventRepository.CreateAsync(e);
}
public async Task LogOrganizationUserEventAsync(OrganizationUser organizationUser, EventType type)
{
var e = new OrganizationUserEvent(organizationUser, _currentContext.UserId.Value, type);
await _eventRepository.CreateAsync(e);
}
public async Task LogOrganizationEventAsync(Organization organization, EventType type)
{
var e = new OrganizationEvent(organization, _currentContext.UserId.Value, type);
await _eventRepository.CreateAsync(e);
}
}

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

@ -10,13 +10,16 @@ namespace Bit.Core.Services
{
public class GroupService : IGroupService
{
private readonly IEventService _eventService;
private readonly IOrganizationRepository _organizationRepository;
private readonly IGroupRepository _groupRepository;
public GroupService(
IEventService eventService,
IOrganizationRepository organizationRepository,
IGroupRepository groupRepository)
{
_eventService = eventService;
_organizationRepository = organizationRepository;
_groupRepository = groupRepository;
}
@ -46,12 +49,21 @@ namespace Bit.Core.Services
{
await _groupRepository.CreateAsync(group, collections);
}
await _eventService.LogGroupEventAsync(group, Enums.EventType.Group_Created);
}
else
{
group.RevisionDate = DateTime.UtcNow;
await _groupRepository.ReplaceAsync(group, collections ?? new List<SelectionReadOnly>());
await _eventService.LogGroupEventAsync(group, Enums.EventType.Group_Updated);
}
}
public async Task DeleteAsync(Group group)
{
await _groupRepository.DeleteAsync(group);
await _eventService.LogGroupEventAsync(group, Enums.EventType.Group_Deleted);
}
}
}

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

@ -29,6 +29,7 @@ namespace Bit.Core.Services
private readonly IPushRegistrationService _pushRegistrationService;
private readonly IDeviceRepository _deviceRepository;
private readonly ILicensingService _licensingService;
private readonly IEventService _eventService;
private readonly IInstallationRepository _installationRepository;
private readonly StripePaymentService _stripePaymentService;
private readonly GlobalSettings _globalSettings;
@ -45,6 +46,7 @@ namespace Bit.Core.Services
IPushRegistrationService pushRegistrationService,
IDeviceRepository deviceRepository,
ILicensingService licensingService,
IEventService eventService,
IInstallationRepository installationRepository,
GlobalSettings globalSettings)
{
@ -59,6 +61,7 @@ namespace Bit.Core.Services
_pushRegistrationService = pushRegistrationService;
_deviceRepository = deviceRepository;
_licensingService = licensingService;
_eventService = eventService;
_installationRepository = installationRepository;
_stripePaymentService = new StripePaymentService();
_globalSettings = globalSettings;
@ -803,6 +806,7 @@ namespace Bit.Core.Services
}
await _organizationRepository.ReplaceAsync(organization);
await _eventService.LogOrganizationEventAsync(organization, EventType.Organization_Updated);
if(updateBilling && !string.IsNullOrWhiteSpace(organization.GatewayCustomerId))
{
@ -1008,6 +1012,7 @@ namespace Bit.Core.Services
orgUser.Key = key;
orgUser.Email = null;
await _organizationUserRepository.ReplaceAsync(orgUser);
await _eventService.LogOrganizationUserEventAsync(orgUser, EventType.OrganizationUser_Confirmed);
var user = await _userRepository.GetByIdAsync(orgUser.UserId.Value);
await _mailService.SendOrganizationConfirmedEmailAsync(org.Name, user.Email);
@ -1057,6 +1062,7 @@ namespace Bit.Core.Services
collections = new List<SelectionReadOnly>();
}
await _organizationUserRepository.ReplaceAsync(user, collections);
await _eventService.LogOrganizationUserEventAsync(user, EventType.OrganizationUser_Updated);
}
public async Task DeleteUserAsync(Guid organizationId, Guid organizationUserId, Guid deletingUserId)
@ -1088,6 +1094,7 @@ namespace Bit.Core.Services
}
await _organizationUserRepository.DeleteAsync(orgUser);
await _eventService.LogOrganizationUserEventAsync(orgUser, EventType.OrganizationUser_Removed);
if(orgUser.UserId.HasValue)
{
@ -1112,6 +1119,7 @@ namespace Bit.Core.Services
}
await _organizationUserRepository.DeleteAsync(orgUser);
await _eventService.LogOrganizationUserEventAsync(orgUser, EventType.OrganizationUser_Removed);
if(orgUser.UserId.HasValue)
{
@ -1121,6 +1129,12 @@ namespace Bit.Core.Services
}
}
public async Task UpdateUserGroupsAsync(OrganizationUser organizationUser, IEnumerable<Guid> groupIds)
{
await _organizationUserRepository.UpdateGroupsAsync(organizationUser.Id, groupIds);
await _eventService.LogOrganizationUserEventAsync(organizationUser, EventType.OrganizationUser_UpdatedGroups);
}
public async Task<OrganizationLicense> GenerateLicenseAsync(Guid organizationId, Guid installationId)
{
var organization = await _organizationRepository.GetByIdAsync(organizationId);

20
src/Core/Services/NoopImplementations/NoopEventService.cs
View File

@ -12,6 +12,26 @@ namespace Bit.Core.Services
return Task.FromResult(0);
}
public Task LogCollectionEventAsync(Collection collection, EventType type)
{
return Task.FromResult(0);
}
public Task LogGroupEventAsync(Group group, EventType type)
{
return Task.FromResult(0);
}
public Task LogOrganizationEventAsync(Organization organization, EventType type)
{
return Task.FromResult(0);
}
public Task LogOrganizationUserEventAsync(OrganizationUser organizationUser, EventType type)
{
return Task.FromResult(0);
}
public Task LogUserEventAsync(Guid userId, EventType type)
{
return Task.FromResult(0);