nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-09 07:08:15 -05:00
Code

use GetUserByPrincipalAsync

Browse Source
This commit is contained in:
Kyle Spearrin 2017-01-25 00:38:09 -05:00
parent ac18893d67
commit 4a5366005a
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Api/IdentityServer/ProfileService.cs
View File

@ -32,7 +32,7 @@ namespace Bit.Api.IdentityServer
public async Task GetProfileDataAsync(ProfileDataRequestContext context) public async Task GetProfileDataAsync(ProfileDataRequestContext context)
{ {
var claims = context.Subject.Claims.ToList(); var claims = context.Subject.Claims.ToList();
var user = await GetUserAsync(context.Subject); var user = await _userService.GetUserByPrincipalAsync(context.Subject);
if(user != null) if(user != null)
{ {
claims.AddRange(new List<Claim> claims.AddRange(new List<Claim>
@ -62,7 +62,7 @@ namespace Bit.Api.IdentityServer
{ {
var securityTokenClaim = context.Subject?.Claims.FirstOrDefault(c => var securityTokenClaim = context.Subject?.Claims.FirstOrDefault(c =>
c.Type == _identityOptions.ClaimsIdentity.SecurityStampClaimType); c.Type == _identityOptions.ClaimsIdentity.SecurityStampClaimType);
var user = await GetUserAsync(context.Subject); var user = await _userService.GetUserByPrincipalAsync(context.Subject);
if(user != null && securityTokenClaim != null) if(user != null && securityTokenClaim != null)
{ {
@ -75,16 +75,5 @@ namespace Bit.Api.IdentityServer
context.IsActive = true; context.IsActive = true;
} }
} }
private async Task<User> GetUserAsync(ClaimsPrincipal principal)
{
var userId = _userService.GetProperUserId(principal);
if(userId.HasValue)
{
return await _userService.GetUserByIdAsync(userId.Value);
}
return null;
}
} }
} }