4 files changed, 7 insertions, 6 deletions
diff --git a/internal/context/auth.go b/internal/context/auth.go
index 73a362c6..b1125e3d 100644
--- a/internal/context/auth.go
+++ b/internal/context/auth.go
@@ -151,7 +151,8 @@ func authenticatedUserID(c *macaron.Context, sess session.Store) (_ int64, isTok
 		return 0, false
 	}
 	if id, ok := uid.(int64); ok {
-		if _, err := db.GetUserByID(id); err != nil {
+		_, err := db.Users.GetByID(c.Req.Context(), id)
+		if err != nil {
 			if !db.IsErrUserNotExist(err) {
 				log.Error("Failed to get user by ID: %v", err)
 			}
@@ -175,7 +176,7 @@ func authenticatedUser(ctx *macaron.Context, sess session.Store) (_ *db.User, is
 		if conf.Auth.EnableReverseProxyAuthentication {
 			webAuthUser := ctx.Req.Header.Get(conf.Auth.ReverseProxyAuthenticationHeader)
 			if len(webAuthUser) > 0 {
-				user, err := db.GetUserByName(webAuthUser)
+				user, err := db.Users.GetByUsername(ctx.Req.Context(), webAuthUser)
 				if err != nil {
 					if !db.IsErrUserNotExist(err) {
 						log.Error("Failed to get user by name: %v", err)
@@ -223,7 +224,7 @@ func authenticatedUser(ctx *macaron.Context, sess session.Store) (_ *db.User, is
 		return nil, false, false
 	}
 
-	u, err := db.GetUserByID(uid)
+	u, err := db.Users.GetByID(ctx.Req.Context(), uid)
 	if err != nil {
 		log.Error("GetUserByID: %v", err)
 		return nil, false, false
diff --git a/internal/context/org.go b/internal/context/org.go
index 3a20e8f6..389677af 100644
--- a/internal/context/org.go
+++ b/internal/context/org.go
@@ -47,7 +47,7 @@ func HandleOrgAssignment(c *Context, args ...bool) {
 	orgName := c.Params(":org")
 
 	var err error
-	c.Org.Organization, err = db.GetUserByName(orgName)
+	c.Org.Organization, err = db.Users.GetByUsername(c.Req.Context(), orgName)
 	if err != nil {
 		c.NotFoundOrError(err, "get organization by name")
 		return
diff --git a/internal/context/repo.go b/internal/context/repo.go
index f5d4d5c5..e08913b6 100644
--- a/internal/context/repo.go
+++ b/internal/context/repo.go
@@ -145,7 +145,7 @@ func RepoAssignment(pages ...bool) macaron.Handler {
 		if c.IsLogged && c.User.LowerName == strings.ToLower(ownerName) {
 			owner = c.User
 		} else {
-			owner, err = db.GetUserByName(ownerName)
+			owner, err = db.Users.GetByUsername(c.Req.Context(), ownerName)
 			if err != nil {
 				c.NotFoundOrError(err, "get user by name")
 				return
diff --git a/internal/context/user.go b/internal/context/user.go
index 0d6ad67d..2b2773f5 100644
--- a/internal/context/user.go
+++ b/internal/context/user.go
@@ -19,7 +19,7 @@ type ParamsUser struct {
 // and injects it as *ParamsUser.
 func InjectParamsUser() macaron.Handler {
 	return func(c *Context) {
-		user, err := db.GetUserByName(c.Params(":username"))
+		user, err := db.Users.GetByUsername(c.Req.Context(), c.Params(":username"))
 		if err != nil {
 			c.NotFoundOrError(err, "get user by name")
 			return