@gitkraken/core-gitlens 0.15.3 → 0.15.4

package/dist/plus/integrations/providers/azureDevOpsServer.d.ts

@@ -1,14 +1,15 @@
 import { Emitter } from "../../../utils/event.js";
 import { IssueSearchCriteria } from "../../../git/models/issue.js";
-import { PullRequest, PullRequestSearchCriteria } from "../../../git/models/pullRequest.js";
+import { PullRequestSearchCriteria } from "../../../git/models/pullRequest.js";
 import { Account } from "../../../git/models/author.js";
 import { ProviderAuthenticationSession, TokenWithInfo } from "../authentication/models.js";
 import { GitSelfManagedHostIntegrationId } from "../constants.js";
 import { ProviderPullRequestCount, ProviderPullRequestSearchPage } from "../models/pullRequestReads.js";
-import { ProviderAzureResource, ProviderPullRequest, ProviderRepoInput, ProviderReposInput } from "./models.js";
+import { ProviderAzureResource, ProviderRepoInput, ProviderReposInput } from "./models.js";
 import { AzureRepositoryDescriptor } from "./azure/models.js";
 import { ProvidersApi } from "./providersApi.js";
 import { ProviderIssueSearchPage, ProviderSearchCount } from "../models/issueReads.js";
+import { RepositoryCoordinate } from "../models/gitHostIntegration.js";
 import { IntegrationKey } from "../models/integration.js";
 import { IntegrationConnectionChangeEvent } from "../integrationService.js";
 import { IntegrationAuthenticationService } from "../authentication/integrationAuthenticationService.js";
@@ -45,11 +46,14 @@ export declare class AzureDevOpsServerIntegration extends AzureDevOpsIntegration
   /** The base a request below `collection` appends to: the installation, whichever the address already ends in. */
   protected collectionApiBaseUrl(session: ProviderAuthenticationSession, collection: string): string;
   /**
-   * The collection names per credential and installation, `undefined` when they couldn't be read. Only a
+   * The collection names per credential and installation, `undefined` when they couldn't be read, and whether the
+   * address is then presumed to name a collection ({@link requestResourcesForUser}). Only a
    * tie-breaker for {@link getRepositoryTarget}, so a failed read is kept (for {@link discoveryCacheTtl}) rather than
    * retried on every repository read; a successful one comes from the organizations, which are kept for the session.
    */
   private readonly _collectionNames;
+  /** The failures to read the collection an address names after its collection list answered with a 404. */
+  private readonly _collectionListRefusals;
   /**
    * Settles which segment of a remote's path is the collection before reading the repository. Behind a virtual
    * directory a repository named after its project is also served as `{vdir}/{collection}/_git/{repo}`, which the
@@ -62,6 +66,8 @@ export declare class AzureDevOpsServerIntegration extends AzureDevOpsIntegration
   /**
    * The repository {@link getRepositoryTarget} reads `repo` as, and the base it reads it below: `undefined` when the
    * connection doesn't serve its virtual directory (another installation's) or that directory isn't a valid one.
+   * `isCandidate` is whether `repo` can be project-less below the connection ({@link isAzureProjectlessCandidate} by
+   * default), given whether the connection is known to address a collection rather than the installation.
    */
   private settleRepository;
   /**
@@ -71,23 +77,10 @@ export declare class AzureDevOpsServerIntegration extends AzureDevOpsIntegration
    * Only the coordinate is settled, and only to a repository the connection serves: each read places it below the
    * connection itself, so one settling elsewhere reads as given and fails its own read rather than every coordinate's.
    */
