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

store device type and ip address on events

Browse Source
This commit is contained in:
Kyle Spearrin
2017-12-15 10:50:06 -05:00
parent 39f6516ca8
commit a9f232746e
11 changed files with 123 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Core/Utilities/CurrentContextMiddleware.cs
View File

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Http;
using Bit.Core.Enums;
using Microsoft.AspNetCore.Http;
using System;
using System.Collections.Generic;
using System.Linq;
@ -18,7 +19,9 @@ namespace Bit.Core.Utilities
public async Task Invoke(HttpContext httpContext, CurrentContext currentContext)
{
if(httpContext.User != null)
currentContext.HttpContext = httpContext;
if(httpContext.User != null && httpContext.User.Claims.Any())
{
var claimsDict = httpContext.User.Claims
.GroupBy(c => c.Type)
@ -48,7 +51,7 @@ namespace Bit.Core.Utilities
new CurrentContext.CurrentContentOrganization
{
Id = new Guid(c.Value),
Type = Core.Enums.OrganizationUserType.Owner
Type = OrganizationUserType.Owner
}));
}
@ -58,7 +61,7 @@ namespace Bit.Core.Utilities
new CurrentContext.CurrentContentOrganization
{
Id = new Guid(c.Value),
Type = Core.Enums.OrganizationUserType.Admin
Type = OrganizationUserType.Admin
}));
}
@ -68,7 +71,7 @@ namespace Bit.Core.Utilities
new CurrentContext.CurrentContentOrganization
{
Id = new Guid(c.Value),
Type = Core.Enums.OrganizationUserType.User
Type = OrganizationUserType.User
}));
}
}
@ -78,6 +81,12 @@ namespace Bit.Core.Utilities
currentContext.DeviceIdentifier = httpContext.Request.Headers["Device-Identifier"];
}
if(httpContext.Request.Headers.ContainsKey("Device-Type") &&
Enum.TryParse(httpContext.Request.Headers["Device-Type"].ToString(), out DeviceType dType))
{
currentContext.DeviceType = dType;
}
await _next.Invoke(httpContext);
}