修复 token 中的role 改为roleId
This commit is contained in:
parent
d3aff3ae77
commit
46eafbea8a
|
|
@ -78,7 +78,7 @@ namespace WGShare.API.Controllers
|
|||
|
||||
var btnAutn = new List<Claim>();
|
||||
btnAutn.Add(new Claim("perm", user.PermValue.ToString()));
|
||||
btnAutn.Add(new Claim("role", user.RoleId));
|
||||
btnAutn.Add(new Claim("roleid", user.RoleId));
|
||||
btnAutn.Add(new Claim("tenant", user.TenantId));
|
||||
btnAutn.Add(new Claim("account", user.Account));
|
||||
btnAutn.Add(new Claim("uname", user.UserName));
|
||||
|
|
@ -118,7 +118,7 @@ namespace WGShare.API.Controllers
|
|||
|
||||
var btnAutn = new List<Claim>();
|
||||
btnAutn.Add(new Claim("perm", user.PermValue.ToString()));
|
||||
btnAutn.Add(new Claim("role", user.RoleId));
|
||||
btnAutn.Add(new Claim("roleid", user.RoleId));
|
||||
btnAutn.Add(new Claim("tenant", user.TenantId));
|
||||
btnAutn.Add(new Claim("account", user.Account));
|
||||
btnAutn.Add(new Claim("uname", user.UserName));
|
||||
|
|
@ -175,7 +175,7 @@ namespace WGShare.API.Controllers
|
|||
|
||||
var btnAutn = new List<Claim>();
|
||||
btnAutn.Add(new Claim("perm", perms.Sum(x => x.PermValue).ToString()));
|
||||
btnAutn.Add(new Claim("role", anonRoleId));
|
||||
btnAutn.Add(new Claim("roleid", anonRoleId));
|
||||
btnAutn.Add(new Claim("tenant", room.TenantId));
|
||||
btnAutn.Add(new Claim("mac", loginDTO.Mac));
|
||||
btnAutn.Add(new Claim("machine", loginDTO.MachineName));
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ namespace WGShare.API.Controllers.Basic
|
|||
{
|
||||
get
|
||||
{
|
||||
var roleId = HttpContext.User.Claims.FirstOrDefault(x => x.Type == "role").Value;
|
||||
var roleId = HttpContext.User.Claims.FirstOrDefault(x => x.Type == "roleid").Value;
|
||||
if (string.IsNullOrWhiteSpace(roleId))
|
||||
{
|
||||
throw Oops.Oh("用户信息有误,请重新登录");
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ namespace WGShare.API.Hubs
|
|||
var account = Context.User?.Claims.FirstOrDefault(x => x.Type == "account")?.Value;
|
||||
var ssid = Context.User?.Claims.FirstOrDefault(x => x.Type == "ssid")?.Value;
|
||||
var uname = Context.User?.Claims.FirstOrDefault(x => x.Type == "uname")?.Value;
|
||||
var roleId = Context.User?.Claims.FirstOrDefault(x => x.Type == "role")?.Value;
|
||||
var roleId = Context.User?.Claims.FirstOrDefault(x => x.Type == "roleid")?.Value;
|
||||
|
||||
|
||||
Console.WriteLine($"{DateTime.Now}加入频道 会议号:" + roomNum);
|
||||
|
|
@ -153,7 +153,7 @@ namespace WGShare.API.Hubs
|
|||
var account = Context.User?.Claims.FirstOrDefault(x => x.Type == "account")?.Value;
|
||||
var ssid = Context.User?.Claims.FirstOrDefault(x => x.Type == "ssid")?.Value;
|
||||
var uname = Context.User?.Claims.FirstOrDefault(x => x.Type == "uname")?.Value;
|
||||
var roleId = Context.User?.Claims.FirstOrDefault(x => x.Type == "role")?.Value;
|
||||
var roleId = Context.User?.Claims.FirstOrDefault(x => x.Type == "roleid")?.Value;
|
||||
|
||||
|
||||
Console.WriteLine($" {DateTime.Now}离开频道 会议号:" + roomNum);
|
||||
|
|
|
|||
Loading…
Reference in New Issue