Using a new API to fetch both public and private repos of a user (#671)

Co-authored-by: rick <[email protected]>
kubesphere · Jun 14, 2022 · b3032ae · b3032ae
1 parent 5872afa
commit b3032ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/kapis/devops/v1alpha3/scm/scmhandler.go b/pkg/kapis/devops/v1alpha3/scm/scmhandler.go
@@ -101,7 +101,9 @@ func (h *handler) getRepositories(scm, server, org, secret, namespace string, pa
 		var listRepositoryFunc listRepository
 		if user, err = h.getCurrentUsername(c); err == nil {
 			if user == org && !strings.HasPrefix(scm, "bitbucket") {
-				listRepositoryFunc = c.Repositories.ListUser
+				listRepositoryFunc = func(ctx context.Context, s string, options goscm.ListOptions) ([]*goscm.Repository, *goscm.Response, error) {
+					return c.Repositories.List(ctx, options)
+				}
 			} else {
 				listRepositoryFunc = c.Repositories.ListOrganisation
 			}

diff --git a/pkg/kapis/devops/v1alpha3/scm/scmhandler_test.go b/pkg/kapis/devops/v1alpha3/scm/scmhandler_test.go
@@ -278,9 +278,11 @@ func TestSCMAPI(t *testing.T) {
 			}
 
 			gock.New("https://api.github.com").
-				Get("users/octocat/repos").
+				Get("/user/repos").
 				MatchParam("per_page", "1").
 				MatchParam("page", "1").
+				MatchParam("visibility", "all").
+				MatchParam("affiliation", "owner").
 				Reply(200).
 				Type("application/json").
 				SetHeaders(mockHeaders).