mirror of
https://github.com/casdoor/casdoor.git
synced 2025-07-03 04:10:20 +08:00
feat: support get user by userId and owner (#1870)
* feat: support get user by userId and owner * Update user.go --------- Co-authored-by: hsluoyz <hsluoyz@qq.com>
This commit is contained in:
@ -80,7 +80,7 @@ func (c *ApiController) GetUsers() {
|
|||||||
// @Title GetUser
|
// @Title GetUser
|
||||||
// @Tag User API
|
// @Tag User API
|
||||||
// @Description get user
|
// @Description get user
|
||||||
// @Param id query string true "The id ( owner/name ) of the user"
|
// @Param id query string false "The id ( owner/name ) of the user"
|
||||||
// @Param owner query string false "The owner of the user"
|
// @Param owner query string false "The owner of the user"
|
||||||
// @Param email query string false "The email of the user"
|
// @Param email query string false "The email of the user"
|
||||||
// @Param phone query string false "The phone of the user"
|
// @Param phone query string false "The phone of the user"
|
||||||
@ -92,8 +92,14 @@ func (c *ApiController) GetUser() {
|
|||||||
email := c.Input().Get("email")
|
email := c.Input().Get("email")
|
||||||
phone := c.Input().Get("phone")
|
phone := c.Input().Get("phone")
|
||||||
userId := c.Input().Get("userId")
|
userId := c.Input().Get("userId")
|
||||||
|
|
||||||
owner := c.Input().Get("owner")
|
owner := c.Input().Get("owner")
|
||||||
|
|
||||||
|
var userFromUserId *object.User
|
||||||
|
if userId != "" && owner != "" {
|
||||||
|
userFromUserId = object.GetUserByUserId(owner, userId)
|
||||||
|
id = util.GetId(userFromUserId.Owner, userFromUserId.Name)
|
||||||
|
}
|
||||||
|
|
||||||
if owner == "" {
|
if owner == "" {
|
||||||
owner = util.GetOwnerFromId(id)
|
owner = util.GetOwnerFromId(id)
|
||||||
}
|
}
|
||||||
@ -115,7 +121,7 @@ func (c *ApiController) GetUser() {
|
|||||||
case phone != "":
|
case phone != "":
|
||||||
user = object.GetUserByPhone(owner, phone)
|
user = object.GetUserByPhone(owner, phone)
|
||||||
case userId != "":
|
case userId != "":
|
||||||
user = object.GetUserByUserId(owner, userId)
|
user = userFromUserId
|
||||||
default:
|
default:
|
||||||
user = object.GetUser(id)
|
user = object.GetUser(id)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user