diff --git a/package.json b/package.json index f6dc800..7dd30e0 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ { "id": "microsoft", "scopes": [ - "https://app.vssps.visualstudio.com/user_impersonation" + "499b84ac-1321-427f-aa17-267ca6975798/.default" ] } ], diff --git a/src-tests/authenticationTest.js b/src-tests/authenticationTest.js index bb168bb..ffe8032 100644 --- a/src-tests/authenticationTest.js +++ b/src-tests/authenticationTest.js @@ -19,7 +19,7 @@ async function testAuthenticationImplementation() { // Check for Microsoft authentication implementation const hasMicrosoftAuth = funcString.includes("vscode.authentication.getSession") && funcString.includes("microsoft") && - funcString.includes("https://app.vssps.visualstudio.com/user_impersonation"); + funcString.includes("499b84ac-1321-427f-aa17-267ca6975798/.default"); if (!hasMicrosoftAuth) { console.error("❌ Microsoft authentication implementation not found"); console.log("Function source preview:", funcString.substring(0, 200) + "..."); @@ -43,7 +43,7 @@ async function testAuthenticationImplementation() { console.log("✅ PAT token fallback implementation found"); // Check for user prompt options const hasUserPrompts = funcString.includes("Sign In") && - funcString.includes("Open Settings") && + funcString.includes("Configure PAT Token") && funcString.includes("showWarningMessage"); if (!hasUserPrompts) { console.error("❌ User prompt implementation not found"); diff --git a/src-tests/authenticationTest.js.map b/src-tests/authenticationTest.js.map index cea515f..0415c55 100644 --- a/src-tests/authenticationTest.js.map +++ b/src-tests/authenticationTest.js.map @@ -1 +1 @@ -{"version":3,"file":"authenticationTest.js","sourceRoot":"","sources":["authenticationTest.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"authenticationTest.js","sourceRoot":"","sources":["authenticationTest.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src-tests/authenticationTest.ts b/src-tests/authenticationTest.ts index d5caede..f967e7d 100644 --- a/src-tests/authenticationTest.ts +++ b/src-tests/authenticationTest.ts @@ -23,7 +23,7 @@ async function testAuthenticationImplementation() { // Check for Microsoft authentication implementation const hasMicrosoftAuth = funcString.includes("vscode.authentication.getSession") && funcString.includes("microsoft") && - funcString.includes("https://app.vssps.visualstudio.com/user_impersonation"); + funcString.includes("499b84ac-1321-427f-aa17-267ca6975798/.default"); if (!hasMicrosoftAuth) { console.error("❌ Microsoft authentication implementation not found"); @@ -55,7 +55,7 @@ async function testAuthenticationImplementation() { // Check for user prompt options const hasUserPrompts = funcString.includes("Sign In") && - funcString.includes("Open Settings") && + funcString.includes("Configure PAT Token") && funcString.includes("showWarningMessage"); if (!hasUserPrompts) { diff --git a/src/azd/azDevOpsUtils.ts b/src/azd/azDevOpsUtils.ts index 19853e1..392da94 100644 --- a/src/azd/azDevOpsUtils.ts +++ b/src/azd/azDevOpsUtils.ts @@ -66,28 +66,24 @@ export async function getAzureDevOpsConnection(orgUrl: string): Promise { pullrequests.forEach((pr, index) => { const statusText = (PullRequestStatus as any)[pr.status] || `Status ${pr.status}`; stream.markdown(`${index + 1}. 🔵**PR #${pr.pullRequestId}** [_${statusText}_]: **${pr.title}**\n`);