Updated check for new PAT format (#8985)

jankolarikMSFT · web-flow · commit e2ecae21f13d · 2024-10-16T06:40:22.000-07:00
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')}`

Original file line number	Diff line number	Diff line change
`@@ -1206,6 +1206,7 @@ class DevOpsCommand {`
`1206`	`1206`	`}`
`1207`	`1207`
`1208`	`1208`	`async getGitCommitChanges(args: DevOpsBranchArguments, gitApi: gitm.IGitApi, projectRepo: GitRepository, pipelineRepo: GitRepository, sourceBranch: string, destinationBranch: string, defaultBranch: string, names: string[]): Promise<GitChange[]> {`
	`1209`	`+ const personalAccessTokenRegexp = /^.{76}AZDO.{4}$/;`
`1209`	`1210`	`let pipelineProject = args.pipelineProject?.length > 0 ? args.pipelineProject : args.projectName`
`1210`	`1211`	`let results: GitChange[] = []`
`1211`	`1212`
`@@ -1215,7 +1216,7 @@ class DevOpsCommand {`
`1215`	`1216`	'Authorization': `Bearer ${accessToken}`
`1216`	`1217`	`}`
`1217`	`1218`	`}`
`1218`		`- if (accessToken.length === 52) {`
	`1219`	`+ if (accessToken.length === 52 \|\| personalAccessTokenRegexp.test(accessToken)) {`
`1219`	`1220`	`config = {`
`1220`	`1221`	`headers: {`
`1221`	`1222`	'Authorization': `Basic ${Buffer.from(":" + accessToken).toString('base64')}`