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

Moved identity implementations to scoped lifetime since they have dependencies on CurrentContext

Browse Source
This commit is contained in:
Kyle Spearrin
2017-01-25 22:31:14 -05:00
parent 5b7af84208
commit f2d58a3678
3 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,11 +30,13 @@ namespace Bit.Api.IdentityServer
public async Task GetProfileDataAsync(ProfileDataRequestContext context)
{
var claims = context.Subject.Claims.ToList();
var existingClaims = context.Subject.Claims;
var newClaims = new List<Claim>();
var user = await _userService.GetUserByPrincipalAsync(context.Subject);
if(user != null)
{
claims.AddRange(new List<Claim>
newClaims.AddRange(new List<Claim>
{
new Claim("plan", "0"), // free plan hard coded for now
new Claim("sstamp", user.SecurityStamp),
@ -47,13 +49,18 @@ namespace Bit.Api.IdentityServer
if(!string.IsNullOrWhiteSpace(user.Name))
{
claims.Add(new Claim("name", user.Name));
newClaims.Add(new Claim("name", user.Name));
}
}
if(claims.Count > 0)
// filter out any of the new claims
var existingClaimsToKeep = existingClaims
.Where(c => newClaims.Count == 0 || !newClaims.Any(nc => nc.Type == c.Type)).ToList();
newClaims.AddRange(existingClaimsToKeep);
if(newClaims.Any())
{
context.AddFilteredClaims(claims);
context.AddFilteredClaims(newClaims);
}
}