From 4f99b1ca3f4cc115bbe217a285822324db67061f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 28 Sep 2020 11:10:21 +0300 Subject: [PATCH] Add Name, SurName and other standard claims to the Blazor UI principal accessor. --- .../WebAssemblyCurrentPrincipalAccessor.cs | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyCurrentPrincipalAccessor.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyCurrentPrincipalAccessor.cs index 3c252ebe5e..da1d3b3533 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyCurrentPrincipalAccessor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyCurrentPrincipalAccessor.cs @@ -23,6 +23,11 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly var claims = new List(); + if (configuration.CurrentUser.Id != null) + { + claims.Add(new Claim(AbpClaimTypes.UserId,configuration.CurrentUser.Id.ToString())); + } + if (!configuration.CurrentUser.UserName.IsNullOrWhiteSpace()) { claims.Add(new Claim(AbpClaimTypes.UserName,configuration.CurrentUser.UserName)); @@ -33,9 +38,29 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly claims.Add(new Claim(AbpClaimTypes.Email,configuration.CurrentUser.Email)); } - if (configuration.CurrentUser.Id != null) + if (configuration.CurrentUser.EmailVerified) { - claims.Add(new Claim(AbpClaimTypes.UserId,configuration.CurrentUser.Id.ToString())); + claims.Add(new Claim(AbpClaimTypes.EmailVerified,"true")); + } + + if (!configuration.CurrentUser.Name.IsNullOrWhiteSpace()) + { + claims.Add(new Claim(AbpClaimTypes.Name,configuration.CurrentUser.Name)); + } + + if (!configuration.CurrentUser.PhoneNumber.IsNullOrEmpty()) + { + claims.Add(new Claim(AbpClaimTypes.PhoneNumber,configuration.CurrentUser.PhoneNumber)); + } + + if (configuration.CurrentUser.PhoneNumberVerified) + { + claims.Add(new Claim(AbpClaimTypes.PhoneNumberVerified,"true")); + } + + if (!configuration.CurrentUser.SurName.IsNullOrWhiteSpace()) + { + claims.Add(new Claim(AbpClaimTypes.SurName,configuration.CurrentUser.SurName)); } if (configuration.CurrentUser.TenantId != null)