mirror of
https://github.com/bitwarden/android.git
synced 2024-11-01 07:35:52 +03:00
add event service
This commit is contained in:
parent
a240a4ac66
commit
40d68b1654
7 changed files with 135 additions and 3 deletions
|
@ -47,6 +47,6 @@ namespace Bit.Core.Abstractions
|
||||||
Task<List<BreachAccountResponse>> GetHibpBreachAsync(string username);
|
Task<List<BreachAccountResponse>> GetHibpBreachAsync(string username);
|
||||||
Task PostTwoFactorEmailAsync(TwoFactorEmailRequest request);
|
Task PostTwoFactorEmailAsync(TwoFactorEmailRequest request);
|
||||||
Task PutDeviceTokenAsync(string identifier, DeviceTokenRequest request);
|
Task PutDeviceTokenAsync(string identifier, DeviceTokenRequest request);
|
||||||
Task PostEventsCollectAsync(EventRequest request);
|
Task PostEventsCollectAsync(IEnumerable<EventRequest> request);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
12
src/Core/Abstractions/IEventService.cs
Normal file
12
src/Core/Abstractions/IEventService.cs
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Bit.Core.Enums;
|
||||||
|
|
||||||
|
namespace Bit.Core.Abstractions
|
||||||
|
{
|
||||||
|
public interface IEventService
|
||||||
|
{
|
||||||
|
Task ClearEventsAsync();
|
||||||
|
Task CollectAsync(EventType eventType, string cipherId = null, bool uploadImmediately = false);
|
||||||
|
Task UploadEventsAsync();
|
||||||
|
}
|
||||||
|
}
|
|
@ -32,6 +32,7 @@
|
||||||
public static string MigratedFromV1 = "migratedFromV1";
|
public static string MigratedFromV1 = "migratedFromV1";
|
||||||
public static string MigratedFromV1AutofillPromptShown = "migratedV1AutofillPromptShown";
|
public static string MigratedFromV1AutofillPromptShown = "migratedV1AutofillPromptShown";
|
||||||
public static string TriedV1Resync = "triedV1Resync";
|
public static string TriedV1Resync = "triedV1Resync";
|
||||||
|
public static string EventCollectionKey = "eventCollection";
|
||||||
public const int SelectFileRequestCode = 42;
|
public const int SelectFileRequestCode = 42;
|
||||||
public const int SelectFilePermissionRequestCode = 43;
|
public const int SelectFilePermissionRequestCode = 43;
|
||||||
}
|
}
|
||||||
|
|
12
src/Core/Models/Data/EventData.cs
Normal file
12
src/Core/Models/Data/EventData.cs
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
using Bit.Core.Enums;
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Bit.Core.Models.Data
|
||||||
|
{
|
||||||
|
public class EventData : Data
|
||||||
|
{
|
||||||
|
public EventType Type { get; set; }
|
||||||
|
public string CipherId { get; set; }
|
||||||
|
public DateTime Date { get; set; }
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
using Bit.Core.Enums;
|
using Bit.Core.Enums;
|
||||||
using Bit.Core.Models.Domain;
|
using System;
|
||||||
|
|
||||||
namespace Bit.Core.Models.Request
|
namespace Bit.Core.Models.Request
|
||||||
{
|
{
|
||||||
|
@ -7,5 +7,6 @@ namespace Bit.Core.Models.Request
|
||||||
{
|
{
|
||||||
public EventType Type { get; set; }
|
public EventType Type { get; set; }
|
||||||
public string CipherId { get; set; }
|
public string CipherId { get; set; }
|
||||||
|
public DateTime Date { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -298,7 +298,7 @@ namespace Bit.Core.Services
|
||||||
|
|
||||||
#region Event APIs
|
#region Event APIs
|
||||||
|
|
||||||
public async Task PostEventsCollectAsync(EventRequest request)
|
public async Task PostEventsCollectAsync(IEnumerable<EventRequest> request)
|
||||||
{
|
{
|
||||||
using(var requestMessage = new HttpRequestMessage())
|
using(var requestMessage = new HttpRequestMessage())
|
||||||
{
|
{
|
||||||
|
|
106
src/Core/Services/EventService.cs
Normal file
106
src/Core/Services/EventService.cs
Normal file
|
@ -0,0 +1,106 @@
|
||||||
|
using Bit.Core.Abstractions;
|
||||||
|
using Bit.Core.Enums;
|
||||||
|
using Bit.Core.Exceptions;
|
||||||
|
using Bit.Core.Models.Data;
|
||||||
|
using Bit.Core.Models.Request;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace Bit.Core.Services
|
||||||
|
{
|
||||||
|
public class EventService : IEventService
|
||||||
|
{
|
||||||
|
private readonly IStorageService _storageService;
|
||||||
|
private readonly IApiService _apiService;
|
||||||
|
private readonly IUserService _userService;
|
||||||
|
private readonly ICipherService _cipherService;
|
||||||
|
|
||||||
|
public EventService(
|
||||||
|
IStorageService storageService,
|
||||||
|
IApiService apiService,
|
||||||
|
IUserService userService,
|
||||||
|
ICipherService cipherService)
|
||||||
|
{
|
||||||
|
_storageService = storageService;
|
||||||
|
_apiService = apiService;
|
||||||
|
_userService = userService;
|
||||||
|
_cipherService = cipherService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task CollectAsync(EventType eventType, string cipherId = null, bool uploadImmediately = false)
|
||||||
|
{
|
||||||
|
var authed = await _userService.IsAuthenticatedAsync();
|
||||||
|
if(!authed)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var organizations = await _userService.GetAllOrganizationAsync();
|
||||||
|
if(organizations == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var orgIds = new HashSet<string>(organizations.Where(o => o.UseEvents).Select(o => o.Id));
|
||||||
|
if(!orgIds.Any())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(cipherId != null)
|
||||||
|
{
|
||||||
|
var cipher = await _cipherService.GetAsync(cipherId);
|
||||||
|
if(cipher?.OrganizationId == null || !orgIds.Contains(cipher.OrganizationId))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var eventCollection = await _storageService.GetAsync<List<EventData>>(Constants.EventCollectionKey);
|
||||||
|
if(eventCollection == null)
|
||||||
|
{
|
||||||
|
eventCollection = new List<EventData>();
|
||||||
|
}
|
||||||
|
eventCollection.Add(new EventData
|
||||||
|
{
|
||||||
|
Type = eventType,
|
||||||
|
CipherId = cipherId,
|
||||||
|
Date = DateTime.UtcNow
|
||||||
|
});
|
||||||
|
await _storageService.SaveAsync(Constants.EventCollectionKey, eventCollection);
|
||||||
|
if(uploadImmediately)
|
||||||
|
{
|
||||||
|
await UploadEventsAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task UploadEventsAsync()
|
||||||
|
{
|
||||||
|
var authed = await _userService.IsAuthenticatedAsync();
|
||||||
|
if(!authed)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var eventCollection = await _storageService.GetAsync<List<EventData>>(Constants.EventCollectionKey);
|
||||||
|
if(eventCollection == null || !eventCollection.Any())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var request = eventCollection.Select(e => new EventRequest
|
||||||
|
{
|
||||||
|
Type = e.Type,
|
||||||
|
CipherId = e.CipherId,
|
||||||
|
Date = e.Date
|
||||||
|
});
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await _apiService.PostEventsCollectAsync(request);
|
||||||
|
await ClearEventsAsync();
|
||||||
|
}
|
||||||
|
catch(ApiException) { }
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task ClearEventsAsync()
|
||||||
|
{
|
||||||
|
await _storageService.RemoveAsync(Constants.EventCollectionKey);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue