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

feat: fix bug that token endpoint doesn't return 400/401 when type is object.TokenError (#3808)

Browse Source
This commit is contained in:
DacongDA
2025-05-20 10:39:55 +08:00
committed by GitHub
parent 1173f75794
commit 9190db1099
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
controllers/token.go
View File

@ -224,10 +224,11 @@ func (c *ApiController) GetOAuthToken() {
if deviceCode != "" { if deviceCode != "" {
deviceAuthCache, ok := object.DeviceAuthMap.Load(deviceCode) deviceAuthCache, ok := object.DeviceAuthMap.Load(deviceCode)
if !ok { if !ok {
c.Data["json"] = object.TokenError{ c.Data["json"] = &object.TokenError{
Error: "expired_token", Error: "expired_token",
ErrorDescription: "token is expired", ErrorDescription: "token is expired",
} }
c.SetTokenErrorHttpStatus()
c.ServeJSON() c.ServeJSON()
c.SetTokenErrorHttpStatus() c.SetTokenErrorHttpStatus()
return return
@ -235,20 +236,22 @@ func (c *ApiController) GetOAuthToken() {
deviceAuthCacheCast := deviceAuthCache.(object.DeviceAuthCache) deviceAuthCacheCast := deviceAuthCache.(object.DeviceAuthCache)
if !deviceAuthCacheCast.UserSignIn { if !deviceAuthCacheCast.UserSignIn {
c.Data["json"] = object.TokenError{ c.Data["json"] = &object.TokenError{
Error: "authorization_pending", Error: "authorization_pending",
ErrorDescription: "authorization pending", ErrorDescription: "authorization pending",
} }
c.SetTokenErrorHttpStatus()
c.ServeJSON() c.ServeJSON()
c.SetTokenErrorHttpStatus() c.SetTokenErrorHttpStatus()
return return
} }
if deviceAuthCacheCast.RequestAt.Add(time.Second * 120).Before(time.Now()) { if deviceAuthCacheCast.RequestAt.Add(time.Second * 120).Before(time.Now()) {
c.Data["json"] = object.TokenError{ c.Data["json"] = &object.TokenError{
Error: "expired_token", Error: "expired_token",
ErrorDescription: "token is expired", ErrorDescription: "token is expired",
} }
c.SetTokenErrorHttpStatus()
c.ServeJSON() c.ServeJSON()
c.SetTokenErrorHttpStatus() c.SetTokenErrorHttpStatus()
return return