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

event paging

Browse Source
This commit is contained in:
Kyle Spearrin
2017-12-15 15:23:57 -05:00
parent 79d46578b0
commit 125eab11dc
8 changed files with 114 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Api/Controllers/EventsController.cs
View File

@ -8,6 +8,7 @@ using Bit.Core.Exceptions;
using Bit.Core.Models.Api;
using Bit.Core.Services;
using Bit.Core;
using Bit.Core.Models.Data;
namespace Bit.Api.Controllers
{
@ -31,18 +32,19 @@ namespace Bit.Api.Controllers
[HttpGet("")]
public async Task<ListResponseModel<EventResponseModel>> GetUser(
[FromQuery]DateTime? start = null, [FromQuery]DateTime? end = null)
[FromQuery]DateTime? start = null, [FromQuery]DateTime? end = null, [FromQuery]string continuationToken = null)
{
var dateRange = GetDateRange(start, end);
var userId = _userService.GetProperUserId(User).Value;
var events = await _eventRepository.GetManyByUserAsync(userId, dateRange.Item1, dateRange.Item2);
var responses = events.Select(e => new EventResponseModel(e));
return new ListResponseModel<EventResponseModel>(responses);
var result = await _eventRepository.GetManyByUserAsync(userId, dateRange.Item1, dateRange.Item2,
new PageOptions { ContinuationToken = continuationToken });
var responses = result.Data.Select(e => new EventResponseModel(e));
return new ListResponseModel<EventResponseModel>(responses, result.ContinuationToken);
}
[HttpGet("~/organizations/{id}/events")]
public async Task<ListResponseModel<EventResponseModel>> GetOrganization(string id,
[FromQuery]DateTime? start = null, [FromQuery]DateTime? end = null)
[FromQuery]DateTime? start = null, [FromQuery]DateTime? end = null, [FromQuery]string continuationToken = null)
{
var orgId = new Guid(id);
if(!_currentContext.OrganizationAdmin(orgId))
@ -51,9 +53,10 @@ namespace Bit.Api.Controllers
}
var dateRange = GetDateRange(start, end);
var events = await _eventRepository.GetManyByOrganizationAsync(orgId, dateRange.Item1, dateRange.Item2);
var responses = events.Select(e => new EventResponseModel(e));
return new ListResponseModel<EventResponseModel>(responses);
var result = await _eventRepository.GetManyByOrganizationAsync(orgId, dateRange.Item1, dateRange.Item2,
new PageOptions { ContinuationToken = continuationToken });
var responses = result.Data.Select(e => new EventResponseModel(e));
return new ListResponseModel<EventResponseModel>(responses, result.ContinuationToken);
}
private Tuple<DateTime, DateTime> GetDateRange(DateTime? start, DateTime? end)