[server] fix Suggested Context URLs for BBS – EXP-354

components/server/src/bitbucket-server/bitbucket-server-api.ts

@@ -279,10 +279,16 @@ export class BitbucketServerApi {
         );
     }
 
+    /**
+     * https://developer.atlassian.com/server/bitbucket/rest/v811/api-group-repository/#api-api-latest-repos-get
+     */
     async getRepos(
         user: User,
         query: {
             permission?: "REPO_READ" | "REPO_WRITE" | "REPO_ADMIN";
+            /**
+             * defaults to 25
+             */
             limit: number;
         },
     ) {

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

@@ -9,6 +9,7 @@ import { inject, injectable } from "inversify";
 import { RepoURL } from "../repohost";
 import { RepositoryProvider } from "../repohost/repository-provider";
 import { BitbucketServerApi } from "./bitbucket-server-api";
+import { log } from "@gitpod/gitpod-protocol/lib/util/logging";
 
 @injectable()
 export class BitbucketServerRepositoryProvider implements RepositoryProvider {
@@ -144,8 +145,19 @@ export class BitbucketServerRepositoryProvider implements RepositoryProvider {
     }
 
     async getUserRepos(user: User): Promise<string[]> {
-        // TODO(janx): Not implemented yet
-        return [];
+        try {
+            const repos = await this.api.getRepos(user, { limit: 1000, permission: "REPO_READ" });
+
+            return (repos.values || [])
+                .map((r) => {
+                    const cloneUrl = r.links.clone.find((u) => u.name === "http")?.href!;
+                    return cloneUrl;
+                })
+                .filter((u) => !!u);
+        } catch (error) {
+            log.error("BitbucketServerRepositoryProvider.getUserRepos", error);
+            return [];
+        }
     }
 
     async hasReadAccess(user: User, owner: string, repo: string): Promise<boolean> {

components/server/src/prebuilds/bitbucket-server-service.ts

@@ -25,7 +25,7 @@ export class BitbucketServerService extends RepositoryService {
     @inject(BitbucketServerContextParser) protected contextParser: BitbucketServerContextParser;
 
     async getRepositoriesForAutomatedPrebuilds(user: User): Promise<ProviderRepository[]> {
-        const repos = await this.api.getRepos(user, { limit: 100, permission: "REPO_ADMIN" });
+        const repos = await this.api.getRepos(user, { limit: 1000, permission: "REPO_ADMIN" });
         return (repos.values || []).map((r) => {
             const cloneUrl = r.links.clone.find((u) => u.name === "http")?.href!;
             // const webUrl = r.links?.self[0]?.href?.replace("/browse", "");

components/server/src/workspace/gitpod-server-impl.ts

@@ -333,8 +333,8 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
             );
 
         if (!this.disposables.disposed) {
-            for (const projectId of projects) {
-                this.disposables.push(this.subscriber.listenForPrebuildUpdates(projectId, handler));
+            for (const project of projects) {
+                this.disposables.push(this.subscriber.listenForPrebuildUpdates(project.id, handler));
             }
         }
 
@@ -347,10 +347,10 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         }
 
         // update all project this user has access to
-        const allProjects: string[] = [];
+        const allProjects: Project[] = [];
         const teams = await this.organizationService.listOrganizationsByMember(this.userID, this.userID);
         for (const team of teams) {
-            allProjects.push(...(await this.projectsService.getProjects(this.userID, team.id)).map((p) => p.id));
+            allProjects.push(...(await this.projectsService.getProjects(this.userID, team.id)));
         }
         return allProjects;
     }
@@ -1753,26 +1753,13 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
                 }),
         );
 
-        // User repositories (from Apps)
+        // Repositories of all accessible projects
         promises.push(
-            this.getAuthProviders(ctx)
-                .then((authProviders) =>
-                    Promise.all(
-                        authProviders.map(async (p) => {
-                            try {
-                                const userRepos = await this.getProviderRepositoriesForUser(ctx, { provider: p.host });
-                                userRepos.forEach((r) =>
-                                    suggestions.push({ url: r.cloneUrl.replace(/\.git$/, ""), priority: 5 }),
-                                );
-                            } catch (error) {
-                                log.debug(logCtx, "Could not get user repositories from App for " + p.host, error);
-                            }
-                        }),
-                    ),
-                )
-                .catch((error) => {
-                    log.error(logCtx, "Could not get auth providers", error);
-                }),
+            this.getAccessibleProjects().then((projects) => {
+                projects.forEach((project) =>
+                    suggestions.push({ url: project.cloneUrl.replace(/\.git$/, ""), priority: 1 }),
+                );
+            }),
         );
 
         // User repositories (from Git hosts directly)