Add UniqueName claim to the iidentity.

abpframework · Dec 23, 2021 · 1f3c7bf · 1f3c7bf
1 parent 6006f19
commit 1f3c7bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/...tityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsService.cs b/...tityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsService.cs
@@ -5,6 +5,7 @@
 using IdentityServer4.Services;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Microsoft.IdentityModel.JsonWebTokens;
 using Volo.Abp.Security.Claims;
 
 namespace Volo.Abp.IdentityServer
@@ -20,6 +21,7 @@ public class AbpClaimsService : DefaultClaimsService
             AbpClaimTypes.ImpersonatorUserId,
             AbpClaimTypes.Name,
             AbpClaimTypes.SurName,
+            JwtRegisteredClaimNames.UniqueName,
             JwtClaimTypes.PreferredUserName,
             JwtClaimTypes.GivenName,
             JwtClaimTypes.FamilyName,

diff --git a/....Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpUserClaimsFactory.cs b/....Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpUserClaimsFactory.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using IdentityModel;
 using Microsoft.AspNetCore.Identity;
+using Microsoft.IdentityModel.JsonWebTokens;
 using Volo.Abp.DependencyInjection;
 using IdentityUser = Volo.Abp.Identity.IdentityUser;
 
@@ -41,6 +42,10 @@ public async Task<ClaimsPrincipal> CreateAsync(TUser user)
             {
                 identity.RemoveClaim(usernameClaim);
                 identity.AddIfNotContains(new Claim(JwtClaimTypes.PreferredUserName, username));
+
+                //https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/issues/1627
+                //https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/blob/05e02b5e0383be40e45c667c12f6667d38e33fcc/src/System.IdentityModel.Tokens.Jwt/ClaimTypeMapping.cs#L52
+                identity.AddIfNotContains(new Claim(JwtRegisteredClaimNames.UniqueName, username));
             }
 
             if (!identity.HasClaim(x => x.Type == JwtClaimTypes.Name))