bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-07 11:03:37 +00:00
Code Issues Releases Wiki Activity

refactored data storage to use cipher table. added history table and insert triggers.

Browse Source
This commit is contained in:
Kyle Spearrin
2016-05-21 17:16:22 -04:00
parent 8137847485
commit 3fdb0fcf67
56 changed files with 422 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/Identity/UserStore.cs
View File

@@ -55,12 +55,14 @@ namespace Bit.Core.Identity
public async Task<User> FindByIdAsync(string userId, CancellationToken cancellationToken = default(CancellationToken))
{
if(_currentContext?.User != null && _currentContext.User.Id == userId)
var id = new Guid(userId);
if(_currentContext?.User != null && _currentContext.User.Id == id)
{
return _currentContext.User;
}
return await _userRepository.GetByIdAsync(userId);
return await _userRepository.GetByIdAsync(id);
}
public async Task<User> FindByNameAsync(string normalizedUserName, CancellationToken cancellationToken = default(CancellationToken))
@@ -100,7 +102,7 @@ namespace Bit.Core.Identity
public Task<string> GetUserIdAsync(User user, CancellationToken cancellationToken = default(CancellationToken))
{
return Task.FromResult(user.Id);
return Task.FromResult(user.Id.ToString());
}
public Task<string> GetUserNameAsync(User user, CancellationToken cancellationToken = default(CancellationToken))