Skip to content

Commit 36b9d93

Browse files
committed
Activate vscode.github-authentication from the test resolver
1 parent 5b2f96e commit 36b9d93

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

extensions/vscode-test-resolver/src/extension.browser.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ export function activate(_context: vscode.ExtensionContext) {
99
vscode.workspace.registerRemoteAuthorityResolver('test', {
1010
async resolve(_authority: string): Promise<vscode.ResolverResult> {
1111
console.log(`Resolving ${_authority}`);
12+
console.log(`Activating vscode.github-authentication to simulate auth`);
13+
await vscode.extensions.getExtension('vscode.github-authentication')?.activate();
1214
return new vscode.ManagedResolvedAuthority(async () => {
1315
return new InitialManagedMessagePassing();
1416
});

src/vs/server/node/webClientServer.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import { IProductConfiguration } from 'vs/base/common/product';
2828
import { isString } from 'vs/base/common/types';
2929
import { CharCode } from 'vs/base/common/charCode';
3030
import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts';
31+
import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
3132

3233
const textMimeType = {
3334
'.html': 'text/html',
@@ -343,9 +344,12 @@ export class WebClientServer {
343344
};
344345

345346
if (useTestResolver) {
346-
const filePath = FileAccess.asFileUri(`${builtinExtensionsPath}/vscode-test-resolver/package.json`).fsPath;
347-
const packageJSON = JSON.parse((await fsp.readFile(filePath)).toString());
348-
values['WORKBENCH_BUILTIN_EXTENSIONS'] = asJSON([{ extensionPath: 'vscode-test-resolver', packageJSON }]);
347+
const bundledExtensions: { extensionPath: string; packageJSON: IExtensionManifest }[] = [];
348+
for (const extensionPath of ['vscode-test-resolver', 'github-authentication']) {
349+
const packageJSON = JSON.parse((await fsp.readFile(FileAccess.asFileUri(`${builtinExtensionsPath}/${extensionPath}/package.json`).fsPath)).toString());
350+
bundledExtensions.push({ extensionPath, packageJSON });
351+
}
352+
values['WORKBENCH_BUILTIN_EXTENSIONS'] = asJSON(bundledExtensions);
349353
}
350354

351355
let data;

0 commit comments

Comments
 (0)