diff options
Diffstat (limited to 'internal/context/auth.go')
| -rw-r--r-- | internal/context/auth.go | 7 |
1 files changed, 4 insertions, 3 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 |