fix:IdentityClaim (#718)

masastack · May 8, 2024 · 31f9fe4 · 31f9fe4
1 parent 007387c
commit 31f9fe4
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/...b/Authentication/Identity/Masa.Contrib.Authentication.Identity.Core/DefaultUserContext.cs b/...b/Authentication/Identity/Masa.Contrib.Authentication.Identity.Core/DefaultUserContext.cs
@@ -31,8 +31,8 @@ public DefaultUserContext(
         var modelRelation = ModelRelationCache.GetOrAdd(userType, (type) =>
         {
             var constructor = type.GetConstructors(BindingFlags.Instance | BindingFlags.Public)
-                    .FirstOrDefault(c => c.GetParameters().Length == 0) ??
-                throw new InvalidOperationException($"[{type.Name}] has a parameterless constructor");
+                                  .FirstOrDefault(c => c.GetParameters().Length == 0) ??
+                              throw new InvalidOperationException($"[{type.Name}] has a parameterless constructor");
             return new CustomizeModelRelation(
                 InstanceBuilder.CreateInstanceDelegate(constructor),
                 InstanceBuilder.GetPropertyAndMethodInfoRelations(type));
@@ -44,7 +44,19 @@ public DefaultUserContext(
             if (claimType == null)
                 continue;
 
-            var claimValue = ClaimsPrincipal?.FindClaimValue(claimType);
+            string? claimValue = null;
+            if (property.PropertyType != typeof(string) && typeof(System.Collections.IEnumerable).IsAssignableFrom(property.PropertyType))
+            {
+                var claimsValues = ClaimsPrincipal?.Claims.Where(claim => claim.Type == claimType)
+                    .Select(claim => claim.Value);
+                if (claimsValues?.Any() == true)
+                    claimValue = JsonSerializer.Serialize(claimsValues);
+            }
+            else
+            {
+                claimValue = ClaimsPrincipal?.FindClaimValue(claimType);
+            }
+
             if (claimValue != null)
             {
                 modelRelation.Setters[property]