mirror of
https://github.com/casdoor/casdoor.git
synced 2025-07-02 19:40:19 +08:00
feat: fix user cannot logout issue about bug in GetSessionToken()
This commit is contained in:
@ -435,16 +435,16 @@ func (c *ApiController) GetAccount() {
|
||||
return
|
||||
}
|
||||
|
||||
token := c.GetSessionToken()
|
||||
if token == nil {
|
||||
token, err = object.GetTokenForExtension(user, c.Ctx.Request.Host)
|
||||
accessToken := c.GetSessionToken()
|
||||
if accessToken == "" {
|
||||
accessToken, err = object.GetAccessTokenByUser(user, c.Ctx.Request.Host)
|
||||
if err != nil {
|
||||
c.ResponseError(err.Error())
|
||||
return
|
||||
}
|
||||
c.SetSessionToken(token)
|
||||
c.SetSessionToken(accessToken)
|
||||
}
|
||||
u.AccessToken = token.AccessToken
|
||||
u.AccessToken = accessToken
|
||||
|
||||
resp := Response{
|
||||
Status: "ok",
|
||||
|
@ -122,15 +122,13 @@ func (c *ApiController) GetSessionUsername() string {
|
||||
return user.(string)
|
||||
}
|
||||
|
||||
func (c *ApiController) GetSessionToken() *object.Token {
|
||||
tokenValue := c.GetSession("token")
|
||||
var token *object.Token
|
||||
var ok bool
|
||||
if token, ok = tokenValue.(*object.Token); !ok {
|
||||
token = nil
|
||||
func (c *ApiController) GetSessionToken() string {
|
||||
accessToken := c.GetSession("accessToken")
|
||||
if accessToken == nil {
|
||||
return ""
|
||||
}
|
||||
|
||||
return token
|
||||
return accessToken.(string)
|
||||
}
|
||||
|
||||
func (c *ApiController) GetSessionApplication() *object.Application {
|
||||
@ -153,7 +151,7 @@ func (c *ApiController) ClearUserSession() {
|
||||
}
|
||||
|
||||
func (c *ApiController) ClearTokenSession() {
|
||||
c.SetSessionToken(nil)
|
||||
c.SetSessionToken("")
|
||||
}
|
||||
|
||||
func (c *ApiController) GetSessionOidc() (string, string) {
|
||||
@ -182,8 +180,8 @@ func (c *ApiController) SetSessionUsername(user string) {
|
||||
c.SetSession("username", user)
|
||||
}
|
||||
|
||||
func (c *ApiController) SetSessionToken(token *object.Token) {
|
||||
c.SetSession("token", token)
|
||||
func (c *ApiController) SetSessionToken(accessToken string) {
|
||||
c.SetSession("accessToken", accessToken)
|
||||
}
|
||||
|
||||
// GetSessionData ...
|
||||
|
Reference in New Issue
Block a user