-  protected resolveRepositoryCoordinates<T extends {
-    owner: string;
-    repo: string;
-    project?: string;
-  }>(session: ProviderAuthenticationSession, coordinates: readonly T[], cancellation?: AbortSignal): Promise<{
+  protected resolveRepositoryCoordinates<T extends RepositoryCoordinate>(session: ProviderAuthenticationSession, coordinates: readonly T[], cancellation?: AbortSignal): Promise<{
     coordinates: readonly T[];
     unsettled?: readonly boolean[];
   }>;
-  /**
-   * The searches and counts take only `repos`: they re-read the collections and refuse a scope whose collection
-   * isn't one of them ({@link getSearchCollections}), and a scope read as parsed below a listed collection is what
-   * settling it would read ({@link resolveAzureProjectlessRepository}), so a miss there is not `unsettled`.
-   */
-  protected resolveRepositoryInputs(session: ProviderAuthenticationSession, repos: readonly ProviderRepoInput[], cancellation?: AbortSignal): Promise<{
-    repos: ProviderRepoInput[];
-    unsettled?: readonly boolean[];
-  }>;
   /**
    * Never rejects. A credential refused the list leaves every path as parsed, as before discovery was asked; any other
    * failure is `undefined`, so a read of a path it could have settled keeps a miss out of the caches (see
@@ -98,11 +91,13 @@ export declare class AzureDevOpsServerIntegration extends AzureDevOpsIntegration
   /**
    * Only the server level lists the collections: below one, Azure DevOps Server answers `projectCollections` with a
    * 404 page. On that 404 an address that names a collection reads the collection's own connection data, whose
-   * `webApplicationRelativeDirectory` spells it, and reports it as the one collection visible there.
+   * `webApplicationRelativeDirectory` spells it, and reports it as the one collection visible there. When that read
+   * fails, the address is presumed to name a collection, which the failure carries (see {@link getCollectionNames}) for
+   * as long as the failed discovery is kept; connection data that answers for the server says it doesn't.
    */
   protected requestResourcesForUser(session: ProviderAuthenticationSession, userId: string): Promise<ProviderAzureResource[] | undefined>;
   /**
-   * The filtered work-item search: one WIQL query per page over ONE collection, then one detail read for the
+   * The filtered work-item search snapshots matching ids with bounded WIQL queries, then reads details for each
    * page's slice. See {@link resolveWorkItemSearchScope} for why a search never spans several collections.
    */
   protected searchProviderIssuesPage(session: ProviderAuthenticationSession, options: {
@@ -196,34 +191,8 @@ export declare class AzureDevOpsServerIntegration extends AzureDevOpsIntegration
    * user reads every project the account can see, the same breadth as the account-wide pull request read.
    */
   private resolvePullRequestSearchFacets;
-  private readonly _collectionUserIds;
-  /**
-   * The current user's identity id in `collection`, read from the collection's own connection data, which is
-   * what Azure's creator and reviewer filters compare against. Cached per credential and collection, since it
-   * can't change for either.
-   */
-  protected getFilterUserId(session: ProviderAuthenticationSession, collection: string): Promise<string | undefined>;
-  /**
-   * Resolved per collection, which a raw row names as its repository owner: a collection's pull requests carry the
-   * id {@link getFilterUserId} resolves there, never the server-level account's. A row that names no collection or
-   * has no author to match gets no viewer, nor does one in a collection whose id can't be read: its authorship
-   * stays unknown.
-   */
-  getPullRequestViewers(pullRequests: readonly (ProviderPullRequest | PullRequest)[], connectionId?: string): Promise<({
-    id: string;
-    username?: string;
-  } | undefined)[]>;
-  /**
-   * Ignores `account`: it is the server-level one, which no collection's pull requests carry. A collection whose id
-   * can't be read resolves `undefined`, since authorship is optional enrichment and one collection's failed lookup
-   * must not fail the read or blank the others; it is asked once per read, as a miss isn't cached.
-   */
-  protected getOrganizationViewers(session: ProviderAuthenticationSession, _account: {
-    id: string;
-    username?: string;
-  } | undefined): (collection: string) => Promise<{
-    id: string;
-  } | undefined>;
+  /** Reads the collection's own connection data, at the installation's address. */
+  protected requestOrganizationUserId(session: ProviderAuthenticationSession, collection: string): Promise<string | undefined>;
   /** Every collection the account can see, or a refusal when discovery itself failed. */
   private getSearchCollections;
   /**

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

@@ -10,9 +10,10 @@ import "../constants.js";
 import { toCollectionScopeFailure } from "../collectionMetadata.js";
 import { toTokenWithInfo } from "../authentication/models.js";
 import { compareAzurePullRequestSearchPositions, getInvalidAzureSearchDate, isAzureWorkItemSearchFirstPage, parseAzurePullRequestSearchCursor, toAzurePullRequestSearchCursorKey, toAzurePullRequestSearchFilter, toAzurePullRequestSearchPosition, toAzureSearchPageSize } from "./azure/search.js";
-import { fromProviderPullRequest, getProviderPullRequestIdentity, isNativePullRequest, providersMetadata, toProviderPullRequestStates } from "./models.js";
+import { fromProviderPullRequest, getProviderPullRequestIdentity, providersMetadata, toProviderPullRequestStates } from "./models.js";
+import { getAzureRepositoryIdentity } from "./azure/azure.utils.js";
 import { discoveryCacheTtl } from "./utils/discoveryCache.js";
-import { AzureDevOpsIntegrationBase, findAzureRepositoryApiBaseUrl, getAzureRepositoryApiBaseUrl, getAzureRepositoryIdentity, getAzureScopeVirtualDirectory, isAzureProjectlessCandidate, markMyGroupReviews, resolveAzureProjectlessRepository, sameAzureName, toAzureReviewerReads, uniqueAzureNames } from "./azureDevOps.js";
+import { AzureDevOpsIntegrationBase, findAzureRepositoryApiBaseUrl, getAzureRepositoryApiBaseUrl, getAzureScopeVirtualDirectory, isAzureProjectlessCandidate, markMyGroupReviews, resolveAzureProjectlessRepository, sameAzureName, toAzureReviewerReads, uniqueAzureNames } from "./azureDevOps.js";
 //#region ../plus/integrations/src/providers/azureDevOpsServer.ts
 /**
 * Whether `value` can stand as one route segment. Encoding keeps `.` and `..` as they are, and a URL resolves them
@@ -149,7 +150,8 @@ var AzureDevOpsServerIntegration = class extends AzureDevOpsIntegrationBase {
 		});
 	}
 	/**
-	* The collection names per credential and installation, `undefined` when they couldn't be read. Only a
+	* The collection names per credential and installation, `undefined` when they couldn't be read, and whether the
+	* address is then presumed to name a collection ({@link requestResourcesForUser}). Only a
 	* tie-breaker for {@link getRepositoryTarget}, so a failed read is kept (for {@link discoveryCacheTtl}) rather than
 	* retried on every repository read; a successful one comes from the organizations, which are kept for the session.
 	*/
@@ -157,6 +159,8 @@ var AzureDevOpsServerIntegration = class extends AzureDevOpsIntegrationBase {
 		capacity: 10,
 		createTTL: discoveryCacheTtl
 	});
+	/** The failures to read the collection an address names after its collection list answered with a 404. */
+	_collectionListRefusals = /* @__PURE__ */ new WeakSet();
 	/**
 	* Settles which segment of a remote's path is the collection before reading the repository. Behind a virtual
 	* directory a repository named after its project is also served as `{vdir}/{collection}/_git/{repo}`, which the
@@ -176,15 +180,18 @@ var AzureDevOpsServerIntegration = class extends AzureDevOpsIntegrationBase {
 	/**
 	* The repository {@link getRepositoryTarget} reads `repo` as, and the base it reads it below: `undefined` when the
 	* connection doesn't serve its virtual directory (another installation's) or that directory isn't a valid one.
+	* `isCandidate` is whether `repo` can be project-less below the connection ({@link isAzureProjectlessCandidate} by
+	* default), given whether the connection is known to address a collection rather than the installation.
 	*/
-	async settleRepository(session, repo, cancellation) {
+	async settleRepository(session, repo, cancellation, isCandidate) {
 		const baseUrl = this.apiBaseUrlFor(session);
+		const candidate = isCandidate ?? ((belowCollection) => isAzureProjectlessCandidate(baseUrl, repo, belowCollection));
 		let unsettled = false;
-		if (isAzureProjectlessCandidate(baseUrl, repo)) {
-			const names = this._collectionNames.getOrCreate(this.discoveryKey(session), () => this.getCollectionNames(session));
-			const collections = await (cancellation != null ? raceWithSignal(names, cancellation) : names);
-			if (collections != null) repo = resolveAzureProjectlessRepository(repo, collections);
-			else unsettled = true;
+		if (candidate(false)) {
+			const discovery = this._collectionNames.getOrCreate(this.discoveryKey(session), () => this.getCollectionNames(session));
+			const { names, addressesCollection } = await (cancellation != null ? raceWithSignal(discovery, cancellation) : discovery);
+			if (names != null) repo = resolveAzureProjectlessRepository(repo, names);
+			else unsettled = candidate(addressesCollection === true);
 		}
 		return {
 			repo,
@@ -212,14 +219,21 @@ var AzureDevOpsServerIntegration = class extends AzureDevOpsIntegrationBase {
 				name: `${c.project}/_git/${c.repo}`,
 				project: c.project,
 				virtualDirectory: virtualDirectory || void 0
-			}, cancellation);
-			return {
-				coordinate: repo.owner !== c.owner && repoBaseUrl != null ? {
+			}, cancellation, (belowCollection) => getAzureScopeVirtualDirectory(baseUrl, c.owner, belowCollection) != null);
+			if (repo.owner === c.owner) return {
+				coordinate: c,
+				unsettled
+			};
+			return repoBaseUrl != null ? {
+				coordinate: {
 					...c,
 					owner: repo.owner,
 					project: repo.project
-				} : c,
+				},
 				unsettled
+			} : {
+				coordinate: c,
+				unsettled: true
 			};
 		}));
 		return {
@@ -228,37 +242,20 @@ var AzureDevOpsServerIntegration = class extends AzureDevOpsIntegrationBase {
 		};
 	}
 	/**
-	* The searches and counts take only `repos`: they re-read the collections and refuse a scope whose collection
-	* isn't one of them ({@link getSearchCollections}), and a scope read as parsed below a listed collection is what
-	* settling it would read ({@link resolveAzureProjectlessRepository}), so a miss there is not `unsettled`.
-	*/
-	async resolveRepositoryInputs(session, repos, cancellation) {
-		const { coordinates, unsettled } = await this.resolveRepositoryCoordinates(session, repos.map((r) => ({
-			...r,
-			owner: r.namespace,
-			repo: r.name
-		})), cancellation);
-		return {
-			repos: coordinates.map(({ owner, repo, ...r }) => ({
-				...r,
-				namespace: owner,
-				name: repo
-			})),
-			unsettled
-		};
-	}
-	/**
 	* Never rejects. A credential refused the list leaves every path as parsed, as before discovery was asked; any other
 	* failure is `undefined`, so a read of a path it could have settled keeps a miss out of the caches (see
 	* `readRepository`).
 	*/
 	async getCollectionNames(session) {
 		try {
-			return (await this.getProviderResourcesForUser(session))?.map((r) => r.name);
+			return { names: (await this.getProviderResourcesForUser(session))?.map((r) => r.name) };
 		} catch (ex) {
-			if (ex instanceof AuthenticationError) return [];
+			if (ex instanceof AuthenticationError) return { names: [] };
 			_logger.debug(`${this.name}: collections at ${this.apiBaseUrlFor(session)} couldn't be read to place a repository path`, ex);
-			return;
+			return {
+				names: void 0,
+				addressesCollection: this._collectionListRefusals.has(ex)
+			};
 		}
 	}
 	invalidateDiscoveryCaches() {
@@ -268,20 +265,29 @@ var AzureDevOpsServerIntegration = class extends AzureDevOpsIntegrationBase {
 	/**
 	* Only the server level lists the collections: below one, Azure DevOps Server answers `projectCollections` with a
 	* 404 page. On that 404 an address that names a collection reads the collection's own connection data, whose
-	* `webApplicationRelativeDirectory` spells it, and reports it as the one collection visible there.
+	* `webApplicationRelativeDirectory` spells it, and reports it as the one collection visible there. When that read
+	* fails, the address is presumed to name a collection, which the failure carries (see {@link getCollectionNames}) for
+	* as long as the failed discovery is kept; connection data that answers for the server says it doesn't.
 	*/
 	async requestResourcesForUser(session, userId) {
 		try {
 			return await super.requestResourcesForUser(session, userId);
 		} catch (ex) {
 			if (!(ex instanceof RequestNotFoundError)) throw ex;
-			const addressed = await (await this.authenticationService.apis.azure)?.getAddressedCollection(this, toTokenWithInfo(this.id, session), this.apiBaseUrlFor(session));
+			const azure = await this.authenticationService.apis.azure;
+			let addressed;
+			try {
+				addressed = await azure?.getAddressedCollection(this, toTokenWithInfo(this.id, session), this.apiBaseUrlFor(session));
+			} catch (collectionError) {
+				if (typeof collectionError === "object" && collectionError != null) this._collectionListRefusals.add(collectionError);
+				throw collectionError;
+			}
 			if (addressed == null) throw ex;
 			return [addressed];
 		}
 	}
 	/**
-	* The filtered work-item search: one WIQL query per page over ONE collection, then one detail read for the
+	* The filtered work-item search snapshots matching ids with bounded WIQL queries, then reads details for each
 	* page's slice. See {@link resolveWorkItemSearchScope} for why a search never spans several collections.
 	*/
 	async searchProviderIssuesPage(session, options, cancellation) {
@@ -293,7 +299,8 @@ var AzureDevOpsServerIntegration = class extends AzureDevOpsIntegrationBase {
 		return azure.searchWorkItemsPage(this, toTokenWithInfo(this.id, session), scope.collection, {
 			baseUrl: this.collectionApiBaseUrl(session, scope.collection),
 			criteria: options.criteria,
-			projectNames: scope.projectNames ?? scope.projects.map((p) => p.name),
+			projectNames: scope.projectNames,
+			workflowProjectNames: scope.projects.map((p) => p.name),
 			resolveProject: (name) => scope.projects.find((p) => sameAzureName(p.name, name)),
 			cursor: options.cursor,
 			pageSize: options.pageSize
@@ -316,7 +323,8 @@ var AzureDevOpsServerIntegration = class extends AzureDevOpsIntegrationBase {
 			return azure.countWorkItems(this, tokenWithInfo, scope.collection, {
 				baseUrl: this.collectionApiBaseUrl(session, scope.collection),
 				criteria: s.criteria,
-				projectNames: scope.projectNames ?? scope.projects.map((p) => p.name)
+				projectNames: scope.projectNames,
+				workflowProjectNames: scope.projects.map((p) => p.name)
 			}, cancellation);
 		}));
 	}
@@ -625,55 +633,9 @@ var AzureDevOpsServerIntegration = class extends AzureDevOpsIntegrationBase {
 			project: p
 		}));
 	}
-	_collectionUserIds = new PromiseCache({ capacity: 50 });
-	/**
-	* The current user's identity id in `collection`, read from the collection's own connection data, which is
-	* what Azure's creator and reviewer filters compare against. Cached per credential and collection, since it
-	* can't change for either.
-	*/
-	getFilterUserId(session, collection) {
-		const baseUrl = this.collectionApiBaseUrl(session, collection);
-		return this._collectionUserIds.getOrCreate(JSON.stringify([
-			session.accessToken,
-			baseUrl,
-			collection.toLowerCase()
-		]), async (cacheable) => {
-			const user = await (await this.authenticationService.apis.azure)?.getCurrentUserOnServer(this, toTokenWithInfo(this.id, session), `${baseUrl}/${encodeURIComponent(collection)}`);
-			if (user?.id == null) cacheable.invalidate();
-			return user?.id;
-		});
-	}
-	/**
-	* Resolved per collection, which a raw row names as its repository owner: a collection's pull requests carry the
-	* id {@link getFilterUserId} resolves there, never the server-level account's. A row that names no collection or
-	* has no author to match gets no viewer, nor does one in a collection whose id can't be read: its authorship
-	* stays unknown.
-	*/
-	async getPullRequestViewers(pullRequests, connectionId) {
-		const session = await this.resolveReadSessionOrThrow(connectionId, void 0);
-		if (session == null) return pullRequests.map(() => void 0);
-		const viewerFor = this.getOrganizationViewers(session, void 0);
-		return Promise.all(pullRequests.map((pr) => {
-			const collection = isNativePullRequest(pr) ? void 0 : pr.repository?.owner?.login;
-			return collection && pr.author != null ? viewerFor(collection) : Promise.resolve(void 0);
-		}));
-	}
-	/**
-	* Ignores `account`: it is the server-level one, which no collection's pull requests carry. A collection whose id
-	* can't be read resolves `undefined`, since authorship is optional enrichment and one collection'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, _account) {
-		const viewers = /* @__PURE__ */ new Map();
-		return (collection) => {
-			const key = collection.toLowerCase();
-			let viewer = viewers.get(key);
-			if (viewer == null) {
-				viewer = this.getFilterUserId(session, collection).then((id) => id != null ? { id } : void 0, () => void 0);
-				viewers.set(key, viewer);
-			}
-			return viewer;
-		};
+	/** Reads the collection's own connection data, at the installation's address. */
+	async requestOrganizationUserId(session, collection) {
+		return (await (await this.authenticationService.apis.azure)?.getCurrentUserOnServer(this, toTokenWithInfo(this.id, session), `${this.collectionApiBaseUrl(session, collection)}/${encodeURIComponent(collection)}`))?.id;
 	}
 	/** Every collection the account can see, or a refusal when discovery itself failed. */
 	async getSearchCollections(session) {
@@ -723,7 +685,6 @@ var AzureDevOpsServerIntegration = class extends AzureDevOpsIntegrationBase {
 		super.providerOnDisconnect();
 		this._pullRequestSearches.clear();
 		this._latestPullRequestSearches.clear();
-		this._collectionUserIds.clear();
 		this._collectionNames.clear();
 	}
 	async _requestForCurrentUser(session) {