llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-08-06 21:08:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic in func (c *ApiController) GetUser() if no user exists in DB

Browse Source
This commit is contained in:
Yang Luo
2023-07-14 20:57:59 +08:00
parent 854a74b73e
commit 19ab168b12
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/account.go
View File

@@ -368,9 +368,11 @@ func (c *ApiController) GetAccount() {
return return
} }
if user != nil {
user.Permissions = object.GetMaskedPermissions(user.Permissions) user.Permissions = object.GetMaskedPermissions(user.Permissions)
user.Roles = object.GetMaskedRoles(user.Roles) user.Roles = object.GetMaskedRoles(user.Roles)
user.MultiFactorAuths = object.GetAllMfaProps(user, true) user.MultiFactorAuths = object.GetAllMfaProps(user, true)
}
organization, err := object.GetMaskedOrganization(object.GetOrganizationByUser(user)) organization, err := object.GetMaskedOrganization(object.GetOrganizationByUser(user))
if err != nil { if err != nil {

3
controllers/user.go
View File

@@ -198,7 +198,10 @@ func (c *ApiController) GetUser() {
return return
} }
if user != nil {
user.MultiFactorAuths = object.GetAllMfaProps(user, true) user.MultiFactorAuths = object.GetAllMfaProps(user, true)
}
err = object.ExtendUserWithRolesAndPermissions(user) err = object.ExtendUserWithRolesAndPermissions(user)
if err != nil { if err != nil {
c.ResponseError(err.Error()) c.ResponseError(err.Error())