Skip to content

Uses PAT on shared provider library requests from Azure #4272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 30, 2025
Merged

Uses PAT on shared provider library requests from Azure #4272

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6d8fc1
Uses PAT on shared provider library requests from Azure
axosoft-ramint Apr 30, 2025
41dc42a
Uses our base64 function to avoid btoa issues
eamodio Apr 30, 2025
c0e5d9f
Also updates local Azure queries
axosoft-ramint Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions src/plus/integrations/providers/azureDevOps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import type { IssueOrPullRequest } from '../../../git/models/issueOrPullRequest'
import type { PullRequest, PullRequestMergeMethod, PullRequestState } from '../../../git/models/pullRequest';
import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata';
import { getSettledValue } from '../../../system/promise';
import { base64 } from '../../../system/string';
import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthenticationProvider';
import { HostingIntegration } from '../integration';
import type {
Expand Down Expand Up @@ -81,7 +82,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: convertTokentoPAT(accessToken),
isPAT: true,
});
this._organizations.set(
accessToken,
resources != null ? resources.map(r => ({ ...r, key: r.id })) : undefined,
Expand Down Expand Up @@ -117,7 +121,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: convertTokentoPAT(accessToken),
isPAT: true,
}),
),
)
)
Expand Down Expand Up @@ -164,7 +171,8 @@ export class AzureDevOpsIntegration extends HostingIntegration<
projects.map(async project => {
const repos = (
await api.getReposForAzureProject(project.resourceName, project.name, {
accessToken: accessToken,
accessToken: convertTokentoPAT(accessToken),
isPAT: true,
})
)?.values;
if (repos != null && repos.length > 0) {
Expand Down Expand Up @@ -202,7 +210,8 @@ export class AzureDevOpsIntegration extends HostingIntegration<
try {
const merged = await api.mergePullRequest(this.id, pr, {
...options,
accessToken: accessToken,
accessToken: convertTokentoPAT(accessToken),
isPAT: true,
});
return merged;
} catch (ex) {
Expand Down Expand Up @@ -306,8 +315,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: convertTokentoPAT(this._session.accessToken),
isPAT: true,
});
}

Expand Down Expand Up @@ -347,13 +359,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: convertTokentoPAT(session.accessToken),
isPAT: true,
assigneeLogins: [user.username],
})
)?.map(pr => this.fromAzureProviderPullRequest(pr, repoDescriptors, projects));
const authoredPrs = (
await api.getPullRequestsForAzureProjects(projectInputs, {
accessToken: session.accessToken,
accessToken: convertTokentoPAT(session.accessToken),
isPAT: true,
authorLogin: user.username,
})
)?.map(pr => this.fromAzureProviderPullRequest(pr, repoDescriptors, projects));
Expand Down Expand Up @@ -392,7 +406,8 @@ export class AzureDevOpsIntegration extends HostingIntegration<
projects.map(async p => {
const issuesResponse = (
await api.getIssuesForAzureProject(p.resourceName, p.name, {
accessToken: session.accessToken,
accessToken: convertTokentoPAT(session.accessToken),
isPAT: true,
assigneeLogins: [user.username!],
})
).values;
Expand Down Expand Up @@ -547,3 +562,7 @@ const azureCloudDomainRegex = /^dev\.azure\.com$|\bvisualstudio\.com$/i;
export function isAzureCloudDomain(domain: string | undefined): boolean {
return domain != null && azureCloudDomainRegex.test(domain);
}

function convertTokentoPAT(accessToken: string): string {
return base64(`PAT:${accessToken}`);
}
16 changes: 10 additions & 6 deletions src/plus/integrations/providers/providersApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -732,7 +734,7 @@ export class ProvidersApi {
provider.getAzureProjectsForResourceFn,
azureToken,
options?.cursor,
true,
options?.isPAT,
);
} catch (e) {
return this.handleProviderError<PagedResult<ProviderAzureProject>>(
Expand All @@ -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,
Expand All @@ -760,6 +762,7 @@ export class ProvidersApi {
provider.getReposForAzureProjectFn,
token,
options?.cursor,
options?.isPAT,
);
}

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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,
Expand All @@ -985,6 +988,7 @@ export class ProvidersApi {
provider.getIssuesForAzureProjectFn,
token,
options?.cursor,
options?.isPAT,
);
}

Expand Down