From 7dd2c524de76c5839c1f96b19f9deeae1e2f2888 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 18 Dec 2017 13:59:31 -0500 Subject: [PATCH] new device type. return device & ip info on events --- src/Core/Enums/DeviceType.cs | 5 ++++- src/Core/Models/Api/Response/EventResponseModel.cs | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Core/Enums/DeviceType.cs b/src/Core/Enums/DeviceType.cs index e0aba27995..3bc5a3a493 100644 --- a/src/Core/Enums/DeviceType.cs +++ b/src/Core/Enums/DeviceType.cs @@ -18,6 +18,9 @@ IEBrowser = 13, UnknownBrowser = 14, AndroidAmazon = 15, - UWP = 16 + UWP = 16, + SafariBrowser = 17, + VivaldiBrowser = 18, + VivaldiExtension = 19 } } diff --git a/src/Core/Models/Api/Response/EventResponseModel.cs b/src/Core/Models/Api/Response/EventResponseModel.cs index aecfae7ba1..033748a4e3 100644 --- a/src/Core/Models/Api/Response/EventResponseModel.cs +++ b/src/Core/Models/Api/Response/EventResponseModel.cs @@ -23,6 +23,8 @@ namespace Bit.Core.Models.Api OrganizationUserId = ev.OrganizationUserId; ActingUserId = ev.ActingUserId; Date = ev.Date; + DeviceType = ev.DeviceType; + IpAddress = ev.IpAddress; } public EventType Type { get; set; } @@ -34,5 +36,7 @@ namespace Bit.Core.Models.Api public Guid? OrganizationUserId { get; set; } public Guid? ActingUserId { get; set; } public DateTime Date { get; set; } + public DeviceType? DeviceType { get; set; } + public string IpAddress { get; set; } } }