marking
/
WGShare.API
19
0
Fork 0
Code Pull Requests Actions Releases 3 Activity

修复 token 中的role 改为roleId

This commit is contained in:
youngq 2024-08-09 16:51:35 +08:00
parent d3aff3ae77
commit 46eafbea8a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WGShare.API/Controllers/AuthController.cs
View File

@ -78,7 +78,7 @@ namespace WGShare.API.Controllers
var btnAutn = new List<Claim>(); var btnAutn = new List<Claim>();
btnAutn.Add(new Claim("perm", user.PermValue.ToString())); 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("tenant", user.TenantId));
btnAutn.Add(new Claim("account", user.Account)); btnAutn.Add(new Claim("account", user.Account));
btnAutn.Add(new Claim("uname", user.UserName)); btnAutn.Add(new Claim("uname", user.UserName));
@ -118,7 +118,7 @@ namespace WGShare.API.Controllers
var btnAutn = new List<Claim>(); var btnAutn = new List<Claim>();
btnAutn.Add(new Claim("perm", user.PermValue.ToString())); 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("tenant", user.TenantId));
btnAutn.Add(new Claim("account", user.Account)); btnAutn.Add(new Claim("account", user.Account));
btnAutn.Add(new Claim("uname", user.UserName)); btnAutn.Add(new Claim("uname", user.UserName));
@ -175,7 +175,7 @@ namespace WGShare.API.Controllers
var btnAutn = new List<Claim>(); var btnAutn = new List<Claim>();
btnAutn.Add(new Claim("perm", perms.Sum(x => x.PermValue).ToString())); 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("tenant", room.TenantId));
btnAutn.Add(new Claim("mac", loginDTO.Mac)); btnAutn.Add(new Claim("mac", loginDTO.Mac));
btnAutn.Add(new Claim("machine", loginDTO.MachineName)); btnAutn.Add(new Claim("machine", loginDTO.MachineName));

2
WGShare.API/Controllers/Basic/BasicController.cs
View File

@ -55,7 +55,7 @@ namespace WGShare.API.Controllers.Basic
{ {
get 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)) if (string.IsNullOrWhiteSpace(roleId))
{ {
throw Oops.Oh("用户信息有误，请重新登录"); throw Oops.Oh("用户信息有误，请重新登录");

4
WGShare.API/Hubs/SessionManageHub.cs
View File

@ -110,7 +110,7 @@ namespace WGShare.API.Hubs
var account = Context.User?.Claims.FirstOrDefault(x => x.Type == "account")?.Value; var account = Context.User?.Claims.FirstOrDefault(x => x.Type == "account")?.Value;
var ssid = Context.User?.Claims.FirstOrDefault(x => x.Type == "ssid")?.Value; var ssid = Context.User?.Claims.FirstOrDefault(x => x.Type == "ssid")?.Value;
var uname = Context.User?.Claims.FirstOrDefault(x => x.Type == "uname")?.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); 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 account = Context.User?.Claims.FirstOrDefault(x => x.Type == "account")?.Value;
var ssid = Context.User?.Claims.FirstOrDefault(x => x.Type == "ssid")?.Value; var ssid = Context.User?.Claims.FirstOrDefault(x => x.Type == "ssid")?.Value;
var uname = Context.User?.Claims.FirstOrDefault(x => x.Type == "uname")?.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); Console.WriteLine($" {DateTime.Now}离开频道 会议号：" + roomNum);