Retrieve target repoId for AzureDevOps

(#4142, #4143)

Author: sergeibbb

src/git/remotes/azure-devops.ts

@@ -1,5 +1,8 @@
 import type { Range, Uri } from 'vscode';
 import type { AutolinkReference, DynamicAutolinkReference } from '../../autolinks/models/autolinks';
+import type { Container } from '../../container';
+import { HostingIntegration } from '../../plus/integrations/integration';
+import { remoteProviderIdToIntegrationId } from '../../plus/integrations/integrationService';
 import type { Brand, Unbrand } from '../../system/brand';
 import type { Repository } from '../models/repository';
 import type { GkProviderId } from '../models/repositoryIdentities';
@@ -17,7 +20,14 @@ const rangeRegex = /line=(\d+)(?:&lineEnd=(\d+))?/;
 
 export class AzureDevOpsRemote extends RemoteProvider {
 	private readonly project: string | undefined;
-	constructor(domain: string, path: string, protocol?: string, name?: string, legacy: boolean = false) {
+	constructor(
+		private readonly container: Container,
+		domain: string,
+		path: string,
+		protocol?: string,
+		name?: string,
+		legacy: boolean = false,
+	) {
 		let repoProject;
 		if (sshDomainRegex.test(domain)) {
 			path = path.replace(sshPathRegex, '');
@@ -186,16 +196,30 @@ export class AzureDevOpsRemote extends RemoteProvider {
 		return this.encodeUrl(`${this.baseUrl}/branchCompare?baseVersion=GB${base}&targetVersion=GB${head}`);
 	}
 
-	protected override getUrlForCreatePullRequest(
+	protected override async getUrlForCreatePullRequest(
 		base: { branch?: string; remote: { path: string; url: string } },
 		head: { branch: string; remote: { path: string; url: string } },
-	): string | undefined {
-		const query = new URLSearchParams({ sourceRef: head.branch, targetRef: base.branch ?? '' });
-		// TODO: figure this out
-		// query.set('sourceRepositoryId', compare.repoId);
-		// query.set('targetRepositoryId', base.repoId);
+	): Promise<string | undefined> {
+		const query = new URLSearchParams({ sourceRef: head.branch, targetRef: base.branch ?? '', title: 'OLOLO' });
+		if (base.remote.url !== head.remote.url) {
+			const { org: baseOrg, project: baseProject, repo: baseName } = parseAzureUrl(base.remote.url);
+			const targetDesc = { project: baseProject, name: baseName, owner: baseOrg };
+
+			const integrationId = remoteProviderIdToIntegrationId(this.id);
+			const integration = integrationId && (await this.container.integrations.get(integrationId));
+			let targetRepoId = undefined;
+			if (integration?.isConnected && integration instanceof HostingIntegration) {
+				targetRepoId = (await integration.getRepoInfo(targetDesc))?.id;
+			}
 
-		return `${this.encodeUrl(`${this.baseUrl}/pullrequestcreate`)}?${query.toString()}`;
+			if (!targetRepoId) {
+				return undefined; //?? or throw or trigger error showing
+			}
+			query.set('targetRepositoryId', targetRepoId);
+			// query.set('sourceRepositoryId', compare.repoId); // ?? looks like not needed
+		}
+
+		return `${this.encodeUrl(`${this.getRepoBaseUrl(head.remote.path)}/pullrequestcreate`)}?${query.toString()}`;
 	}
 
 	protected getUrlForFile(fileName: string, branch?: string, sha?: string, range?: Range): string {
@@ -219,3 +243,26 @@ export class AzureDevOpsRemote extends RemoteProvider {
 		return this.encodeUrl(`${this.baseUrl}?path=/${fileName}${line}`);
 	}
 }
+
+const azureSshUrlRegex = /^(?:[^@]+@)?([^:]+):v\d\//;
+function parseAzureUrl(url: string): { org: string; project: string; repo: string } {
+	if (azureSshUrlRegex.test(url)) {
+		url = url.replace(azureSshUrlRegex, '');
+	}
+	const match = orgAndProjectRegex.exec(url);
+	if (match != null) {
+		const [, org, project, rest] = match;
+		return { org: org, project: project, repo: rest };
+	}
+
+	// Azure DevOps allows projects and repository names with spaces. In that situation,
+	// the `path` will be previously encoded during git clone
+	// revert that encoding to avoid double-encoding by gitlens during copy remote and open remote
+	//path = decodeURIComponent(path);
+
+	return {
+		org: '',
+		project: '',
+		repo: '',
+	};
+}

src/git/remotes/remoteProviders.ts

@@ -41,7 +41,7 @@ const builtInProviders: RemoteProviders = [
 	{
 		custom: false,
 		matcher: /\bdev\.azure\.com$/i,
-		creator: (_container: Container, domain: string, path: string) => new AzureDevOpsRemote(domain, path),
+		creator: (container: Container, domain: string, path: string) => new AzureDevOpsRemote(container, domain, path),
 	},
 	{
 		custom: true,
@@ -56,8 +56,8 @@ const builtInProviders: RemoteProviders = [
 	{
 		custom: false,
 		matcher: /\bvisualstudio\.com$/i,
-		creator: (_container: Container, domain: string, path: string) =>
-			new AzureDevOpsRemote(domain, path, undefined, undefined, true),
+		creator: (container: Container, domain: string, path: string) =>
+			new AzureDevOpsRemote(container, domain, path, undefined, undefined, true),
 	},
 	{
 		custom: false,
@@ -136,8 +136,8 @@ export function loadRemoteProviders(
 function getCustomProviderCreator(cfg: RemotesConfig) {
 	switch (cfg.type) {
 		case 'AzureDevOps':
-			return (_container: Container, domain: string, path: string) =>
-				new AzureDevOpsRemote(domain, path, cfg.protocol, cfg.name, true);
+			return (container: Container, domain: string, path: string) =>
+				new AzureDevOpsRemote(container, domain, path, cfg.protocol, cfg.name, true);
 		case 'Bitbucket':
 			return (_container: Container, domain: string, path: string) =>
 				new BitbucketRemote(domain, path, cfg.protocol, cfg.name, true);

src/plus/integrations/integration.ts

@@ -44,6 +44,7 @@ import type {
 	ProviderPullRequest,
 	ProviderRepoInput,
 	ProviderReposInput,
+	ProviderRepository,
 } from './providers/models';
 import { IssueFilter, PagingMode, PullRequestFilter } from './providers/models';
 import type { ProvidersApi } from './providers/providersApi';
@@ -780,6 +781,20 @@ export abstract class HostingIntegration<
 		return defaultBranch;
 	}
 
+	async getRepoInfo(repo: {
+		owner: string;
+		name: string;
+		project?: string;
+	}): Promise<ProviderRepository | undefined> {
+		return this.getProviderRepoInfo?.(repo);
+	}
+
+	getProviderRepoInfo?(repo: {
+		owner: string;
+		name: string;
+		project?: string;
+	}): Promise<ProviderRepository | undefined>;
+
 	protected abstract getProviderDefaultBranch(
 		{ accessToken }: ProviderAuthenticationSession,
 		repo: T,

src/plus/integrations/providers/azureDevOps.ts

@@ -17,7 +17,7 @@ import type {
 	AzureRemoteRepositoryDescriptor,
 	AzureRepositoryDescriptor,
 } from './azure/models';
-import type { ProviderPullRequest } from './models';
+import type { ProviderPullRequest, ProviderRepository } from './models';
 import { fromProviderIssue, fromProviderPullRequest, providersMetadata } from './models';
 
 const metadata = providersMetadata[HostingIntegrationId.AzureDevOps];
@@ -300,6 +300,17 @@ export class AzureDevOpsIntegration extends HostingIntegration<
 		return Promise.resolve(undefined);
 	}
 
+	public override async getProviderRepoInfo(repo: {
+		owner: string;
+		name: string;
+		project: string;
+	}): Promise<ProviderRepository | undefined> {
+		const api = await this.getProvidersApi();
+		return api.getRepo(this.id, repo.owner, repo.name, repo.project, {
+			accessToken: this._session?.accessToken,
+		});
+	}
+
 	protected override async getProviderRepositoryMetadata(
 		_session: AuthenticationSession,
 		_repo: AzureRepositoryDescriptor,

src/plus/integrations/providers/models.ts

@@ -226,6 +226,15 @@ export interface PageInfo {
 	nextPage?: number | null;
 }
 
+export type GetRepoFn = (
+	input: ProviderRepoInput,
+	options?: EnterpriseOptions,
+) => Promise<{ data: ProviderRepository }>;
+export type GetRepoOfProjectFn = (
+	input: ProviderRepoInput & { project: string },
+	options?: EnterpriseOptions,
+) => Promise<{ data: ProviderRepository }>;
+
 export type GetPullRequestsForReposFn = (
 	input: (GetPullRequestsForReposInput | GetPullRequestsForRepoIdsInput) & PagingInput,
 	options?: EnterpriseOptions,
@@ -350,6 +359,8 @@ export type GetIssuesForResourceForCurrentUserFn = (
 
 export interface ProviderInfo extends ProviderMetadata {
 	provider: GitHub | GitLab | Bitbucket | Jira | Trello | AzureDevOps;
+	getRepoFn?: GetRepoFn;
+	getRepoOfProjectFn?: GetRepoOfProjectFn;
 	getPullRequestsForReposFn?: GetPullRequestsForReposFn;
 	getPullRequestsForRepoFn?: GetPullRequestsForRepoFn;
 	getPullRequestsForUserFn?: GetPullRequestsForUserFn;

src/plus/integrations/providers/providersApi.ts

@@ -215,6 +215,7 @@ export class ProvidersApi {
 			[HostingIntegrationId.AzureDevOps]: {
 				...providersMetadata[HostingIntegrationId.AzureDevOps],
 				provider: providerApis.azureDevOps,
+				getRepoOfProjectFn: providerApis.azureDevOps.getRepo.bind(providerApis.azureDevOps),
 				getCurrentUserFn: providerApis.azureDevOps.getCurrentUser.bind(
 					providerApis.azureDevOps,
 				) as GetCurrentUserFn,
@@ -442,6 +443,48 @@ export class ProvidersApi {
 		}
 	}
 
+	async getRepo(
+		providerId: IntegrationId,
+		owner: string,
+		name: string,
+		project?: string,
+		options?: { accessToken?: string; isPAT?: boolean; baseUrl?: string },
+	): Promise<ProviderRepository | undefined> {
+		if (providerId === HostingIntegrationId.AzureDevOps && project != null) {
+			const { provider, token } = await this.ensureProviderTokenAndFunction(
+				providerId,
+				'getRepoOfProjectFn',
+				options?.accessToken,
+			);
+
+			try {
+				const result = await provider['getRepoOfProjectFn']?.(
+					{ namespace: owner, name: name, project: project },
+					{ token: token, isPAT: options?.isPAT, baseUrl: options?.baseUrl },
+				);
+				return result?.data;
+			} catch (e) {
+				return this.handleProviderError<ProviderRepository>(providerId, token, e);
+			}
+		} else {
+			const { provider, token } = await this.ensureProviderTokenAndFunction(
+				providerId,
+				'getRepoFn',
+				options?.accessToken,
+			);
+
+			try {
+				const result = await provider['getRepoFn']?.(
+					{ namespace: owner, name: name, project: project },
+					{ token: token, isPAT: options?.isPAT, baseUrl: options?.baseUrl },
+				);
+				return result?.data;
+			} catch (e) {
+				return this.handleProviderError<ProviderRepository>(providerId, token, e);
+			}
+		}
+	}
+
 	async getCurrentUser(
 		providerId: IntegrationId,
 		options?: { accessToken?: string; isPAT?: boolean; baseUrl?: string },