From 7bd1b351390d14c79e5c39a16e720eebe995d307 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 16 Oct 2023 20:33:44 +0200 Subject: [PATCH] [F3] resolve (cherry picked from commit 2acd211536a7b49dc3198d5cf80dcd3c8ff6a837) (cherry picked from commit 704317c24e3969e1240eaeac7fd02aac0225d769) (cherry picked from commit b127296da6742cf1b0380f0779f5dd59d5be34fa) (cherry picked from commit 000b6f823e242f965628f205bcbdeb924b983e56) --- go.mod | 2 +- go.sum | 4 ++-- routers/web/auth/oauth.go | 2 +- services/f3/driver/milestone.go | 2 +- services/f3/driver/project.go | 4 ++-- services/f3/promote.go | 2 +- tests/integration/integration_test.go | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 1fca2eb671..5b2d19dfd1 100644 --- a/go.mod +++ b/go.mod @@ -118,7 +118,7 @@ require ( gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/ini.v1 v1.67.0 gopkg.in/yaml.v3 v3.0.1 - lab.forgefriends.org/friendlyforgeformat/gof3 v1.0.1-0.20230917111322-4e5634530d7b + lab.forgefriends.org/friendlyforgeformat/gof3 v1.0.1-0.20231016193607-59f139e6759e mvdan.cc/xurls/v2 v2.5.0 strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 xorm.io/builder v0.3.13 diff --git a/go.sum b/go.sum index 5d07e4898a..7deaf0ccaa 100644 --- a/go.sum +++ b/go.sum @@ -1597,8 +1597,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -lab.forgefriends.org/friendlyforgeformat/gof3 v1.0.1-0.20230917111322-4e5634530d7b h1:ws6llA9HwUA2ofK//7Y/HkV2oaP60M120FFBsHI0G78= -lab.forgefriends.org/friendlyforgeformat/gof3 v1.0.1-0.20230917111322-4e5634530d7b/go.mod h1:TcKaEsgVihjAjw290iDvvirCT0P+DZNpzc0ZgNgy3E4= +lab.forgefriends.org/friendlyforgeformat/gof3 v1.0.1-0.20231016193607-59f139e6759e h1:xLOCDcDRZ7VwOqdC0NxA+OdUq2X2piHahNylwkF2uN8= +lab.forgefriends.org/friendlyforgeformat/gof3 v1.0.1-0.20231016193607-59f139e6759e/go.mod h1:gbekmufZ+PvotlQUCw9OpcMYo4igaWDjyT70FyNGFwc= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI= lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go index 3049a3541a..89436e9e86 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go @@ -1292,7 +1292,7 @@ func oAuth2GothUserToUser(ctx go_context.Context, authSource *auth.Source, gothU ExternalID: gothUser.UserID, LoginSourceID: authSource.ID, } - hasUser, err = user_model.GetExternalLogin(request.Context(), externalLoginUser) + hasUser, err = user_model.GetExternalLogin(ctx, externalLoginUser) if err != nil { return nil, err } diff --git a/services/f3/driver/milestone.go b/services/f3/driver/milestone.go index f5aea0fae3..4d50179dd8 100644 --- a/services/f3/driver/milestone.go +++ b/services/f3/driver/milestone.go @@ -133,7 +133,7 @@ func (o *MilestoneProvider) FromFormat(ctx context.Context, m *format.Milestone) } func (o *MilestoneProvider) GetObjects(ctx context.Context, user *User, project *Project, page int) []*Milestone { - milestones, _, err := issues_model.GetMilestones(issues_model.GetMilestonesOption{ + milestones, _, err := issues_model.GetMilestones(ctx, issues_model.GetMilestonesOption{ ListOptions: db.ListOptions{Page: page, PageSize: o.g.perPage}, RepoID: project.GetID(), State: api.StateAll, diff --git a/services/f3/driver/project.go b/services/f3/driver/project.go index 5fb163da48..2b878f2ad7 100644 --- a/services/f3/driver/project.go +++ b/services/f3/driver/project.go @@ -100,7 +100,7 @@ func (o *ProjectProvider) FromFormat(ctx context.Context, p *format.Project) *Pr } func (o *ProjectProvider) GetObjects(ctx context.Context, user *User, page int) []*Project { - repoList, _, err := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{ + repoList, _, err := repo_model.GetUserRepositories(ctx, &repo_model.SearchRepoOptions{ ListOptions: db.ListOptions{Page: page, PageSize: o.g.perPage}, Actor: &user.User, Private: true, @@ -123,7 +123,7 @@ func (o *ProjectProvider) Get(ctx context.Context, user *User, exemplar *Project if exemplar.GetID() > 0 { project, err = repo_model.GetRepositoryByID(ctx, exemplar.GetID()) } else if exemplar.Name != "" { - project, err = repo_model.GetRepositoryByName(user.GetID(), exemplar.Name) + project, err = repo_model.GetRepositoryByName(ctx, user.GetID(), exemplar.Name) } else { panic("GetID() == 0 and ProjectName == \"\"") } diff --git a/services/f3/promote.go b/services/f3/promote.go index 5a56e83773..0c4b357d2f 100644 --- a/services/f3/promote.go +++ b/services/f3/promote.go @@ -92,7 +92,7 @@ func getF3UserToPromote(ctx context.Context, source *auth_model.Source, loginNam return nil, nil } - userSource, err := auth_model.GetSourceByID(u.LoginSource) + userSource, err := auth_model.GetSourceByID(ctx, u.LoginSource) if err != nil { if auth_model.IsErrSourceNotExist(err) { log.Error("getF3UserToPromote: source id = %v for user %v not found %v", u.LoginSource, u.ID, err) diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index ca67525d73..ad48790afc 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -277,7 +277,7 @@ func authSourcePayloadGitLabCustom(name string) map[string]string { } func createF3AuthSource(t *testing.T, name, url, matchingSource string) *auth.Source { - assert.NoError(t, auth.CreateSource(&auth.Source{ + assert.NoError(t, auth.CreateSource(context.Background(), &auth.Source{ Type: auth.F3, Name: name, IsActive: true,