From 7c48085ff492d620ddc7fc1f8713d64a8963c8c3 Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 14 Apr 2020 19:32:03 +0100 Subject: Remove check on username if AccessToken authentication (#11015) Signed-off-by: Andrew Thornton --- modules/auth/sso/basic.go | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'modules/auth/sso') diff --git a/modules/auth/sso/basic.go b/modules/auth/sso/basic.go index 7f1841df71..b5885d38db 100644 --- a/modules/auth/sso/basic.go +++ b/modules/auth/sso/basic.go @@ -85,22 +85,12 @@ func (b *Basic) VerifyAuthData(ctx *macaron.Context, sess session.Store) *models } token, err := models.GetAccessTokenBySHA(authToken) if err == nil { - if isUsernameToken { - u, err = models.GetUserByID(token.UID) - if err != nil { - log.Error("GetUserByID: %v", err) - return nil - } - } else { - u, err = models.GetUserByName(uname) - if err != nil { - log.Error("GetUserByID: %v", err) - return nil - } - if u.ID != token.UID { - return nil - } + u, err = models.GetUserByID(token.UID) + if err != nil { + log.Error("GetUserByID: %v", err) + return nil } + token.UpdatedUnix = timeutil.TimeStampNow() if err = models.UpdateAccessToken(token); err != nil { log.Error("UpdateAccessToken: %v", err) -- cgit v1.2.3