Browse Source

Small bugfix in jint user.

pull/364/head
Sebastian Stehle 7 years ago
parent
commit
7c8ac0061b
  1. 4
      src/Squidex.Domain.Apps.Core.Operations/Scripting/JintUser.cs
  2. 3
      src/Squidex.Web/Pipeline/AppResolver.cs

4
src/Squidex.Domain.Apps.Core.Operations/Scripting/JintUser.cs

@ -48,9 +48,9 @@ namespace Squidex.Domain.Apps.Core.Scripting
private static ObjectWrapper CreateUser(Engine engine, string id, bool isClient, string email, string name, IEnumerable<Claim> allClaims) private static ObjectWrapper CreateUser(Engine engine, string id, bool isClient, string email, string name, IEnumerable<Claim> allClaims)
{ {
var claims = var claims =
allClaims.GroupBy(x => x.Type) allClaims.GroupBy(x => x.Type.Split(ClaimSeparators).Last())
.ToDictionary( .ToDictionary(
x => x.Key.Split(ClaimSeparators).Last(), x => x,
x => x.Select(y => y.Value).ToArray()); x => x.Select(y => y.Value).ToArray());
return new ObjectWrapper(engine, new { id, isClient, email, name, claims }); return new ObjectWrapper(engine, new { id, isClient, email, name, claims });

3
src/Squidex.Web/Pipeline/AppResolver.cs

@ -65,7 +65,10 @@ namespace Squidex.Web.Pipeline
{ {
var identity = user.Identities.First(); var identity = user.Identities.First();
if (!string.IsNullOrWhiteSpace(role))
{
identity.AddClaim(new Claim(ClaimTypes.Role, role)); identity.AddClaim(new Claim(ClaimTypes.Role, role));
}
foreach (var permission in permissions) foreach (var permission in permissions)
{ {

Loading…
Cancel
Save