added org user and cipher event APIs

src/Api/Controllers/EventsController.cs

@@ -17,15 +17,21 @@ namespace Bit.Api.Controllers
     public class EventsController : Controller
     {
         private readonly IUserService _userService;
+        private readonly ICipherRepository _cipherRepository;
+        private readonly IOrganizationUserRepository _organizationUserRepository;
         private readonly IEventRepository _eventRepository;
         private readonly CurrentContext _currentContext;
 
         public EventsController(
             IUserService userService,
+            ICipherRepository cipherRepository,
+            IOrganizationUserRepository organizationUserRepository,
             IEventRepository eventRepository,
             CurrentContext currentContext)
         {
             _userService = userService;
+            _cipherRepository = cipherRepository;
+            _organizationUserRepository = organizationUserRepository;
             _eventRepository = eventRepository;
             _currentContext = currentContext;
         }
@@ -42,6 +48,25 @@ namespace Bit.Api.Controllers
             return new ListResponseModel<EventResponseModel>(responses, result.ContinuationToken);
         }
 
+        [HttpGet("~/ciphers/{id}/events")]
+        public async Task<ListResponseModel<EventResponseModel>> GetCipher(string id,
+            [FromQuery]DateTime? start = null, [FromQuery]DateTime? end = null, [FromQuery]string continuationToken = null)
+        {
+            var userId = _userService.GetProperUserId(User).Value;
+            var cipher = await _cipherRepository.GetByIdAsync(new Guid(id), userId);
+            if(cipher == null ||
+                (cipher.OrganizationId.HasValue && !_currentContext.OrganizationAdmin(cipher.OrganizationId.Value)))
+            {
+                throw new NotFoundException();
+            }
+
+            var dateRange = GetDateRange(start, end);
+            var result = await _eventRepository.GetManyByCipherAsync(cipher, 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]string continuationToken = null)
@@ -59,6 +84,25 @@ namespace Bit.Api.Controllers
             return new ListResponseModel<EventResponseModel>(responses, result.ContinuationToken);
         }
 
