huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #976: Break claims value in array into multiple claims (#996) 

* Break claims value in array into multiple claims

* Review feedback 1
This commit is contained in:
Troy Dai 2016-09-29 16:21:26 -07:00 committed by GitHub
parent ac773beffc
commit e09dd6d0b8
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectHandler.cs
View File

@ -806,12 +806,7 @@ namespace Microsoft.AspNetCore.Authentication.OpenIdConnect
}
// adding remaining unique claims from userinfo endpoint to the identity
foreach (var pair in user)
{
JToken value;
var claimValue = user.TryGetValue(pair.Key, out value) ? value.ToString() : null;
identity.AddClaim(new Claim(pair.Key, claimValue, ClaimValueTypes.String, jwt.Issuer));
}
ClaimsHelper.AddClaimsToIdentity(user, identity, jwt.Issuer);
return AuthenticateResult.Success(ticket);
}

36
src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Utility/ClaimsHelper.cs Normal file
View File

@ -0,0 +1,36 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Security.Claims;
using Newtonsoft.Json.Linq;
namespace Microsoft.AspNetCore.Authentication.OpenIdConnect
{
internal static class ClaimsHelper
{
public static void AddClaimsToIdentity(
JObject userInformationPayload,
ClaimsIdentity identity,
string issuer)
{
foreach (var pair in userInformationPayload)
{
var array = pair.Value as JArray;
if (array != null)
{
foreach (var item in array)
{
AddClaimsToIdentity(item, identity, pair.Key, issuer);
}
}
else
{
AddClaimsToIdentity(pair.Value, identity, pair.Key, issuer);
}
}
}
private static void AddClaimsToIdentity(JToken item, ClaimsIdentity identity, string key, string issuer)
=> identity.AddClaim(new Claim(key, item?.ToString() ?? string.Empty, ClaimValueTypes.String, issuer));
}
}