llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 18:54:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix user cannot logout issue about bug in GetSessionToken()

Browse Source
This commit is contained in:
Yang Luo 2024-03-18 02:11:39 +08:00
parent bdf9864f69
commit ae1634a4d5
4 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
controllers/account.go
View File

@ -435,16 +435,16 @@ func (c *ApiController) GetAccount() {
return return
} }
token := c.GetSessionToken() accessToken := c.GetSessionToken()
if token == nil { if accessToken == "" {
token, err = object.GetTokenForExtension(user, c.Ctx.Request.Host) accessToken, err = object.GetAccessTokenByUser(user, c.Ctx.Request.Host)
if err != nil { if err != nil {
c.ResponseError(err.Error()) c.ResponseError(err.Error())
return return
} }
c.SetSessionToken(token) c.SetSessionToken(accessToken)
} }
u.AccessToken = token.AccessToken u.AccessToken = accessToken
resp := Response{ resp := Response{
Status: "ok", Status: "ok",

18
controllers/base.go
View File

@ -122,15 +122,13 @@ func (c *ApiController) GetSessionUsername() string {
return user.(string) return user.(string)
} }
func (c *ApiController) GetSessionToken() *object.Token { func (c *ApiController) GetSessionToken() string {
tokenValue := c.GetSession("token") accessToken := c.GetSession("accessToken")
var token *object.Token if accessToken == nil {
var ok bool return ""
if token, ok = tokenValue.(*object.Token); !ok {
token = nil
} }
return token return accessToken.(string)
} }
func (c *ApiController) GetSessionApplication() *object.Application { func (c *ApiController) GetSessionApplication() *object.Application {
@ -153,7 +151,7 @@ func (c *ApiController) ClearUserSession() {
} }
func (c *ApiController) ClearTokenSession() { func (c *ApiController) ClearTokenSession() {
c.SetSessionToken(nil) c.SetSessionToken("")
} }
func (c *ApiController) GetSessionOidc() (string, string) { func (c *ApiController) GetSessionOidc() (string, string) {
@ -182,8 +180,8 @@ func (c *ApiController) SetSessionUsername(user string) {
c.SetSession("username", user) c.SetSession("username", user)
} }
func (c *ApiController) SetSessionToken(token *object.Token) { func (c *ApiController) SetSessionToken(accessToken string) {
c.SetSession("token", token) c.SetSession("accessToken", accessToken)
} }
// GetSessionData ... // GetSessionData ...

5
object/init.go
View File

@ -45,7 +45,6 @@ func InitDb() {
} }
initWebAuthn() initWebAuthn()
initToken()
} }
func getBuiltInAccountItems() []*AccountItem { func getBuiltInAccountItems() []*AccountItem {
@ -310,10 +309,6 @@ func initWebAuthn() {
gob.Register(webauthn.SessionData{}) gob.Register(webauthn.SessionData{})
} }
func initToken() {
gob.Register(&Token{})
}
func initBuiltInUserModel() { func initBuiltInUserModel() {
model, err := GetModel("built-in/user-model-built-in") model, err := GetModel("built-in/user-model-built-in")
if err != nil { if err != nil {

11
object/token_oauth.go
View File

@ -727,18 +727,19 @@ func GetWechatMiniProgramToken(application *Application, code string, host strin
return token, nil, nil return token, nil, nil
} }
func GetTokenForExtension(user *User, host string) (*Token, error) { func GetAccessTokenByUser(user *User, host string) (string, error) {
application, err := GetApplicationByUser(user) application, err := GetApplicationByUser(user)
if err != nil { if err != nil {
return nil, err return "", err
} }
if application == nil { if application == nil {
return nil, fmt.Errorf("the application for user %s is not found", user.Id) return "", fmt.Errorf("the application for user %s is not found", user.Id)
} }
token, err := GetTokenByUser(application, user, "profile", "", host) token, err := GetTokenByUser(application, user, "profile", "", host)
if err != nil { if err != nil {
return nil, err return "", err
} }
return token, nil
return token.AccessToken, nil
} }