+        [HttpGet("~/organizations/{orgId}/users/{id}/events")]
+        public async Task<ListResponseModel<EventResponseModel>> GetOrganizationUser(string orgId, string id,
+            [FromQuery]DateTime? start = null, [FromQuery]DateTime? end = null, [FromQuery]string continuationToken = null)
+        {
+            var organizationUser = await _organizationUserRepository.GetByIdAsync(new Guid(id));
+            if(organizationUser == null || !organizationUser.UserId.HasValue ||
+                !_currentContext.OrganizationAdmin(organizationUser.OrganizationId))
+            {
+                throw new NotFoundException();
+            }
+
+            var dateRange = GetDateRange(start, end);
+            var result = await _eventRepository.GetManyByOrganizationActingUserAsync(organizationUser.OrganizationId,
+                organizationUser.UserId.Value, 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)
         {
             if(!end.HasValue || !start.HasValue)

src/Core/Repositories/IEventRepository.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bit.Core.Models.Data;
+using Bit.Core.Models.Table;
 
 namespace Bit.Core.Repositories
 {
@@ -11,6 +12,10 @@ namespace Bit.Core.Repositories
             PageOptions pageOptions);
         Task<PagedResult<IEvent>> GetManyByOrganizationAsync(Guid organizationId, DateTime startDate, DateTime endDate,
             PageOptions pageOptions);
+        Task<PagedResult<IEvent>> GetManyByOrganizationActingUserAsync(Guid organizationId, Guid actingUserId,
+            DateTime startDate, DateTime endDate, PageOptions pageOptions);
+        Task<PagedResult<IEvent>> GetManyByCipherAsync(Cipher cipher, DateTime startDate, DateTime endDate,
+            PageOptions pageOptions);
         Task CreateAsync(IEvent e);
         Task CreateManyAsync(IList<IEvent> e);
     }

src/Core/Repositories/SqlServer/EventRepository.cs

@@ -29,6 +29,21 @@ namespace Bit.Core.Repositories.SqlServer
         public Task<PagedResult<IEvent>> GetManyByOrganizationAsync(Guid organizationId,
             DateTime startDate, DateTime endDate, PageOptions pageOptions)
         {
+            // TODO
+            throw new NotImplementedException();
+        }
+
+        public Task<PagedResult<IEvent>> GetManyByOrganizationActingUserAsync(Guid organizationId, Guid actingUserId,
+            DateTime startDate, DateTime endDate, PageOptions pageOptions)
+        {
+            // TODO
+            throw new NotImplementedException();
+        }
+
+        public Task<PagedResult<IEvent>> GetManyByCipherAsync(Cipher cipher, DateTime startDate, DateTime endDate,
+            PageOptions pageOptions)
+        {
+            // TODO
             throw new NotImplementedException();
         }
 

src/Core/Repositories/TableStorage/EventRepository.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Bit.Core.Models.Data;
+using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Table;
@@ -27,37 +28,28 @@ namespace Bit.Core.Repositories.TableStorage
         public async Task<PagedResult<IEvent>> GetManyByUserAsync(Guid userId, DateTime startDate, DateTime endDate,
             PageOptions pageOptions)
         {
-            var start = CoreHelpers.DateTimeToTableStorageKey(startDate);
+            return await GetManyAsync($"UserId={userId}", "Date={{0}}", startDate, endDate, pageOptions);
-            var end = CoreHelpers.DateTimeToTableStorageKey(endDate);
-            var filter = MakeFilter($"UserId={userId}", $"Date={start}", $"Date={end}");
-
-            var query = new TableQuery<EventTableEntity>().Where(filter).Take(pageOptions.PageSize);
-            var result = new PagedResult<IEvent>();
-            var continuationToken = DeserializeContinuationToken(pageOptions?.ContinuationToken);
-
-            var queryResults = await _table.ExecuteQuerySegmentedAsync(query, continuationToken);
-            result.ContinuationToken = SerializeContinuationToken(queryResults.ContinuationToken);
-            result.Data.AddRange(queryResults.Results);
-
-            return result;
         }
 
         public async Task<PagedResult<IEvent>> GetManyByOrganizationAsync(Guid organizationId,
             DateTime startDate, DateTime endDate, PageOptions pageOptions)
         {
-            var start = CoreHelpers.DateTimeToTableStorageKey(startDate);
+            return await GetManyAsync($"OrganizationId={organizationId}", "Date={{0}}", startDate, endDate, pageOptions);
-            var end = CoreHelpers.DateTimeToTableStorageKey(endDate);
+        }
-            var filter = MakeFilter($"OrganizationId={organizationId}", $"Date={start}", $"Date={end}");
 
-            var query = new TableQuery<EventTableEntity>().Where(filter).Take(pageOptions.PageSize);
+        public async Task<PagedResult<IEvent>> GetManyByOrganizationActingUserAsync(Guid organizationId, Guid actingUserId,
-            var result = new PagedResult<IEvent>();
+            DateTime startDate, DateTime endDate, PageOptions pageOptions)
-            var continuationToken = DeserializeContinuationToken(pageOptions?.ContinuationToken);
+        {
+            return await GetManyAsync($"OrganizationId={organizationId}",
+                $"ActingUserId={actingUserId}__Date={{0}}", startDate, endDate, pageOptions);
+        }
 
-            var queryResults = await _table.ExecuteQuerySegmentedAsync(query, continuationToken);
+        public async Task<PagedResult<IEvent>> GetManyByCipherAsync(Cipher cipher, DateTime startDate, DateTime endDate,
-            result.ContinuationToken = SerializeContinuationToken(queryResults.ContinuationToken);
+            PageOptions pageOptions)
-            result.Data.AddRange(queryResults.Results);
+        {
-
+            var partitionKey = cipher.OrganizationId.HasValue ?
-            return result;
+                $"OrganizationId={cipher.OrganizationId}" : $"UserId={cipher.UserId}";
+            return await GetManyAsync(partitionKey, $"CipherId={cipher.Id}__Date={{0}}", startDate, endDate, pageOptions);
         }
 
         public async Task CreateAsync(IEvent e)
@@ -120,6 +112,24 @@ namespace Bit.Core.Repositories.TableStorage
             await _table.ExecuteAsync(TableOperation.Insert(entity));
         }
 
+        public async Task<PagedResult<IEvent>> GetManyAsync(string partitionKey, string rowKey,
+            DateTime startDate, DateTime endDate, PageOptions pageOptions)
+        {
+            var start = CoreHelpers.DateTimeToTableStorageKey(startDate);
+            var end = CoreHelpers.DateTimeToTableStorageKey(endDate);
+            var filter = MakeFilter(partitionKey, string.Format(rowKey, start), string.Format(rowKey, end));
+
+            var query = new TableQuery<EventTableEntity>().Where(filter).Take(pageOptions.PageSize);
+            var result = new PagedResult<IEvent>();
+            var continuationToken = DeserializeContinuationToken(pageOptions?.ContinuationToken);
+
+            var queryResults = await _table.ExecuteQuerySegmentedAsync(query, continuationToken);
+            result.ContinuationToken = SerializeContinuationToken(queryResults.ContinuationToken);
+            result.Data.AddRange(queryResults.Results);
+
+            return result;
+        }
+
         private string MakeFilter(string partitionKey, string rowStart, string rowEnd)
         {
             var rowFilter = TableQuery.CombineFilters(