From e37b9a7919f38bfb66e8fde5a4c5a33154df70a8 Mon Sep 17 00:00:00 2001 From: Maxim Zaytsev Date: Fri, 20 Sep 2024 15:13:27 +0200 Subject: [PATCH] Updated checks to new PAT format (#20436) * Update AzureTestPlanV0 Co-authored-by: Jan Kolarik jankolarik@microsoft.com * Update AppCenterTestV1 --- Tasks/AppCenterTestV1/appcentertest.ts | 3 +- Tasks/AppCenterTestV1/task.json | 2 +- Tasks/AppCenterTestV1/task.loc.json | 2 +- Tasks/AzureTestPlanV0/package-lock.json | 78 +++++++++---------- Tasks/AzureTestPlanV0/task.json | 2 +- Tasks/AzureTestPlanV0/task.loc.json | 2 +- Tasks/AzureTestPlanV0/testPlanData.ts | 6 +- _generated/AppCenterTestV1.versionmap.txt | 4 +- _generated/AppCenterTestV1/appcentertest.ts | 3 +- _generated/AppCenterTestV1/task.json | 6 +- _generated/AppCenterTestV1/task.loc.json | 6 +- .../AppCenterTestV1_Node20/appcentertest.ts | 3 +- _generated/AppCenterTestV1_Node20/task.json | 6 +- .../AppCenterTestV1_Node20/task.loc.json | 6 +- _generated/AzureTestPlanV0.versionmap.txt | 4 +- _generated/AzureTestPlanV0/package-lock.json | 78 +++++++++---------- _generated/AzureTestPlanV0/task.json | 6 +- _generated/AzureTestPlanV0/task.loc.json | 6 +- _generated/AzureTestPlanV0/testPlanData.ts | 6 +- _generated/AzureTestPlanV0_Node20/task.json | 6 +- .../AzureTestPlanV0_Node20/task.loc.json | 6 +- .../AzureTestPlanV0_Node20/testPlanData.ts | 6 +- 22 files changed, 128 insertions(+), 119 deletions(-) diff --git a/Tasks/AppCenterTestV1/appcentertest.ts b/Tasks/AppCenterTestV1/appcentertest.ts index bc8904d272f0..20abe89a2579 100644 --- a/Tasks/AppCenterTestV1/appcentertest.ts +++ b/Tasks/AppCenterTestV1/appcentertest.ts @@ -9,6 +9,7 @@ import { ToolRunner } from 'azure-pipelines-task-lib/toolrunner'; var utils = require('./utils.js'); const testRunIdLineRegexp = /Test run id: "([^"]+)"/; +const personalAccessTokenRegexp = /^.{76}AZDO.{4}$/; function getEndpointAPIToken(endpointInputFieldName) { var errorMessage = tl.loc("CannotDecodeEndpoint"); @@ -206,7 +207,7 @@ async function setTestRunIdBuildPropertyAsync(testRunId: string) { let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false); let projectId = tl.getVariable('System.TeamProjectId'); let buildId = tl.getVariable('Build.BuildId'); - let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); + let auth = token.length == (52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); let vsts: apim.WebApi = new apim.WebApi(url, auth); let conn: lim.ConnectionData = await vsts.connect(); let buildApi = await vsts.getBuildApi(); diff --git a/Tasks/AppCenterTestV1/task.json b/Tasks/AppCenterTestV1/task.json index 4a3069d17ffd..6eec38bb3f81 100644 --- a/Tasks/AppCenterTestV1/task.json +++ b/Tasks/AppCenterTestV1/task.json @@ -13,7 +13,7 @@ "version": { "Major": 1, "Minor": 246, - "Patch": 0 + "Patch": 2 }, "minimumAgentVersion": "2.206.1", "groups": [ diff --git a/Tasks/AppCenterTestV1/task.loc.json b/Tasks/AppCenterTestV1/task.loc.json index ee515dc31a3c..a102fd316f2b 100644 --- a/Tasks/AppCenterTestV1/task.loc.json +++ b/Tasks/AppCenterTestV1/task.loc.json @@ -13,7 +13,7 @@ "version": { "Major": 1, "Minor": 246, - "Patch": 0 + "Patch": 2 }, "minimumAgentVersion": "2.206.1", "groups": [ diff --git a/Tasks/AzureTestPlanV0/package-lock.json b/Tasks/AzureTestPlanV0/package-lock.json index f6425a2bd5cd..3a06b6479518 100644 --- a/Tasks/AzureTestPlanV0/package-lock.json +++ b/Tasks/AzureTestPlanV0/package-lock.json @@ -208,6 +208,45 @@ "debug": "4" } }, + "msalv1": { + "version": "npm:@azure/msal-node@1.18.4", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", + "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", + "requires": { + "@azure/msal-common": "13.3.1", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } + } + }, + "msalv2": { + "version": "npm:@azure/msal-node@2.13.1", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.13.1.tgz", + "integrity": "sha512-sijfzPNorKt6+9g1/miHwhj6Iapff4mPQx1azmmZExgzUROqWTM1o3ACyxDja0g47VpowFy/sxTM/WsuCyXTiw==", + "requires": { + "@azure/msal-common": "14.14.2", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "@azure/msal-common": { + "version": "14.14.2", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.2.tgz", + "integrity": "sha512-XV0P5kSNwDwCA/SjIxTe9mEAsKB0NqGNSuaVrkCCE2lAyBr/D6YtD80Vkdp4tjWnPFwjzkwldjr1xU/facOJog==" + }, + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } + } + }, "typed-rest-client": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", @@ -689,45 +728,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "msalv1": { - "version": "npm:@azure/msal-node@1.18.4", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", - "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", - "requires": { - "@azure/msal-common": "13.3.1", - "jsonwebtoken": "^9.0.0", - "uuid": "^8.3.0" - }, - "dependencies": { - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - } - } - }, - "msalv2": { - "version": "npm:@azure/msal-node@2.13.1", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.13.1.tgz", - "integrity": "sha512-sijfzPNorKt6+9g1/miHwhj6Iapff4mPQx1azmmZExgzUROqWTM1o3ACyxDja0g47VpowFy/sxTM/WsuCyXTiw==", - "requires": { - "@azure/msal-common": "14.14.2", - "jsonwebtoken": "^9.0.0", - "uuid": "^8.3.0" - }, - "dependencies": { - "@azure/msal-common": { - "version": "14.14.2", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.2.tgz", - "integrity": "sha512-XV0P5kSNwDwCA/SjIxTe9mEAsKB0NqGNSuaVrkCCE2lAyBr/D6YtD80Vkdp4tjWnPFwjzkwldjr1xU/facOJog==" - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - } - } - }, "node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", diff --git a/Tasks/AzureTestPlanV0/task.json b/Tasks/AzureTestPlanV0/task.json index f81943b79972..2c55237a284c 100644 --- a/Tasks/AzureTestPlanV0/task.json +++ b/Tasks/AzureTestPlanV0/task.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 245, + "Minor": 246, "Patch": 0 }, "preview": true, diff --git a/Tasks/AzureTestPlanV0/task.loc.json b/Tasks/AzureTestPlanV0/task.loc.json index 322eb301700a..85cbc6ad84db 100644 --- a/Tasks/AzureTestPlanV0/task.loc.json +++ b/Tasks/AzureTestPlanV0/task.loc.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 245, + "Minor": 246, "Patch": 0 }, "preview": true, diff --git a/Tasks/AzureTestPlanV0/testPlanData.ts b/Tasks/AzureTestPlanV0/testPlanData.ts index 0695a249ee1e..e16b68ccf635 100644 --- a/Tasks/AzureTestPlanV0/testPlanData.ts +++ b/Tasks/AzureTestPlanV0/testPlanData.ts @@ -9,6 +9,8 @@ import VSSInterfaces = require('azure-devops-node-api/interfaces/common/VSSInter import constants = require('./constants'); import { ITestResultsApi } from "azure-devops-node-api/TestResultsApi"; +const personalAccessTokenRegexp = /^.{76}AZDO.{4}$/; + export interface TestPlanData { listOfFQNOfTestCases: string[]; testPlanId: number; @@ -186,7 +188,7 @@ export async function getTestCaseListAsync(testPlanId: number, testSuiteId: numb let url = tl.getEndpointUrl('SYSTEMVSSCONNECTION', false); let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false); let projectId = tl.getVariable('System.TeamProjectId'); - let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); + let auth = (token.length == 52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); let vsts: apim.WebApi = new apim.WebApi(url, auth); let testPlanApi = await vsts.getTestPlanApi(); @@ -278,7 +280,7 @@ export async function getTestResultApiClient(){ let url = tl.getEndpointUrl('SYSTEMVSSCONNECTION', false); let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false); - let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); + let auth = (token.length == 52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); let vsts: apim.WebApi = new apim.WebApi(url, auth); let testResultsApi = await vsts.getTestResultsApi(); diff --git a/_generated/AppCenterTestV1.versionmap.txt b/_generated/AppCenterTestV1.versionmap.txt index 29d8871676f7..ec67d7f258a2 100644 --- a/_generated/AppCenterTestV1.versionmap.txt +++ b/_generated/AppCenterTestV1.versionmap.txt @@ -1,2 +1,2 @@ -Default|1.246.0 -Node20_229_7|1.246.1 +Default|1.246.2 +Node20_229_7|1.246.3 diff --git a/_generated/AppCenterTestV1/appcentertest.ts b/_generated/AppCenterTestV1/appcentertest.ts index bc8904d272f0..20abe89a2579 100644 --- a/_generated/AppCenterTestV1/appcentertest.ts +++ b/_generated/AppCenterTestV1/appcentertest.ts @@ -9,6 +9,7 @@ import { ToolRunner } from 'azure-pipelines-task-lib/toolrunner'; var utils = require('./utils.js'); const testRunIdLineRegexp = /Test run id: "([^"]+)"/; +const personalAccessTokenRegexp = /^.{76}AZDO.{4}$/; function getEndpointAPIToken(endpointInputFieldName) { var errorMessage = tl.loc("CannotDecodeEndpoint"); @@ -206,7 +207,7 @@ async function setTestRunIdBuildPropertyAsync(testRunId: string) { let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false); let projectId = tl.getVariable('System.TeamProjectId'); let buildId = tl.getVariable('Build.BuildId'); - let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); + let auth = token.length == (52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); let vsts: apim.WebApi = new apim.WebApi(url, auth); let conn: lim.ConnectionData = await vsts.connect(); let buildApi = await vsts.getBuildApi(); diff --git a/_generated/AppCenterTestV1/task.json b/_generated/AppCenterTestV1/task.json index 728af244afdd..bab152d5c051 100644 --- a/_generated/AppCenterTestV1/task.json +++ b/_generated/AppCenterTestV1/task.json @@ -13,7 +13,7 @@ "version": { "Major": 1, "Minor": 246, - "Patch": 0 + "Patch": 2 }, "minimumAgentVersion": "2.206.1", "groups": [ @@ -499,7 +499,7 @@ "FoundMultipleFiles": "Found multiple files matching %s." }, "_buildConfigMapping": { - "Default": "1.246.0", - "Node20_229_7": "1.246.1" + "Default": "1.246.2", + "Node20_229_7": "1.246.3" } } \ No newline at end of file diff --git a/_generated/AppCenterTestV1/task.loc.json b/_generated/AppCenterTestV1/task.loc.json index c44ca67bf947..dd8f3594014e 100644 --- a/_generated/AppCenterTestV1/task.loc.json +++ b/_generated/AppCenterTestV1/task.loc.json @@ -13,7 +13,7 @@ "version": { "Major": 1, "Minor": 246, - "Patch": 0 + "Patch": 2 }, "minimumAgentVersion": "2.206.1", "groups": [ @@ -499,7 +499,7 @@ "FoundMultipleFiles": "ms-resource:loc.messages.FoundMultipleFiles" }, "_buildConfigMapping": { - "Default": "1.246.0", - "Node20_229_7": "1.246.1" + "Default": "1.246.2", + "Node20_229_7": "1.246.3" } } \ No newline at end of file diff --git a/_generated/AppCenterTestV1_Node20/appcentertest.ts b/_generated/AppCenterTestV1_Node20/appcentertest.ts index bc8904d272f0..20abe89a2579 100644 --- a/_generated/AppCenterTestV1_Node20/appcentertest.ts +++ b/_generated/AppCenterTestV1_Node20/appcentertest.ts @@ -9,6 +9,7 @@ import { ToolRunner } from 'azure-pipelines-task-lib/toolrunner'; var utils = require('./utils.js'); const testRunIdLineRegexp = /Test run id: "([^"]+)"/; +const personalAccessTokenRegexp = /^.{76}AZDO.{4}$/; function getEndpointAPIToken(endpointInputFieldName) { var errorMessage = tl.loc("CannotDecodeEndpoint"); @@ -206,7 +207,7 @@ async function setTestRunIdBuildPropertyAsync(testRunId: string) { let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false); let projectId = tl.getVariable('System.TeamProjectId'); let buildId = tl.getVariable('Build.BuildId'); - let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); + let auth = token.length == (52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); let vsts: apim.WebApi = new apim.WebApi(url, auth); let conn: lim.ConnectionData = await vsts.connect(); let buildApi = await vsts.getBuildApi(); diff --git a/_generated/AppCenterTestV1_Node20/task.json b/_generated/AppCenterTestV1_Node20/task.json index 38abbd49215b..e953c16b2967 100644 --- a/_generated/AppCenterTestV1_Node20/task.json +++ b/_generated/AppCenterTestV1_Node20/task.json @@ -13,7 +13,7 @@ "version": { "Major": 1, "Minor": 246, - "Patch": 1 + "Patch": 3 }, "minimumAgentVersion": "2.206.1", "groups": [ @@ -503,7 +503,7 @@ "FoundMultipleFiles": "Found multiple files matching %s." }, "_buildConfigMapping": { - "Default": "1.246.0", - "Node20_229_7": "1.246.1" + "Default": "1.246.2", + "Node20_229_7": "1.246.3" } } \ No newline at end of file diff --git a/_generated/AppCenterTestV1_Node20/task.loc.json b/_generated/AppCenterTestV1_Node20/task.loc.json index b430d38a0844..a926565f0840 100644 --- a/_generated/AppCenterTestV1_Node20/task.loc.json +++ b/_generated/AppCenterTestV1_Node20/task.loc.json @@ -13,7 +13,7 @@ "version": { "Major": 1, "Minor": 246, - "Patch": 1 + "Patch": 3 }, "minimumAgentVersion": "2.206.1", "groups": [ @@ -503,7 +503,7 @@ "FoundMultipleFiles": "ms-resource:loc.messages.FoundMultipleFiles" }, "_buildConfigMapping": { - "Default": "1.246.0", - "Node20_229_7": "1.246.1" + "Default": "1.246.2", + "Node20_229_7": "1.246.3" } } \ No newline at end of file diff --git a/_generated/AzureTestPlanV0.versionmap.txt b/_generated/AzureTestPlanV0.versionmap.txt index 1276f9dbe098..646593db63ea 100644 --- a/_generated/AzureTestPlanV0.versionmap.txt +++ b/_generated/AzureTestPlanV0.versionmap.txt @@ -1,2 +1,2 @@ -Default|0.245.0 -Node20-225|0.245.1 +Default|0.246.0 +Node20-225|0.246.1 diff --git a/_generated/AzureTestPlanV0/package-lock.json b/_generated/AzureTestPlanV0/package-lock.json index f6425a2bd5cd..3a06b6479518 100644 --- a/_generated/AzureTestPlanV0/package-lock.json +++ b/_generated/AzureTestPlanV0/package-lock.json @@ -208,6 +208,45 @@ "debug": "4" } }, + "msalv1": { + "version": "npm:@azure/msal-node@1.18.4", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", + "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", + "requires": { + "@azure/msal-common": "13.3.1", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } + } + }, + "msalv2": { + "version": "npm:@azure/msal-node@2.13.1", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.13.1.tgz", + "integrity": "sha512-sijfzPNorKt6+9g1/miHwhj6Iapff4mPQx1azmmZExgzUROqWTM1o3ACyxDja0g47VpowFy/sxTM/WsuCyXTiw==", + "requires": { + "@azure/msal-common": "14.14.2", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "@azure/msal-common": { + "version": "14.14.2", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.2.tgz", + "integrity": "sha512-XV0P5kSNwDwCA/SjIxTe9mEAsKB0NqGNSuaVrkCCE2lAyBr/D6YtD80Vkdp4tjWnPFwjzkwldjr1xU/facOJog==" + }, + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } + } + }, "typed-rest-client": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", @@ -689,45 +728,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "msalv1": { - "version": "npm:@azure/msal-node@1.18.4", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", - "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", - "requires": { - "@azure/msal-common": "13.3.1", - "jsonwebtoken": "^9.0.0", - "uuid": "^8.3.0" - }, - "dependencies": { - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - } - } - }, - "msalv2": { - "version": "npm:@azure/msal-node@2.13.1", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.13.1.tgz", - "integrity": "sha512-sijfzPNorKt6+9g1/miHwhj6Iapff4mPQx1azmmZExgzUROqWTM1o3ACyxDja0g47VpowFy/sxTM/WsuCyXTiw==", - "requires": { - "@azure/msal-common": "14.14.2", - "jsonwebtoken": "^9.0.0", - "uuid": "^8.3.0" - }, - "dependencies": { - "@azure/msal-common": { - "version": "14.14.2", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.2.tgz", - "integrity": "sha512-XV0P5kSNwDwCA/SjIxTe9mEAsKB0NqGNSuaVrkCCE2lAyBr/D6YtD80Vkdp4tjWnPFwjzkwldjr1xU/facOJog==" - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - } - } - }, "node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", diff --git a/_generated/AzureTestPlanV0/task.json b/_generated/AzureTestPlanV0/task.json index 6f71e58510e6..3da1469aae64 100644 --- a/_generated/AzureTestPlanV0/task.json +++ b/_generated/AzureTestPlanV0/task.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 245, + "Minor": 246, "Patch": 0 }, "preview": true, @@ -178,7 +178,7 @@ "MultipleMatchingGradlewFound": "Multiple gradlew files found. Selecting the first matched instance" }, "_buildConfigMapping": { - "Default": "0.245.0", - "Node20-225": "0.245.1" + "Default": "0.246.0", + "Node20-225": "0.246.1" } } \ No newline at end of file diff --git a/_generated/AzureTestPlanV0/task.loc.json b/_generated/AzureTestPlanV0/task.loc.json index 2e6c2637fe6a..1e16479cf719 100644 --- a/_generated/AzureTestPlanV0/task.loc.json +++ b/_generated/AzureTestPlanV0/task.loc.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 245, + "Minor": 246, "Patch": 0 }, "preview": true, @@ -178,7 +178,7 @@ "MultipleMatchingGradlewFound": "ms-resource:loc.messages.MultipleMatchingGradlewFound" }, "_buildConfigMapping": { - "Default": "0.245.0", - "Node20-225": "0.245.1" + "Default": "0.246.0", + "Node20-225": "0.246.1" } } \ No newline at end of file diff --git a/_generated/AzureTestPlanV0/testPlanData.ts b/_generated/AzureTestPlanV0/testPlanData.ts index 0695a249ee1e..e16b68ccf635 100644 --- a/_generated/AzureTestPlanV0/testPlanData.ts +++ b/_generated/AzureTestPlanV0/testPlanData.ts @@ -9,6 +9,8 @@ import VSSInterfaces = require('azure-devops-node-api/interfaces/common/VSSInter import constants = require('./constants'); import { ITestResultsApi } from "azure-devops-node-api/TestResultsApi"; +const personalAccessTokenRegexp = /^.{76}AZDO.{4}$/; + export interface TestPlanData { listOfFQNOfTestCases: string[]; testPlanId: number; @@ -186,7 +188,7 @@ export async function getTestCaseListAsync(testPlanId: number, testSuiteId: numb let url = tl.getEndpointUrl('SYSTEMVSSCONNECTION', false); let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false); let projectId = tl.getVariable('System.TeamProjectId'); - let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); + let auth = (token.length == 52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); let vsts: apim.WebApi = new apim.WebApi(url, auth); let testPlanApi = await vsts.getTestPlanApi(); @@ -278,7 +280,7 @@ export async function getTestResultApiClient(){ let url = tl.getEndpointUrl('SYSTEMVSSCONNECTION', false); let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false); - let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); + let auth = (token.length == 52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); let vsts: apim.WebApi = new apim.WebApi(url, auth); let testResultsApi = await vsts.getTestResultsApi(); diff --git a/_generated/AzureTestPlanV0_Node20/task.json b/_generated/AzureTestPlanV0_Node20/task.json index 498b371bbde1..890071645054 100644 --- a/_generated/AzureTestPlanV0_Node20/task.json +++ b/_generated/AzureTestPlanV0_Node20/task.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 245, + "Minor": 246, "Patch": 1 }, "preview": true, @@ -182,7 +182,7 @@ "MultipleMatchingGradlewFound": "Multiple gradlew files found. Selecting the first matched instance" }, "_buildConfigMapping": { - "Default": "0.245.0", - "Node20-225": "0.245.1" + "Default": "0.246.0", + "Node20-225": "0.246.1" } } \ No newline at end of file diff --git a/_generated/AzureTestPlanV0_Node20/task.loc.json b/_generated/AzureTestPlanV0_Node20/task.loc.json index c3c74565e00c..bfb02dac55d8 100644 --- a/_generated/AzureTestPlanV0_Node20/task.loc.json +++ b/_generated/AzureTestPlanV0_Node20/task.loc.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 245, + "Minor": 246, "Patch": 1 }, "preview": true, @@ -182,7 +182,7 @@ "MultipleMatchingGradlewFound": "ms-resource:loc.messages.MultipleMatchingGradlewFound" }, "_buildConfigMapping": { - "Default": "0.245.0", - "Node20-225": "0.245.1" + "Default": "0.246.0", + "Node20-225": "0.246.1" } } \ No newline at end of file diff --git a/_generated/AzureTestPlanV0_Node20/testPlanData.ts b/_generated/AzureTestPlanV0_Node20/testPlanData.ts index 0695a249ee1e..e16b68ccf635 100644 --- a/_generated/AzureTestPlanV0_Node20/testPlanData.ts +++ b/_generated/AzureTestPlanV0_Node20/testPlanData.ts @@ -9,6 +9,8 @@ import VSSInterfaces = require('azure-devops-node-api/interfaces/common/VSSInter import constants = require('./constants'); import { ITestResultsApi } from "azure-devops-node-api/TestResultsApi"; +const personalAccessTokenRegexp = /^.{76}AZDO.{4}$/; + export interface TestPlanData { listOfFQNOfTestCases: string[]; testPlanId: number; @@ -186,7 +188,7 @@ export async function getTestCaseListAsync(testPlanId: number, testSuiteId: numb let url = tl.getEndpointUrl('SYSTEMVSSCONNECTION', false); let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false); let projectId = tl.getVariable('System.TeamProjectId'); - let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); + let auth = (token.length == 52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); let vsts: apim.WebApi = new apim.WebApi(url, auth); let testPlanApi = await vsts.getTestPlanApi(); @@ -278,7 +280,7 @@ export async function getTestResultApiClient(){ let url = tl.getEndpointUrl('SYSTEMVSSCONNECTION', false); let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false); - let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); + let auth = (token.length == 52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token); let vsts: apim.WebApi = new apim.WebApi(url, auth); let testResultsApi = await vsts.getTestResultsApi();