@gitkraken/core-gitlens 0.15.3 → 0.15.4

package/dist/plus/integrations/providers/azureDevOps.js

@@ -2,29 +2,20 @@ import { chunk } from "../../../utils/array.js";
 import { CancellationError } from "../../../utils/cancellation.js";
 import { mapSettledBounded } from "../../../utils/promise.js";
 import { PromiseCache } from "../../../utils/promiseCache.js";
-import { AuthenticationError } from "../../../git/errors.js";
 import "../../../git/models/pullRequest.js";
 import "../constants.js";
+import { throwProviderError } from "./providerErrors.js";
 import { throwIfCallerContractError, toCollectionScopeFailure } from "../collectionMetadata.js";
 import { toTokenWithInfo } from "../authentication/models.js";
 import "../providerFilters.js";
-import { decodePathSegment } from "../utils/domain.utils.js";
 import { collectProviderPagedResult, flatSettledResultsOrThrow, mergeCollectionMetadata, resolveBranchPullRequests, selectBranchPullRequests } from "./utils/providerPaging.js";
-import { fromProviderIssue, fromProviderPullRequest, getProviderPullRequestIdentity, providerPullRequestMatchesSearch, providersMetadata, toIssueShape, toProviderIssueStates, toProviderPullRequestStates } from "./models.js";
+import { fromProviderIssue, fromProviderPullRequest, getProviderPullRequestIdentity, isNativePullRequest, providerPullRequestMatchesSearch, providersMetadata, pullRequestNamesPeople, toIssueShape, toProviderIssueStates, toProviderPullRequestStates } from "./models.js";
 import { toAzurePullRequestEtagFields, toAzureWorkItemEtagFields } from "./azure/models.js";
+import { decodeAzurePathSegment, getAzurePullRequestIdentityFromMaybeUrl, getAzureRepositoryIdentity } from "./azure/azure.utils.js";
 import { GitHostIntegration } from "../models/gitHostIntegration.js";
-import { getAzurePullRequestIdentityFromMaybeUrl } from "./azure/azure.utils.js";
 import { discoveryCacheTtl } from "./utils/discoveryCache.js";
 import { GitPullRequestState } from "@gitkraken/provider-apis";
 //#region ../plus/integrations/src/providers/azureDevOps.ts
