Merge branch 'microsoft:main' into main

mdresch · Dec 4, 2024 · 3ce16e3 · 3ce16e3
2 parents 404ba8a + e2ecae2
commit 3ce16e3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/coe-cli/src/commands/devops.ts b/coe-cli/src/commands/devops.ts
@@ -1206,6 +1206,7 @@ class DevOpsCommand {
     }
 
     async getGitCommitChanges(args: DevOpsBranchArguments, gitApi: gitm.IGitApi, projectRepo: GitRepository, pipelineRepo: GitRepository, sourceBranch: string, destinationBranch: string, defaultBranch: string, names: string[]): Promise<GitChange[]> {
+        const personalAccessTokenRegexp = /^.{76}AZDO.{4}$/;
         let pipelineProject = args.pipelineProject?.length > 0 ? args.pipelineProject : args.projectName
         let results: GitChange[] = []
 
@@ -1215,7 +1216,7 @@ class DevOpsCommand {
                 'Authorization': `Bearer ${accessToken}`
             }
         }
-        if (accessToken.length === 52) {
+        if (accessToken.length === 52 || personalAccessTokenRegexp.test(accessToken)) {
             config = {
                 headers: {
                     'Authorization': `Basic ${Buffer.from(":" + accessToken).toString('base64')}`