From f34c33b0d8ca8a93ec1dceeb615d064849728e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= Date: Mon, 20 Feb 2023 11:36:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95rol?= =?UTF-8?q?e=E9=89=B4=E6=9D=83=E4=BB=A4=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Yi.RBAC.Domain/Identity/AccountManager.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Identity/AccountManager.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Identity/AccountManager.cs index 312fa26d..95c28141 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Identity/AccountManager.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Identity/AccountManager.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Security.Claims; using System.Text; using System.Threading.Tasks; +using Yi.Framework.Core.Const; using Yi.Framework.Core.CurrentUsers; using Yi.Framework.Core.Exceptions; using Yi.Framework.Ddd.Repositories; @@ -82,23 +83,25 @@ namespace Yi.RBAC.Domain.Identity public Dictionary UserInfoToClaim(UserRoleMenuDto dto) { var claims = new Dictionary(); - claims.Add(nameof(ICurrentUser.Id), dto.User.Id); - claims.Add(nameof(ICurrentUser.UserName), dto.User.UserName); + claims.Add(TokenTypeConst.Id, dto.User.Id); + claims.Add(TokenTypeConst.UserName, dto.User.UserName); if (dto.User.Email is not null) { - claims.Add(nameof(ICurrentUser.Email), dto.User.Email); + claims.Add(TokenTypeConst.Email, dto.User.Email); } if (dto.User.Phone is not null) { - claims.Add(nameof(ICurrentUser.PhoneNumber), dto.User.Phone); + claims.Add(TokenTypeConst.PhoneNumber, dto.User.Phone); } if (UserConst.Admin.Equals(dto.User.UserName)) { - claims.Add(nameof(ICurrentUser.Permission), UserConst.AdminPermissionCode); + claims.Add(TokenTypeConst.Permission, UserConst.AdminPermissionCode); + claims.Add(TokenTypeConst.Roles, UserConst.AdminRolesCode); } else { - claims.Add(nameof(ICurrentUser.Permission), dto.PermissionCodes.Where(x => !string.IsNullOrEmpty(x))); + claims.Add(TokenTypeConst.Permission, dto.PermissionCodes.Where(x => !string.IsNullOrEmpty(x))); + claims.Add(TokenTypeConst.Roles, dto.RoleCodes.Where(x => !string.IsNullOrEmpty(x))); } return claims;