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

Improve code format.

Browse Source
This commit is contained in:
Gucheng Wang
2022-01-28 17:45:41 +08:00
parent d129202b95
commit 479daf4fa4
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
object/token.go
View File

@ -106,8 +106,8 @@ func getToken(owner string, name string) *Token {
} }
func getTokenByCode(code string) *Token { func getTokenByCode(code string) *Token {
token := Token{} token := Token{Code: code}
existed, err := adapter.Engine.Where("code=?", code).Get(&token) existed, err := adapter.Engine.Get(&token)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -158,8 +158,8 @@ func DeleteToken(token *Token) bool {
func GetTokenByAccessToken(accessToken string) *Token { func GetTokenByAccessToken(accessToken string) *Token {
//Check if the accessToken is in the database //Check if the accessToken is in the database
token := Token{} token := Token{AccessToken: accessToken}
existed, err := adapter.Engine.Where("access_token=?", accessToken).Get(&token) existed, err := adapter.Engine.Get(&token)
if err != nil || !existed { if err != nil || !existed {
return nil return nil
} }

12
routers/auto_signin_filter.go
View File

@ -27,8 +27,8 @@ func AutoSigninFilter(ctx *context.Context) {
// return // return
//} //}
// "/page?access_token=123" or HTTP Bearer token // GET parameter like "/page?access_token=123" or
// Authorization: Bearer bearerToken // HTTP Bearer token like "Authorization: Bearer 123"
accessToken := ctx.Input.Query("accessToken") accessToken := ctx.Input.Query("accessToken")
if accessToken == "" { if accessToken == "" {
accessToken = parseBearerToken(ctx) accessToken = parseBearerToken(ctx)
@ -36,13 +36,15 @@ func AutoSigninFilter(ctx *context.Context) {
if accessToken != "" { if accessToken != "" {
token := object.GetTokenByAccessToken(accessToken) token := object.GetTokenByAccessToken(accessToken)
if token == nil { if token == nil {
responseError(ctx, "non-existent accessToken") responseError(ctx, "Access token doesn't exist")
return return
} }
if !util.CheckTokenExpireTime(token.CreatedTime, token.ExpiresIn) {
responseError(ctx, "expired accessToken") if !util.IsTokenExpired(token.CreatedTime, token.ExpiresIn) {
responseError(ctx, "Access token has expired")
return return
} }
userId := fmt.Sprintf("%s/%s", token.Organization, token.User) userId := fmt.Sprintf("%s/%s", token.Organization, token.User)
application, _ := object.GetApplicationByUserId(fmt.Sprintf("app/%s", token.Application)) application, _ := object.GetApplicationByUserId(fmt.Sprintf("app/%s", token.Application))
setSessionUser(ctx, userId) setSessionUser(ctx, userId)

9
util/time.go
View File

@ -29,9 +29,8 @@ func GetCurrentUnixTime() string {
return strconv.FormatInt(time.Now().UnixNano(), 10) return strconv.FormatInt(time.Now().UnixNano(), 10)
} }
func CheckTokenExpireTime(createdTime string, expireIn int) bool { func IsTokenExpired(createdTime string, expiresIn int) bool {
create, _ := time.Parse(time.RFC3339, createdTime) createdTimeObj, _ := time.Parse(time.RFC3339, createdTime)
expireAt := create.Add(time.Duration(expireIn) * time.Minute) expiresAtObj := createdTimeObj.Add(time.Duration(expiresIn) * time.Minute)
return time.Now().Before(expiresAtObj)
return time.Now().Before(expireAt)
} }