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

process messages with IEvent

Browse Source
This commit is contained in:
Kyle Spearrin
2017-12-08 23:09:50 -05:00
parent 83a7c98fae
commit 1bdf56d39f
18 changed files with 257 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ namespace Bit.Core.Services
{
public interface IEventWriteService
{
Task CreateAsync(EventTableEntity entity);
Task CreateManyAsync(IList<EventTableEntity> entities);
Task CreateAsync(IEvent e);
Task CreateManyAsync(IList<IEvent> e);
}
}

8
src/Core/Services/Implementations/AzureQueueEventWriteService.cs
View File

@ -29,16 +29,16 @@ namespace Bit.Core.Services
_globalSettings = globalSettings;
}
public async Task CreateAsync(EventTableEntity entity)
public async Task CreateAsync(IEvent e)
{
var json = JsonConvert.SerializeObject(entity, _jsonSettings);
var json = JsonConvert.SerializeObject(e, _jsonSettings);
var message = new CloudQueueMessage(json);
await _queue.AddMessageAsync(message);
}
public async Task CreateManyAsync(IList<EventTableEntity> entities)
public async Task CreateManyAsync(IList<IEvent> e)
{
var json = JsonConvert.SerializeObject(entities, _jsonSettings);
var json = JsonConvert.SerializeObject(e, _jsonSettings);
var message = new CloudQueueMessage(json);
await _queue.AddMessageAsync(message);
}

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

@ -30,18 +30,39 @@ namespace Bit.Core.Services
public async Task LogUserEventAsync(Guid userId, EventType type)
{
var events = new List<EventTableEntity> { new UserEvent(userId, type) };
var now = DateTime.UtcNow;
var events = new List<IEvent>
{
new Event
{
UserId = userId,
Type = type,
Date = now
}
};
IEnumerable<UserEvent> orgEvents;
IEnumerable<IEvent> orgEvents;
if(_currentContext.UserId.HasValue)
{
orgEvents = _currentContext.Organizations.Select(o => new UserEvent(userId, o.Id, type));
orgEvents = _currentContext.Organizations.Select(o => new Event
{
OrganizationId = o.Id,
UserId = userId,
Type = type,
Date = DateTime.UtcNow
});
}
else
{
var orgs = await _organizationUserRepository.GetManyByUserAsync(userId);
orgEvents = orgs.Where(o => o.Status == OrganizationUserStatusType.Confirmed)
.Select(o => new UserEvent(userId, o.Id, type));
.Select(o => new Event
{
OrganizationId = o.Id,
UserId = userId,
Type = type,
Date = DateTime.UtcNow
});
}
if(orgEvents.Any())
@ -62,31 +83,67 @@ namespace Bit.Core.Services
return;
}
var e = new CipherEvent(cipher, _currentContext?.UserId, type);
var e = new Event
{
OrganizationId = cipher.OrganizationId,
UserId = cipher.OrganizationId.HasValue ? null : cipher.UserId,
CipherId = cipher.Id,
Type = type,
ActingUserId = _currentContext?.UserId,
Date = DateTime.UtcNow
};
await _eventWriteService.CreateAsync(e);
}
public async Task LogCollectionEventAsync(Collection collection, EventType type)
{
var e = new CollectionEvent(collection, _currentContext.UserId.Value, type);
var e = new Event
{
OrganizationId = collection.OrganizationId,
CollectionId = collection.Id,
Type = type,
ActingUserId = _currentContext.UserId.Value,
Date = DateTime.UtcNow
};
await _eventWriteService.CreateAsync(e);
}
public async Task LogGroupEventAsync(Group group, EventType type)
{
var e = new GroupEvent(group, _currentContext.UserId.Value, type);
var e = new Event
{
OrganizationId = group.OrganizationId,
GroupId = group.Id,
Type = type,
ActingUserId = _currentContext.UserId.Value,
Date = DateTime.UtcNow
};
await _eventWriteService.CreateAsync(e);
}
public async Task LogOrganizationUserEventAsync(OrganizationUser organizationUser, EventType type)
{
var e = new OrganizationUserEvent(organizationUser, _currentContext.UserId.Value, type);
var e = new Event
{
OrganizationId = organizationUser.OrganizationId,
UserId = organizationUser.UserId,
OrganizationUserId = organizationUser.Id,
Type = type,
ActingUserId = _currentContext.UserId.Value,
Date = DateTime.UtcNow
};
await _eventWriteService.CreateAsync(e);
}
public async Task LogOrganizationEventAsync(Organization organization, EventType type)
{
var e = new OrganizationEvent(organization, _currentContext.UserId.Value, type);
var e = new Event
{
OrganizationId = organization.Id,
Type = type,
ActingUserId = _currentContext.UserId.Value,
Date = DateTime.UtcNow
};
await _eventWriteService.CreateAsync(e);
}
}

8
src/Core/Services/Implementations/RepositoryEventWriteService.cs
View File

@ -15,14 +15,14 @@ namespace Bit.Core.Services
_eventRepository = eventRepository;
}
public async Task CreateAsync(EventTableEntity entity)
public async Task CreateAsync(IEvent e)
{
await _eventRepository.CreateAsync(entity);
await _eventRepository.CreateAsync(e);
}
public async Task CreateManyAsync(IList<EventTableEntity> entities)
public async Task CreateManyAsync(IList<IEvent> e)
{
await _eventRepository.CreateManyAsync(entities);
await _eventRepository.CreateManyAsync(e);
}
}
}

4
src/Core/Services/NoopImplementations/NoopEventWriteService.cs
View File

@ -6,12 +6,12 @@ namespace Bit.Core.Services
{
public class NoopEventWriteService : IEventWriteService
{
public Task CreateAsync(EventTableEntity entity)
public Task CreateAsync(IEvent e)
{
return Task.FromResult(0);
}
public Task CreateManyAsync(IList<EventTableEntity> entities)
public Task CreateManyAsync(IList<IEvent> e)
{
return Task.FromResult(0);
}