From 4a5366005a06264bb63dba3cad0a98b61a63dd3a Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 25 Jan 2017 00:38:09 -0500
Subject: [PATCH] use GetUserByPrincipalAsync

---
 src/Api/IdentityServer/ProfileService.cs | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/Api/IdentityServer/ProfileService.cs b/src/Api/IdentityServer/ProfileService.cs
index c22cee368c..f268a69f58 100644
--- a/src/Api/IdentityServer/ProfileService.cs
+++ b/src/Api/IdentityServer/ProfileService.cs
@@ -32,7 +32,7 @@ namespace Bit.Api.IdentityServer
         public async Task GetProfileDataAsync(ProfileDataRequestContext context)
         {
             var claims = context.Subject.Claims.ToList();
-            var user = await GetUserAsync(context.Subject);
+            var user = await _userService.GetUserByPrincipalAsync(context.Subject);
             if(user != null)
             {
                 claims.AddRange(new List<Claim>
@@ -62,7 +62,7 @@ namespace Bit.Api.IdentityServer
         {
             var securityTokenClaim = context.Subject?.Claims.FirstOrDefault(c =>
                 c.Type == _identityOptions.ClaimsIdentity.SecurityStampClaimType);
-            var user = await GetUserAsync(context.Subject);
+            var user = await _userService.GetUserByPrincipalAsync(context.Subject);
 
             if(user != null && securityTokenClaim != null)
             {
@@ -75,16 +75,5 @@ namespace Bit.Api.IdentityServer
                 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;
-        }
     }
 }