llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 12:30:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix LDAP page crash (#1630)

Browse Source
This commit is contained in:
Yaodong Yu
2023-03-08 21:31:55 +08:00
committed by GitHub
parent 7c4a6fea02
commit a5dfe54a33
7 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
controllers/account.go
View File

@ -246,19 +246,24 @@ func (c *ApiController) Signup() {
// @Success 200 {object} controllers.Response The Response object
// @router /logout [get,post]
func (c *ApiController) Logout() {
user := c.GetSessionUsername()
// https://openid.net/specs/openid-connect-rpinitiated-1_0-final.html
accessToken := c.Input().Get("id_token_hint")
redirectUri := c.Input().Get("post_logout_redirect_uri")
state := c.Input().Get("state")
if accessToken == "" && redirectUri == "" {
c.ClearUserSession()
// TODO https://github.com/casdoor/casdoor/pull/1494#discussion_r1095675265
owner, username := util.GetOwnerAndNameFromId(user)
user := c.GetSessionUsername()
if accessToken == "" && redirectUri == "" {
// TODO https://github.com/casdoor/casdoor/pull/1494#discussion_r1095675265
if user == "" {
c.ResponseOk()
return
}
c.ClearUserSession()
owner, username := util.GetOwnerAndNameFromId(user)
object.DeleteSessionId(util.GetSessionId(owner, username, object.CasdoorApplication), c.Ctx.Input.CruSession.SessionID())
util.LogInfo(c.Ctx, "API: [%s] logged out", user)
application := c.GetSessionApplication()

28
controllers/ldap.go
View File

@ -97,8 +97,7 @@ func (c *ApiController) GetLdapUser() {
})
}
c.Data["json"] = Response{Status: "ok", Data: resp}
c.ServeJSON()
c.ResponseOk(resp)
}
// GetLdaps
@ -108,8 +107,7 @@ func (c *ApiController) GetLdapUser() {
func (c *ApiController) GetLdaps() {
owner := c.Input().Get("owner")
c.Data["json"] = Response{Status: "ok", Data: object.GetLdaps(owner)}
c.ServeJSON()
c.ResponseOk(object.GetLdaps(owner))
}
// GetLdap
@ -124,8 +122,8 @@ func (c *ApiController) GetLdap() {
return
}
c.Data["json"] = Response{Status: "ok", Data: object.GetLdap(id)}
c.ServeJSON()
_, name := util.GetOwnerAndNameFromId(id)
c.ResponseOk(object.GetLdap(name))
}
// AddLdap
@ -159,8 +157,7 @@ func (c *ApiController) AddLdap() {
object.GetLdapAutoSynchronizer().StartAutoSync(ldap.Id)
}
c.Data["json"] = resp
c.ServeJSON()
c.ResponseOk(resp)
}
// UpdateLdap
@ -187,8 +184,7 @@ func (c *ApiController) UpdateLdap() {
object.GetLdapAutoSynchronizer().StopAutoSync(ldap.Id)
}
c.Data["json"] = resp
c.ServeJSON()
c.ResponseOk(resp)
}
// DeleteLdap
@ -204,8 +200,7 @@ func (c *ApiController) DeleteLdap() {
}
object.GetLdapAutoSynchronizer().StopAutoSync(ldap.Id)
c.Data["json"] = wrapActionResponse(object.DeleteLdap(&ldap))
c.ServeJSON()
c.ResponseOk(wrapActionResponse(object.DeleteLdap(&ldap)))
}
// SyncLdapUsers
@ -225,11 +220,11 @@ func (c *ApiController) SyncLdapUsers() {
object.UpdateLdapSyncTime(ldapId)
exist, failed := object.SyncLdapUsers(owner, users, ldapId)
c.Data["json"] = &Response{Status: "ok", Data: &LdapSyncResp{
c.ResponseOk(&LdapSyncResp{
Exist: *exist,
Failed: *failed,
}}
c.ServeJSON()
})
}
// CheckLdapUsersExist
@ -246,6 +241,5 @@ func (c *ApiController) CheckLdapUsersExist() {
}
exist := object.CheckLdapUuidExist(owner, uuids)
c.Data["json"] = &Response{Status: "ok", Data: exist}
c.ServeJSON()
c.ResponseOk(exist)
}