diff options
| author | Joe Chen <jc@unknwon.io> | 2022-06-11 09:42:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-11 09:42:17 +0800 |
| commit | f837ea6346ac720d586eda51ab89c5c71a1f3e65 (patch) | |
| tree | 678b0bdccee80e65c399e8696cd209c9e902618d /internal/context | |
| parent | 9776bdc9b8b441ebd73c100bfe2aa4e495c233ca (diff) | |
db: use `context` and go-mockgen for `UsersStore` (#7042)
Diffstat (limited to 'internal/context')
| -rw-r--r-- | internal/context/auth.go | 2 | ||||
| -rw-r--r-- | internal/context/go_get.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/internal/context/auth.go b/internal/context/auth.go index 25625c3d..cba68706 100644 --- a/internal/context/auth.go +++ b/internal/context/auth.go @@ -208,7 +208,7 @@ func authenticatedUser(ctx *macaron.Context, sess session.Store) (_ *db.User, is if len(auths) == 2 && auths[0] == "Basic" { uname, passwd, _ := tool.BasicAuthDecode(auths[1]) - u, err := db.Users.Authenticate(uname, passwd, -1) + u, err := db.Users.Authenticate(ctx.Req.Context(), uname, passwd, -1) if err != nil { if !auth.IsErrBadCredentials(err) { log.Error("Failed to authenticate user: %v", err) diff --git a/internal/context/go_get.go b/internal/context/go_get.go index 2851b5db..5a59e1b5 100644 --- a/internal/context/go_get.go +++ b/internal/context/go_get.go @@ -26,7 +26,7 @@ func ServeGoGet() macaron.Handler { repoName := c.Params(":reponame") branchName := "master" - owner, err := db.Users.GetByUsername(ownerName) + owner, err := db.Users.GetByUsername(c.Req.Context(), ownerName) if err == nil { repo, err := db.Repos.GetByName(owner.ID, repoName) if err == nil && repo.DefaultBranch != "" { |