From e65cd705a4ed6ebbb2c2234369550e3337b3a88f Mon Sep 17 00:00:00 2001 From: Brett Saviano Date: Thu, 1 Aug 2024 11:39:01 -0400 Subject: [PATCH 1/2] Don't append `CSPCHD` for web applications that don't support it by default --- src/commands/serverActions.ts | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/commands/serverActions.ts b/src/commands/serverActions.ts index d95c71cb..61cf29d7 100644 --- a/src/commands/serverActions.ts +++ b/src/commands/serverActions.ts @@ -223,13 +223,11 @@ export async function serverActions(): Promise { } switch (action.id) { case "openPortal": { - const token = await getCSPToken(api, portalPath); - vscode.env.openExternal(vscode.Uri.parse(`${serverUrl}${portalPath}&CSPCHD=${token}`)); + vscode.env.openExternal(vscode.Uri.parse(`${serverUrl}${portalPath}`)); break; } case "openClassReference": { - const token = await getCSPToken(api, classRef); - vscode.env.openExternal(vscode.Uri.parse(`${serverUrl}${classRef}&CSPCHD=${token}`)); + vscode.env.openExternal(vscode.Uri.parse(`${serverUrl}${classRef}`)); break; } case "openStudioAddin": { @@ -284,16 +282,7 @@ export async function serverActions(): Promise { break; } default: { - let url = vscode.Uri.parse(action.detail); - if (action.rawLink?.startsWith("${serverUrl}")) { - const token = await getCSPToken(api, url.path); - if (token.length > 0) { - url = url.with({ - query: url.query.length ? `${url.query}&CSPCHD=${token}` : `CSPCHD=${token}`, - }); - } - } - vscode.env.openExternal(url); + vscode.env.openExternal(vscode.Uri.parse(action.detail)); } } }); From 23a5de6e47be6274833f283150f985e8f8f26bfd Mon Sep 17 00:00:00 2001 From: Brett Saviano Date: Thu, 1 Aug 2024 12:43:49 -0400 Subject: [PATCH 2/2] Update serverActions.ts --- src/commands/serverActions.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/commands/serverActions.ts b/src/commands/serverActions.ts index 61cf29d7..dd0d22f1 100644 --- a/src/commands/serverActions.ts +++ b/src/commands/serverActions.ts @@ -282,7 +282,16 @@ export async function serverActions(): Promise { break; } default: { - vscode.env.openExternal(vscode.Uri.parse(action.detail)); + let url = vscode.Uri.parse(action.detail); + if (action.rawLink?.startsWith("${serverUrl}")) { + const token = await getCSPToken(api, url.path); + if (token.length > 0) { + url = url.with({ + query: url.query.length ? `${url.query}&CSPCHD=${token}` : `CSPCHD=${token}`, + }); + } + } + vscode.env.openExternal(url); } } });