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

Added API for getting the current user's account revision date

Browse Source
This commit is contained in:
Kyle Spearrin
2017-01-14 10:02:37 -05:00
parent fd961dfdf6
commit 4e790fcfa3
7 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Services/IUserService.cs
View File

@ -3,13 +3,16 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity;
using Bit.Core.Domains;
using System.Security.Claims;
namespace Bit.Core.Services
{
public interface IUserService
{
Guid? GetProperUserId(ClaimsPrincipal principal);
Task<User> GetUserByIdAsync(string userId);
Task<User> GetUserByIdAsync(Guid userId);
Task<DateTime> GetAccountRevisionDateByIdAsync(Guid userId);
Task SaveUserAsync(User user);
Task<IdentityResult> RegisterUserAsync(User user, string masterPassword);
Task SendMasterPasswordHintAsync(string email);

23
src/Core/Services/Implementations/UserService.cs
View File

@ -10,6 +10,7 @@ using System.Linq;
using Microsoft.AspNetCore.Builder;
using Bit.Core.Enums;
using OtpNet;
using System.Security.Claims;
namespace Bit.Core.Services
{
@ -56,6 +57,17 @@ namespace Bit.Core.Services
_passwordValidators = passwordValidators;
}
public Guid? GetProperUserId(ClaimsPrincipal principal)
{
Guid userIdGuid;
if(!Guid.TryParse(GetUserId(principal), out userIdGuid))
{
return null;
}
return userIdGuid;
}
public async Task<User> GetUserByIdAsync(string userId)
{
Guid userIdGuid;
@ -72,6 +84,11 @@ namespace Bit.Core.Services
return await _userRepository.GetByIdAsync(userId);
}
public async Task<DateTime> GetAccountRevisionDateByIdAsync(Guid userId)
{
return await _userRepository.GetAccountRevisionDateAsync(userId);
}
public async Task SaveUserAsync(User user)
{
if(user.Id == default(Guid))
@ -79,7 +96,7 @@ namespace Bit.Core.Services
throw new ApplicationException("Use register method to create a new user.");
}
user.RevisionDate = DateTime.UtcNow;
user.RevisionDate = user.AccountRevisionDate = DateTime.UtcNow;
await _userRepository.ReplaceAsync(user);
}
@ -152,7 +169,7 @@ namespace Bit.Core.Services
user.Email = newEmail;
user.EmailVerified = true;
user.RevisionDate = DateTime.UtcNow;
user.RevisionDate = user.AccountRevisionDate = DateTime.UtcNow;
if(ciphers.Any())
{
@ -186,7 +203,7 @@ namespace Bit.Core.Services
return result;
}
user.RevisionDate = DateTime.UtcNow;
user.RevisionDate = user.AccountRevisionDate = DateTime.UtcNow;
if(ciphers.Any())
{
await _cipherRepository.UpdateUserEmailPasswordAndCiphersAsync(user, ciphers);