Skip to content

Commit 1776d38

Browse files
committed
Fixed usage of wrong user.
1 parent c9bca8c commit 1776d38

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

routers/web/user/oauth.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func newAccessTokenResponse(grant *models.OAuth2Grant, signingKey oauth2.JWTSign
187187
ErrorDescription: "cannot find application",
188188
}
189189
}
190-
err = app.LoadUser()
190+
user, err := models.GetUserByID(grant.UserID)
191191
if err != nil {
192192
if models.IsErrUserNotExist(err) {
193193
return nil, &AccessTokenError{
@@ -212,17 +212,17 @@ func newAccessTokenResponse(grant *models.OAuth2Grant, signingKey oauth2.JWTSign
212212
Nonce: grant.Nonce,
213213
}
214214
if grant.ScopeContains("profile") {
215-
idToken.Name = app.User.FullName
216-
idToken.PreferredUsername = app.User.Name
217-
idToken.Profile = app.User.HTMLURL()
218-
idToken.Picture = app.User.AvatarLink()
219-
idToken.Website = app.User.Website
220-
idToken.Locale = app.User.Language
221-
idToken.UpdatedAt = app.User.UpdatedUnix
215+
idToken.Name = user.FullName
216+
idToken.PreferredUsername = user.Name
217+
idToken.Profile = user.HTMLURL()
218+
idToken.Picture = user.AvatarLink()
219+
idToken.Website = user.Website
220+
idToken.Locale = user.Language
221+
idToken.UpdatedAt = user.UpdatedUnix
222222
}
223223
if grant.ScopeContains("email") {
224-
idToken.Email = app.User.Email
225-
idToken.EmailVerified = app.User.IsActive
224+
idToken.Email = user.Email
225+
idToken.EmailVerified = user.IsActive
226226
}
227227

228228
signedIDToken, err = idToken.SignToken(signingKey)

0 commit comments

Comments
 (0)