-function getAzureRepositoryIdentity(repo) {
-	const match = /^([^/]+)\/_git\/([^/]+)$/i.exec(repo.name);
-	return {
-		resourceName: repo.owner,
-		projectName: repo.project ?? match?.[1],
-		repositoryName: match?.[2] ?? repo.name
-	};
-}
 function getAzureRepositoryApiBaseUrl(baseUrl, repo) {
 	if (!isValidAzureVirtualDirectory(repo.virtualDirectory)) throw new Error(`Invalid Azure virtual directory '${repo.virtualDirectory}'.`);
 	const url = findAzureRepositoryApiBaseUrl(baseUrl, repo);
@@ -52,36 +43,37 @@ function isValidAzureVirtualDirectory(virtualDirectory) {
 }
 /**
 * The paths a project-less reading's `{vdir}/{owner}` can be below the connection `baseUrl` addresses: the address
-* itself, or its parent when the address names a collection (see {@link resolveAzureProjectlessRepository}). A
+* itself, or its parent when the address names a collection (see {@link resolveAzureProjectlessRepository}). Only the
+* parent once the address is known to name a collection (`belowCollection`), since it then isn't the installation. A
 * connection at the host root serves no virtual directory, so none.
 */
-function getAzureProjectlessDirectories(baseUrl) {
+function getAzureProjectlessDirectories(baseUrl, belowCollection) {
 	const configured = new URL(baseUrl).pathname.split("/").filter(Boolean);
-	return [configured, configured.slice(0, -1)].filter((path) => path.length > 0);
+	return (belowCollection ? [configured.slice(0, -1)] : [configured, configured.slice(0, -1)]).filter((path) => path.length > 0);
 }
 /**
 * Whether `repo`'s path could be the project-less form of a repository named after its project, as read below the
 * connection `baseUrl` addresses: that reading moves the parsed owner into the virtual directory, so its directory and
 * owner must be one of {@link getAzureProjectlessDirectories}.
 */
-function isAzureProjectlessCandidate(baseUrl, repo) {
+function isAzureProjectlessCandidate(baseUrl, repo, belowCollection = false) {
 	if (getAzureRepositoryIdentity({
 		owner: repo.owner,
 		name: repo.name
 	}).projectName == null) return false;
 	const directory = [...repo.virtualDirectory?.split("/") ?? [], repo.owner];
-	return getAzureProjectlessDirectories(baseUrl).some((path) => path.length === directory.length && path.every((s, i) => sameAzurePathSegment(s, directory[i])));
+	return getAzureProjectlessDirectories(baseUrl, belowCollection).some((path) => path.length === directory.length && path.every((s, i) => sameAzurePathSegment(s, directory[i])));
 }
 /**
 * The virtual directory ahead of `owner` (empty when nothing is) in whichever of {@link getAzureProjectlessDirectories}
 * ends with it, `undefined` when none does. A caller-supplied repository scope carries only its owner, so this places
 * it where {@link isAzureProjectlessCandidate} expects it.
 */
-function getAzureScopeVirtualDirectory(baseUrl, owner) {
-	return getAzureProjectlessDirectories(baseUrl).find((p) => sameAzurePathSegment(p.at(-1), owner))?.slice(0, -1).map(decodePathSegment).join("/");
+function getAzureScopeVirtualDirectory(baseUrl, owner, belowCollection = false) {
+	return getAzureProjectlessDirectories(baseUrl, belowCollection).find((p) => sameAzurePathSegment(p.at(-1), owner))?.slice(0, -1).map(decodeAzurePathSegment).join("/");
 }
 function sameAzurePathSegment(encoded, value) {
-	return decodePathSegment(encoded).toLowerCase() === value.toLowerCase();
+	return decodeAzurePathSegment(encoded).toLowerCase() === value.toLowerCase();
 }
 /**
 * Whether two collection or project names name the same scope. Azure DevOps treats them case-insensitively, so a
@@ -213,14 +205,30 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 		const { tokenWithInfo, options } = this.getApiOptions(session);
 		return api.getAzureResourcesForUser(tokenWithInfo, userId, options);
 	}
+	_organizationUserIds = new PromiseCache({ capacity: 50 });
 	/**
-	* The identity id a pull-request creator/reviewer filter must carry for `collection`.
-	*
-	* On Azure DevOps Services that is the account id, one per user. The server override resolves it per collection,
-	* since Azure DevOps Server gives one person a different id in each collection than at the server level.
+	* The current user's identity id in `organization` (Azure DevOps Server: the collection), which is what Azure's
+	* creator and reviewer filters, and its pull requests' authors and reviewers, compare against. Never the
+	* account's own id: Azure DevOps Services can know a person in an organization by an id other than their profile
+	* id, and Azure DevOps Server gives them a different id in each collection than at the server level. Cached per
+	* credential and organization, since it can't change for either.
 	*/
-	async getFilterUserId(session, _collection) {
-		return (await this.getProviderCurrentAccount(session))?.id;
+	getFilterUserId(session, organization) {
+		return this._organizationUserIds.getOrCreate(JSON.stringify([this.discoveryKey(session), organization.toLowerCase()]), async (cacheable) => {
+			const id = await this.requestOrganizationUserId(session, organization);
+			if (id == null) cacheable.invalidate();
+			return id;
+		});
+	}
+	/** Reads the current user's identity id from `organization`'s own connection data; see {@link getFilterUserId}. */
+	async requestOrganizationUserId(session, organization) {
+		const api = await this.getProvidersApi();
+		const { tokenWithInfo } = this.getApiOptions(session);
+		try {
+			return (await api.getCurrentUserForInstance(tokenWithInfo, organization, this.getCollectionApiOptions(session, organization)))?.id;
+		} catch (ex) {
+			return throwProviderError(tokenWithInfo, ex);
+		}
 	}
 	/**
 	* The current user's groups per credential, collection and user, kept for {@link discoveryCacheTtl} like the other
@@ -250,15 +258,50 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 	}
 	invalidateDiscoveryCaches() {
 		super.invalidateDiscoveryCaches();
+		this._organizationUserIds.clear();
 		this._reviewerGroupIds.clear();
 	}
 	/**
-	* For one read, the current account as each organization's pull requests identify it, given the account itself
-	* (`undefined` when it couldn't be read). Azure DevOps Services gives a person one id, so that is `account`; the
-	* server override resolves each collection's own, once per read.
+	* The viewer each row of an account-wide read was read for (see {@link getProviderMyPullRequestsForUser}), so its
+	* mapping uses the identity that read resolved instead of resolving it again.
 	*/
-	getOrganizationViewers(_session, account) {
-		return () => Promise.resolve(account);
+	_rowViewers = /* @__PURE__ */ new WeakMap();
+	/**
+	* Resolved per organization, which a raw row names as its repository owner: an organization's pull requests carry
+	* the id {@link getFilterUserId} resolves there, not necessarily the account's. A row an account-wide read returned
+	* keeps the one that read resolved, even once its session is gone. A row that names no organization or no one to
+	* match gets no viewer, nor does one in an organization whose id can't be read: its authorship stays unknown.
+	*/
+	async getPullRequestViewers(pullRequests, connectionId) {
+		const read = pullRequests.map((pr) => isNativePullRequest(pr) ? void 0 : this._rowViewers.get(pr));
+		const organizations = pullRequests.map((pr, i) => read[i] == null && !isNativePullRequest(pr) && pullRequestNamesPeople(pr) ? pr.repository?.owner?.login || void 0 : void 0);
+		if (!organizations.some((o) => o != null)) return read;
+		const session = await this.resolveReadSessionOrThrow(connectionId, void 0).catch(() => void 0);
+		if (session == null) return read;
+		const viewerFor = this.getOrganizationViewers(session);
+		return Promise.all(read.map((viewer, i) => {
+			const organization = organizations[i];
+			if (organization == null) return Promise.resolve(viewer);
+			return viewerFor(organization);
+		}));
+	}
+	/**
+	* For one read, the current user as each organization's pull requests identify them (see
+	* {@link getFilterUserId}). An organization whose id can't be read resolves `undefined`, since authorship is
+	* optional enrichment and one organization's failed lookup must not fail the read or blank the others; it is
+	* asked once per read, as a miss isn't cached.
+	*/
+	getOrganizationViewers(session) {
+		const viewers = /* @__PURE__ */ new Map();
+		return (organization) => {
+			const key = organization.toLowerCase();
+			let viewer = viewers.get(key);
+			if (viewer == null) {
+				viewer = this.getFilterUserId(session, organization).then((id) => id != null ? { id } : void 0, () => void 0);
+				viewers.set(key, viewer);
+			}
+			return viewer;
+		};
 	}
 	/**
 	* What the discovery caches (account, organizations, projects, and their stored copies) are keyed by. Azure DevOps
@@ -611,11 +654,12 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 	* like the repo-scoped list rows — not through {@link fromAzureProviderPullRequest}, which only the
 	* account-wide searches use.
 	*/
-	async getProviderPullRequestsBatch(session, coordinates, options, _cancellation) {
+	async getProviderPullRequestsBatch(session, coordinates, _options, _cancellation) {
 		const api = await this.getProvidersApi();
 		const { tokenWithInfo } = this.getApiOptions(session);
-		const viewerFor = this.getOrganizationViewers(session, options?.currentAccount);
+		const viewerFor = this.getOrganizationViewers(session);
 		return mapSettledBounded(coordinates, 6, async (c) => {
+			const viewer = viewerFor(c.owner);
 			const pr = await api.getPullRequestForRepo(tokenWithInfo, {
 				namespace: c.owner,
 				name: c.repo,
@@ -626,7 +670,7 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 			});
 			if (pr == null) return void 0;
 			return fromProviderPullRequest(pr, this, {
-				currentAccount: await viewerFor(c.owner),
+				currentAccount: await viewer,
 				projection: "batch"
 			});
 		});
@@ -782,7 +826,7 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 				truncated
 			};
 		});
-		return resolveBranchPullRequests(targets, found, (coordinates) => this.getProviderPullRequestsBatch(session, coordinates, { currentAccount: options.currentAccount }, cancellation));
+		return resolveBranchPullRequests(targets, found, (coordinates) => this.getProviderPullRequestsBatch(session, coordinates, void 0, cancellation));
 	}
 	async getProviderPullRequest(session, resource, id) {
 		return this.readRepository(session, resource, (azure, target) => azure.getPullRequest(this, toTokenWithInfo(this.id, session), target.repo.owner, target.repo.project ?? target.repo.name, id, { baseUrl: target.baseUrl }));
@@ -814,7 +858,7 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 		const projects = (await this.getProviderProjectsForResources(session, await this.getProviderResourcesForUser(session) ?? [])).values;
 		if (projects.length === 0) return void 0;
 		const repoDescriptors = [...(await this.getRepoDescriptorsForProjects(session, projects) ?? /* @__PURE__ */ new Map()).values()].filter((r) => r != null).flat();
-		return result.values.map((pr) => this.fromAzureProviderPullRequest(pr, repoDescriptors, projects, "search"));
+		return result.values.map((pr) => this.fromAzureProviderPullRequest(pr, repoDescriptors, projects, "search", this._rowViewers.get(pr)));
 	}
 	async getProviderMyPullRequestsForUser(session, options) {
 		const api = await this.getProvidersApi();
@@ -853,6 +897,7 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 					return {
 						prs: collected,
 						projectIdentity,
+						organization: project.namespace,
 						failure: toCollectionScopeFailure(scope, /* @__PURE__ */ new Error("Azure DevOps returned no page after advertising a continuation"))
 					};
 				}
@@ -863,6 +908,7 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 					return {
 						prs: collected,
 						projectIdentity,
+						organization: project.namespace,
 						failure: toCollectionScopeFailure(scope, /* @__PURE__ */ new Error("Azure DevOps returned no advancing pull request continuation"))
 					};
 				}
@@ -873,12 +919,14 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 				return {
 					prs: collected,
 					projectIdentity,
+					organization: project.namespace,
 					failure: toCollectionScopeFailure(scope, ex)
 				};
 			}
 			return {
 				prs: collected,
-				projectIdentity
+				projectIdentity,
+				organization: project.namespace
 			};
 		};
 		const requested = options?.filters?.length ? new Set(options.filters) : void 0;
@@ -886,12 +934,16 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 		const wantReviewed = requested == null || requested.has("assignee") || requested.has("review-requested");
 		const userIds = /* @__PURE__ */ new Map();
 		const identityFailures = /* @__PURE__ */ new Map();
-		for (const org of uniqueAzureNames(projects.values.map((p) => p.resourceName))) try {
-			userIds.set(org.toLowerCase(), await this.getFilterUserId(session, org));
-		} catch (ex) {
-			throwIfCallerContractError(ex);
-			if (ex instanceof AuthenticationError) throw ex;
-			identityFailures.set(org.toLowerCase(), ex);
+		const organizations = uniqueAzureNames(projects.values.map((p) => p.resourceName));
+		const identities = await mapSettledBounded(organizations, 6, (org) => this.getFilterUserId(session, org));
+		for (const [i, identity] of identities.entries()) {
+			const key = organizations[i].toLowerCase();
+			if (identity.status === "fulfilled") {
+				userIds.set(key, identity.value);
+				continue;
+			}
+			throwIfCallerContractError(identity.reason);
+			identityFailures.set(key, identity.reason);
 		}
 		const groups = wantReviewed ? await this.getReviewerGroupsByOrganization(session, projects.values, userIds, failures) : void 0;
 		if (groups?.incomplete) truncated = true;
@@ -927,7 +979,10 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 			if (outcome.failure != null) failures.push(outcome.failure);
 			for (const pr of outcome.prs) {
 				const key = getProviderPullRequestIdentity(pr) ?? `project:${outcome.projectIdentity}:pull-request:${pr.id}`;
-				if (!prsByIdentity.has(key)) prsByIdentity.set(key, pr);
+				if (!prsByIdentity.has(key)) prsByIdentity.set(key, {
+					pr,
+					organization: outcome.organization
+				});
 			}
 		}
 		const metadata = mergeCollectionMetadata(failures.length > 0 ? {
@@ -936,7 +991,11 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 		} : void 0, projects.metadata);
 		const groupIds = groups?.groupIds ?? /* @__PURE__ */ new Set();
 		return {
-			values: Array.from(prsByIdentity.values(), (pr) => markMyGroupReviews(pr, groupIds)),
+			values: Array.from(prsByIdentity.values(), ({ pr, organization }) => {
+				const row = markMyGroupReviews(pr, groupIds);
+				this._rowViewers.set(row, { id: userIds.get(organization.toLowerCase()) });
+				return row;
+			}),
 			paging: {
 				cursor: "{}",
 				more: false,
@@ -1200,9 +1259,10 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 		this._organizations = void 0;
 		this._projects = void 0;
 		this._accounts = void 0;
+		this._organizationUserIds.clear();
 		this._reviewerGroupIds.clear();
 	}
-	fromAzureProviderPullRequest(azurePullRequest, repoDescriptors, projectDescriptors, projection) {
+	fromAzureProviderPullRequest(azurePullRequest, repoDescriptors, projectDescriptors, projection, currentAccount) {
 		const baseRepoDescriptor = repoDescriptors.find((r) => r.id === azurePullRequest.repository.id);
 		const headRepoDescriptor = azurePullRequest.headRepository != null ? repoDescriptors.find((r) => r.id === azurePullRequest.headRepository.id) : void 0;
 		let project;
@@ -1225,7 +1285,8 @@ var AzureDevOpsIntegrationBase = class extends GitHostIntegration {
 		if (baseRepoDescriptor?.projectName != null) project = projectDescriptors.find((p) => p.resourceName === baseRepoDescriptor.resourceName && p.name === baseRepoDescriptor.projectName);
 		return fromProviderPullRequest(azurePullRequest, this, {
 			project,
-			projection
+			projection,
+			currentAccount
 		});
 	}
 };
@@ -1247,6 +1308,6 @@ var AzureDevOpsIntegration = class extends AzureDevOpsIntegrationBase {
 	}
 };
 //#endregion
-export { AzureDevOpsIntegration, AzureDevOpsIntegrationBase, findAzureRepositoryApiBaseUrl, getAzureRepositoryApiBaseUrl, getAzureRepositoryIdentity, getAzureScopeVirtualDirectory, isAzureProjectlessCandidate, markMyGroupReviews, resolveAzureProjectlessRepository, sameAzureName, toAzureReviewerReads, uniqueAzureNames };
+export { AzureDevOpsIntegration, AzureDevOpsIntegrationBase, findAzureRepositoryApiBaseUrl, getAzureRepositoryApiBaseUrl, getAzureScopeVirtualDirectory, isAzureProjectlessCandidate, markMyGroupReviews, resolveAzureProjectlessRepository, sameAzureName, toAzureReviewerReads, uniqueAzureNames };
 
 //# sourceMappingURL=azureDevOps.js.map