Scope config lookup to org

Author: filiptronicek

components/gitpod-db/src/project-db.ts

@@ -10,7 +10,7 @@ import { TransactionalDB } from "./typeorm/transactional-db-impl";
 export const ProjectDB = Symbol("ProjectDB");
 export interface ProjectDB extends TransactionalDB<ProjectDB> {
     findProjectById(projectId: string): Promise<Project | undefined>;
-    findProjectsByCloneUrl(cloneUrl: string): Promise<Project[]>;
+    findProjectsByCloneUrl(cloneUrl: string, organizationId?: string): Promise<Project[]>;
     findProjects(orgID: string): Promise<Project[]>;
     findProjectsBySearchTerm(args: FindProjectsBySearchTermArgs): Promise<{ total: number; rows: Project[] }>;
     storeProject(project: Project): Promise<Project>;

components/gitpod-db/src/typeorm/project-db-impl.ts

@@ -60,9 +60,9 @@ export class ProjectDBImpl extends TransactionalDBImpl<ProjectDB> implements Pro
         return repo.findOne({ id: projectId, markedDeleted: false });
     }
 
-    public async findProjectsByCloneUrl(cloneUrl: string): Promise<Project[]> {
+    public async findProjectsByCloneUrl(cloneUrl: string, organizationId?: string): Promise<Project[]> {
         const repo = await this.getRepo();
-        const conditions: FindConditions<DBProject> = { cloneUrl, markedDeleted: false };
+        const conditions: FindConditions<DBProject> = { cloneUrl, markedDeleted: false, teamId: organizationId };
         return repo.find(conditions);
     }
 

components/server/src/projects/projects-service.ts

@@ -114,8 +114,8 @@ export class ProjectsService {
         return filteredProjects;
     }
 
-    async findProjectsByCloneUrl(userId: string, cloneUrl: string): Promise<Project[]> {
-        const projects = await this.projectDB.findProjectsByCloneUrl(cloneUrl);
+    async findProjectsByCloneUrl(userId: string, cloneUrl: string, organizationId?: string): Promise<Project[]> {
+        const projects = await this.projectDB.findProjectsByCloneUrl(cloneUrl, organizationId);
         const result: Project[] = [];
         for (const project of projects) {
             if (await this.auth.hasPermissionOnProject(userId, "read_info", project.id)) {

components/server/src/workspace/context-service.ts

@@ -120,7 +120,11 @@ export class ContextService {
         if (options?.projectId) {
             project = await this.projectsService.getProject(user.id, options.projectId);
         } else if (CommitContext.is(context)) {
-            const projects = await this.projectsService.findProjectsByCloneUrl(user.id, context.repository.cloneUrl);
+            const projects = await this.projectsService.findProjectsByCloneUrl(
+                user.id,
+                context.repository.cloneUrl,
+                options?.organizationId,
+            );
             if (projects.length > 1) {
                 throw new ApplicationError(ErrorCodes.BAD_REQUEST, "Multiple projects found for clone URL.");
             }