Uses PAT on shared provider library requests from Azure

Author: axosoft-ramint

src/plus/integrations/providers/azureDevOps.ts

@@ -81,7 +81,10 @@ export class AzureDevOpsIntegration extends HostingIntegration<
 			const account = await this.getProviderCurrentAccount(session);
 			if (account?.id == null) return undefined;
 
-			const resources = await api.getAzureResourcesForUser(account.id, { accessToken: accessToken });
+			const resources = await api.getAzureResourcesForUser(account.id, {
+				accessToken: btoa(`PAT:${accessToken}`),
+				isPAT: true,
+			});
 			this._organizations.set(
 				accessToken,
 				resources != null ? resources.map(r => ({ ...r, key: r.id })) : undefined,
@@ -117,7 +120,10 @@ export class AzureDevOpsIntegration extends HostingIntegration<
 			const azureProjects = (
 				await Promise.allSettled(
 					resourcesWithoutProjects.map(resource =>
-						api.getAzureProjectsForResource(resource.name, { accessToken: accessToken }),
+						api.getAzureProjectsForResource(resource.name, {
+							accessToken: btoa(`PAT:${accessToken}`),
+							isPAT: true,
+						}),
 					),
 				)
 			)
@@ -164,7 +170,8 @@ export class AzureDevOpsIntegration extends HostingIntegration<
 			projects.map(async project => {
 				const repos = (
 					await api.getReposForAzureProject(project.resourceName, project.name, {
-						accessToken: accessToken,
+						accessToken: btoa(`PAT:${accessToken}`),
+						isPAT: true,
 					})
 				)?.values;
 				if (repos != null && repos.length > 0) {
@@ -202,7 +209,8 @@ export class AzureDevOpsIntegration extends HostingIntegration<
 		try {
 			const merged = await api.mergePullRequest(this.id, pr, {
 				...options,
-				accessToken: accessToken,
+				accessToken: btoa(`PAT:${accessToken}`),
+				isPAT: true,
 			});
 			return merged;
 		} catch (ex) {
@@ -306,8 +314,11 @@ export class AzureDevOpsIntegration extends HostingIntegration<
 		project: string;
 	}): Promise<ProviderRepository | undefined> {
 		const api = await this.getProvidersApi();
+		if (this._session == null) return undefined;
+
 		return api.getRepo(this.id, repo.owner, repo.name, repo.project, {
-			accessToken: this._session?.accessToken,
+			accessToken: btoa(`PAT:${this._session.accessToken}`),
+			isPAT: true,
 		});
 	}
 
@@ -347,13 +358,15 @@ export class AzureDevOpsIntegration extends HostingIntegration<
 		const projectInputs = projects.map(p => ({ namespace: p.resourceName, project: p.name }));
 		const assignedPrs = (
 			await api.getPullRequestsForAzureProjects(projectInputs, {
-				accessToken: session.accessToken,
+				accessToken: btoa(`PAT:${session.accessToken}`),
+				isPAT: true,
 				assigneeLogins: [user.username],
 			})
 		)?.map(pr => this.fromAzureProviderPullRequest(pr, repoDescriptors, projects));
 		const authoredPrs = (
 			await api.getPullRequestsForAzureProjects(projectInputs, {
-				accessToken: session.accessToken,
+				accessToken: btoa(`PAT:${session.accessToken}`),
+				isPAT: true,
 				authorLogin: user.username,
 			})
 		)?.map(pr => this.fromAzureProviderPullRequest(pr, repoDescriptors, projects));
@@ -392,7 +405,8 @@ export class AzureDevOpsIntegration extends HostingIntegration<
 				projects.map(async p => {
 					const issuesResponse = (
 						await api.getIssuesForAzureProject(p.resourceName, p.name, {
-							accessToken: session.accessToken,
+							accessToken: btoa(`PAT:${session.accessToken}`),
+							isPAT: true,
 							assigneeLogins: [user.username!],
 						})
 					).values;

src/plus/integrations/providers/providersApi.ts

@@ -611,7 +611,7 @@ export class ProvidersApi {
 
 	async getAzureResourcesForUser(
 		userId: string,
-		options?: { accessToken?: string },
+		options?: { accessToken?: string; isPAT?: boolean },
 	): Promise<ProviderAzureResource[] | undefined> {
 		const { provider, token } = await this.ensureProviderTokenAndFunction(
 			HostingIntegrationId.AzureDevOps,
@@ -620,7 +620,9 @@ export class ProvidersApi {
 		);
 
 		try {
-			return (await provider.getAzureResourcesForUserFn?.({ userId: userId }, { token: token }))?.data;
+			return (
+				await provider.getAzureResourcesForUserFn?.({ userId: userId }, { token: token, isPAT: options?.isPAT })
+			)?.data;
 		} catch (e) {
 			return this.handleProviderError<ProviderAzureResource[] | undefined>(
 				HostingIntegrationId.AzureDevOps,
@@ -732,7 +734,7 @@ export class ProvidersApi {
 				provider.getAzureProjectsForResourceFn,
 				azureToken,
 				options?.cursor,
-				true,
+				options?.isPAT,
 			);
 		} catch (e) {
 			return this.handleProviderError<PagedResult<ProviderAzureProject>>(
@@ -746,7 +748,7 @@ export class ProvidersApi {
 	async getReposForAzureProject(
 		namespace: string,
 		project: string,
-		options?: GetReposOptions & { accessToken?: string },
+		options?: GetReposOptions & { accessToken?: string; isPAT?: boolean },
 	): Promise<PagedResult<ProviderRepository>> {
 		const { provider, token } = await this.ensureProviderTokenAndFunction(
 			HostingIntegrationId.AzureDevOps,
@@ -760,6 +762,7 @@ export class ProvidersApi {
 			provider.getReposForAzureProjectFn,
 			token,
 			options?.cursor,
+			options?.isPAT,
 		);
 	}
 
@@ -864,7 +867,7 @@ export class ProvidersApi {
 			return (
 				await provider.getPullRequestsForAzureProjectsFn?.(
 					{ projects: projects, ...options },
-					{ token: azureToken, isPAT: true },
+					{ token: azureToken, isPAT: options?.isPAT },
 				)
 			)?.data;
 		} catch (e) {
@@ -971,7 +974,7 @@ export class ProvidersApi {
 	async getIssuesForAzureProject(
 		namespace: string,
 		project: string,
-		options?: GetIssuesOptions & { accessToken?: string },
+		options?: GetIssuesOptions & { accessToken?: string; isPAT?: boolean },
 	): Promise<PagedResult<ProviderIssue>> {
 		const { provider, token } = await this.ensureProviderTokenAndFunction(
 			HostingIntegrationId.AzureDevOps,
@@ -985,6 +988,7 @@ export class ProvidersApi {
 			provider.getIssuesForAzureProjectFn,
 			token,
 			options?.cursor,
+			options?.isPAT,
 		);
 	}