nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-15 10:08:14 -05:00
Code

fixes to event get APIs

Browse Source
This commit is contained in:
Kyle Spearrin 2017-12-14 15:04:20 -05:00
parent f8f8eb5411
commit 2c4ce27ef2
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ namespace Bit.Api.Controllers
return new ListResponseModel<EventResponseModel>(responses); return new ListResponseModel<EventResponseModel>(responses);
} }
[HttpGet("~/organization/{id}/events")] [HttpGet("~/organizations/{id}/events")]
public async Task<ListResponseModel<EventResponseModel>> GetOrganization(string id, public async Task<ListResponseModel<EventResponseModel>> GetOrganization(string id,
[FromQuery]DateTime? start = null, [FromQuery]DateTime? end = null) [FromQuery]DateTime? start = null, [FromQuery]DateTime? end = null)
{ {
@ -70,7 +70,7 @@ namespace Bit.Api.Controllers
start = end.Value.AddDays(-30); start = end.Value.AddDays(-30);
if(endSet) if(endSet)
{ {
start = end.Value.AddMilliseconds(1); start = start.Value.AddMilliseconds(1);
} }
} }

9
src/Core/Models/Data/EventTableEntity.cs
View File

@ -121,5 +121,14 @@ namespace Bit.Core.Models.Data
} }
return result; return result;
} }
public override void ReadEntity(IDictionary<string, EntityProperty> properties, OperationContext operationContext)
{
base.ReadEntity(properties, operationContext);
if(properties.ContainsKey(nameof(Type)) && properties[nameof(Type)].Int32Value.HasValue)
{
Type = (EventType)properties[nameof(Type)].Int32Value;
}
}
} }
} }

8
src/Core/Repositories/TableStorage/EventRepository.cs
View File

@ -30,9 +30,9 @@ namespace Bit.Core.Repositories.TableStorage
var end = CoreHelpers.DateTimeToTableStorageKey(endDate); var end = CoreHelpers.DateTimeToTableStorageKey(endDate);
var rowFilter = TableQuery.CombineFilters( var rowFilter = TableQuery.CombineFilters(
TableQuery.GenerateFilterCondition("RowKey", QueryComparisons.GreaterThanOrEqual, $"{start}_"), TableQuery.GenerateFilterCondition("RowKey", QueryComparisons.GreaterThanOrEqual, $"Date={start}_"),
TableOperators.And, TableOperators.And,
TableQuery.GenerateFilterCondition("RowKey", QueryComparisons.LessThanOrEqual, $"{end}`")); TableQuery.GenerateFilterCondition("RowKey", QueryComparisons.LessThanOrEqual, $"Date={end}`"));
var filter = TableQuery.CombineFilters( var filter = TableQuery.CombineFilters(
TableQuery.GenerateFilterCondition("PartitionKey", QueryComparisons.Equal, $"UserId={userId}"), TableQuery.GenerateFilterCondition("PartitionKey", QueryComparisons.Equal, $"UserId={userId}"),
@ -60,9 +60,9 @@ namespace Bit.Core.Repositories.TableStorage
var end = CoreHelpers.DateTimeToTableStorageKey(endDate); var end = CoreHelpers.DateTimeToTableStorageKey(endDate);
var rowFilter = TableQuery.CombineFilters( var rowFilter = TableQuery.CombineFilters(
TableQuery.GenerateFilterCondition("RowKey", QueryComparisons.GreaterThanOrEqual, $"{start}_"), TableQuery.GenerateFilterCondition("RowKey", QueryComparisons.GreaterThanOrEqual, $"Date={start}_"),
TableOperators.And, TableOperators.And,
TableQuery.GenerateFilterCondition("RowKey", QueryComparisons.LessThanOrEqual, $"{end}`")); TableQuery.GenerateFilterCondition("RowKey", QueryComparisons.LessThanOrEqual, $"Date={end}`"));
var filter = TableQuery.CombineFilters( var filter = TableQuery.CombineFilters(
TableQuery.GenerateFilterCondition("PartitionKey", QueryComparisons.Equal, $"OrganizationId={organizationId}"), TableQuery.GenerateFilterCondition("PartitionKey", QueryComparisons.Equal, $"OrganizationId={organizationId}"),

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

@ -58,7 +58,7 @@ namespace Bit.Core.Services
orgEvents = orgs.Where(o => o.Status == OrganizationUserStatusType.Confirmed) orgEvents = orgs.Where(o => o.Status == OrganizationUserStatusType.Confirmed)
.Select(o => new EventMessage .Select(o => new EventMessage
{ {
OrganizationId = o.Id, OrganizationId = o.OrganizationId,
UserId = userId, UserId = userId,
Type = type, Type = type,
Date = DateTime.UtcNow Date = DateTime.UtcNow