Skip to content

Commit f5bdc8d

Browse files
committed
fix: refresh token store info
1 parent 9eca697 commit f5bdc8d

File tree

6 files changed

+14
-8
lines changed

6 files changed

+14
-8
lines changed

server/handlers/authorize.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ func AuthorizeHandler() gin.HandlerFunc {
293293
if authToken.RefreshToken != nil {
294294
res["refresh_token"] = authToken.RefreshToken.Token
295295
params += "&refresh_token=" + authToken.RefreshToken.Token
296-
sessionstore.SetState(authToken.AccessToken.Token, authToken.FingerPrint+"@"+user.ID)
296+
sessionstore.SetState(authToken.RefreshToken.Token, authToken.FingerPrint+"@"+user.ID)
297297
}
298298

299299
if isQuery {

server/handlers/oauth_callback.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func OAuthCallbackHandler() gin.HandlerFunc {
159159

160160
if authToken.RefreshToken != nil {
161161
params = params + `&refresh_token=` + authToken.RefreshToken.Token
162-
sessionstore.SetState(authToken.AccessToken.Token, authToken.FingerPrint+"@"+user.ID)
162+
sessionstore.SetState(authToken.RefreshToken.Token, authToken.FingerPrint+"@"+user.ID)
163163
}
164164

165165
go utils.SaveSessionInDB(c, user.ID)

server/handlers/token.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,14 @@ func TokenHandler() gin.HandlerFunc {
141141
})
142142
}
143143
userID = claims["sub"].(string)
144-
roles = claims["roles"].([]string)
145-
scope = claims["scope"].([]string)
144+
rolesInterface := claims["roles"].([]interface{})
145+
scopeInterface := claims["scope"].([]interface{})
146+
for _, v := range rolesInterface {
147+
roles = append(roles, v.(string))
148+
}
149+
for _, v := range scopeInterface {
150+
scope = append(scope, v.(string))
151+
}
146152
// remove older refresh token and rotate it for security
147153
sessionstore.RemoveState(refreshToken)
148154
}
@@ -179,7 +185,7 @@ func TokenHandler() gin.HandlerFunc {
179185

180186
if authToken.RefreshToken != nil {
181187
res["refresh_token"] = authToken.RefreshToken.Token
182-
sessionstore.SetState(authToken.AccessToken.Token, authToken.FingerPrint+"@"+user.ID)
188+
sessionstore.SetState(authToken.RefreshToken.Token, authToken.FingerPrint+"@"+user.ID)
183189
}
184190

185191
gc.JSON(http.StatusOK, res)

server/handlers/verify_email.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func VerifyEmailHandler() gin.HandlerFunc {
9191

9292
if authToken.RefreshToken != nil {
9393
params = params + `&refresh_token=${refresh_token}`
94-
sessionstore.SetState(authToken.AccessToken.Token, authToken.FingerPrint+"@"+user.ID)
94+
sessionstore.SetState(authToken.RefreshToken.Token, authToken.FingerPrint+"@"+user.ID)
9595
}
9696

9797
if redirectURL == "" {

server/resolvers/login.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func LoginResolver(ctx context.Context, params model.LoginInput) (*model.AuthRes
8484

8585
if authToken.RefreshToken != nil {
8686
res.RefreshToken = &authToken.RefreshToken.Token
87-
sessionstore.SetState(authToken.AccessToken.Token, authToken.FingerPrint+"@"+user.ID)
87+
sessionstore.SetState(authToken.RefreshToken.Token, authToken.FingerPrint+"@"+user.ID)
8888
}
8989

9090
go utils.SaveSessionInDB(gc, user.ID)

server/resolvers/session.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func SessionResolver(ctx context.Context, params *model.SessionQueryInput) (*mod
8080

8181
if authToken.RefreshToken != nil {
8282
res.RefreshToken = &authToken.RefreshToken.Token
83-
sessionstore.SetState(authToken.AccessToken.Token, authToken.FingerPrint+"@"+user.ID)
83+
sessionstore.SetState(authToken.RefreshToken.Token, authToken.FingerPrint+"@"+user.ID)
8484
}
8585

8686
return res, nil

0 commit comments

Comments
 (0)