4 files changed, 6 insertions, 5 deletions
diff --git a/services/auth/basic.go b/services/auth/basic.go
index 0a82fc5b72..839aaa7a4e 100644
--- a/services/auth/basic.go
+++ b/services/auth/basic.go
@@ -74,7 +74,7 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore
 	if uid != 0 {
 		log.Trace("Basic Authorization: Valid OAuthAccessToken for user[%d]", uid)
 
-		u, err := user_model.GetUserByID(uid)
+		u, err := user_model.GetUserByID(req.Context(), uid)
 		if err != nil {
 			log.Error("GetUserByID:  %v", err)
 			return nil
@@ -87,7 +87,7 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore
 	token, err := auth_model.GetAccessTokenBySHA(authToken)
 	if err == nil {
 		log.Trace("Basic Authorization: Valid AccessToken for user[%d]", uid)
-		u, err := user_model.GetUserByID(token.UID)
+		u, err := user_model.GetUserByID(req.Context(), token.UID)
 		if err != nil {
 			log.Error("GetUserByID:  %v", err)
 			return nil
diff --git a/services/auth/httpsign.go b/services/auth/httpsign.go
index dcdc2de83a..e73db4f248 100644
--- a/services/auth/httpsign.go
+++ b/services/auth/httpsign.go
@@ -72,7 +72,7 @@ func (h *HTTPSign) Verify(req *http.Request, w http.ResponseWriter, store DataSt
 		}
 	}
 
-	u, err := user_model.GetUserByID(publicKey.OwnerID)
+	u, err := user_model.GetUserByID(req.Context(), publicKey.OwnerID)
 	if err != nil {
 		log.Error("GetUserByID:  %v", err)
 		return nil
diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go
index da8c526382..7aea3eadf3 100644
--- a/services/auth/oauth2.go
+++ b/services/auth/oauth2.go
@@ -123,7 +123,7 @@ func (o *OAuth2) Verify(req *http.Request, w http.ResponseWriter, store DataStor
 	}
 	log.Trace("OAuth2 Authorization: Found token for user[%d]", id)
 
-	user, err := user_model.GetUserByID(id)
+	user, err := user_model.GetUserByID(req.Context(), id)
 	if err != nil {
 		if !user_model.IsErrUserNotExist(err) {
 			log.Error("GetUserByName: %v", err)
diff --git a/services/auth/session.go b/services/auth/session.go
index f35fad1a0c..ef2c35d58a 100644
--- a/services/auth/session.go
+++ b/services/auth/session.go
@@ -6,6 +6,7 @@ package auth
 import (
 	"net/http"
 
+	"code.gitea.io/gitea/models/db"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/log"
 )
@@ -55,7 +56,7 @@ func SessionUser(sess SessionStore) *user_model.User {
 	}
 
 	// Get user object
-	user, err := user_model.GetUserByID(id)
+	user, err := user_model.GetUserByID(db.DefaultContext, id)
 	if err != nil {
 		if !user_model.IsErrUserNotExist(err) {
 			log.Error("GetUserById: %v", err)