Improve GithubRepositoryProvider.getUserRepos – EXP-407

components/server/src/github/github-repository-provider.spec.ts

@@ -78,5 +78,10 @@ class TestGithubContextRepositoryProvider {
             "f5b041513bfab914b5fbf7ae55788d9835004d76",
         ]);
     }
+
+    @test public async testGetUserRepos() {
+        const result = await this.provider.getUserRepos(this.user);
+        expect(result).to.include("https://github.com/gitpod-io/gitpod");
+    }
 }
 module.exports = new TestGithubContextRepositoryProvider(); // Only to circumvent no usage warning :-/

components/server/src/github/github-repository-provider.ts

@@ -172,28 +172,55 @@ export class GithubRepositoryProvider implements RepositoryProvider {
     }
 
     async getUserRepos(user: User): Promise<string[]> {
-        // Hint: Use this to get richer results:
-        //   node {
-        //       nameWithOwner
-        //       shortDescriptionHTML(limit: 120)
-        //       url
-        //   }
         const result: any = await this.githubQueryApi.runQuery(
             user,
             `
-            query {
+            fragment Repos on RepositoryConnection {
+                nodes {
+                  url
+                }
+              }
+
+              query topRepositories {
                 viewer {
-                    repositoriesContributedTo(includeUserRepositories: true, first: 100) {
-                        edges {
-                            node {
-                                url
-                            }
-                        }
-                    }
+                  contributedTo: repositoriesContributedTo(
+                    first: 100
+                    orderBy: {field: PUSHED_AT, direction: DESC}
+                    includeUserRepositories: true
+                    contributionTypes: [COMMIT]
+                  ) {
+                    ...Repos
+                  }
+                  original: repositories(
+                    first: 100
+                    ownerAffiliations: OWNER
+                    isFork: false
+                    isLocked: false
+                    orderBy: {field: UPDATED_AT, direction: DESC}
+                  ) {
+                    ...Repos
+                  }
+                  forked: repositories(
+                    first: 100
+                    ownerAffiliations: OWNER
+                    isFork: true
+                    isLocked: false
+                    orderBy: {field: UPDATED_AT, direction: DESC}
+                  ) {
+                    ...Repos
+                  }
                 }
-            }`,
+              }`,
         );
-        return (result.data.viewer?.repositoriesContributedTo?.edges || []).map((edge: any) => edge.node.url);
+
+        const urls = [];
+        for (const type of ["contributedTo", "original", "forked"]) {
+            const nodes = result.data.viewer[type]?.nodes;
+            if (nodes) {
+                urls.push(...nodes.map((n: any) => n?.url).filter((u: any) => typeof u === "string"));
+            }
+        }
+        return urls;
     }
 
     async hasReadAccess(user: User, owner: string, repo: string): Promise<boolean> {