Merge vscode source through 1.62 release (#19981)

* Build breaks 1 * Build breaks * Build breaks * Build breaks * More build breaks * Build breaks (#2512) * Runtime breaks * Build breaks * Fix dialog location break * Update typescript * Fix ASAR break issue * Unit test breaks * Update distro * Fix breaks in ADO builds (#2513) * Bump to node 16 * Fix hygiene errors * Bump distro * Remove reference to node type * Delete vscode specific extension * Bump to node 16 in CI yaml * Skip integration tests in CI builds (while fixing) * yarn.lock update * Bump moment dependency in remote yarn * Fix drop-down chevron style * Bump to node 16 * Remove playwrite from ci.yaml * Skip building build scripts in hygine check
2026-01-14 01:25:37 -05:00 · 2022-07-11 14:09:32 -07:00
parent fa0fcef303
commit 26455e9113
1876 changed files with 72050 additions and 37997 deletions
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -61,7 +61,7 @@
  "dependencies": {
    "node-fetch": "^2.6.7",
    "uuid": "8.1.0",
-    "vscode-extension-telemetry": "0.2.8",
+    "vscode-extension-telemetry": "0.4.2",
    "vscode-nls": "^5.0.0",
    "vscode-tas-client": "^0.1.42"
  },
--- a/extensions/github-authentication/src/common/keychain.ts
+++ b/extensions/github-authentication/src/common/keychain.ts
@@ -5,29 +5,12 @@

 // keytar depends on a native module shipped in vscode, so this is
 // how we load it
-import type * as keytarType from 'keytar';
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import { Log } from './logger';

 const localize = nls.loadMessageBundle();

-function getKeytar(): Keytar | undefined {
-	try {
-		return require('keytar');
-	} catch (err) {
-		console.log(err);
-	}
-
-	return undefined;
-}
-
-export type Keytar = {
-	getPassword: typeof keytarType['getPassword'];
-	setPassword: typeof keytarType['setPassword'];
-	deletePassword: typeof keytarType['deletePassword'];
-};
-
 export class Keychain {
 	constructor(
 		private readonly context: vscode.ExtensionContext,
@@ -72,25 +55,4 @@ export class Keychain {
 			return Promise.resolve(undefined);
 		}
 	}
-
-	async tryMigrate(): Promise<string | null | undefined> {
-		try {
-			const keytar = getKeytar();
-			if (!keytar) {
-				throw new Error('keytar unavailable');
-			}
-
-			const oldValue = await keytar.getPassword(`${vscode.env.uriScheme}-github.login`, 'account');
-			if (oldValue) {
-				this.Logger.trace('Attempting to migrate from keytar to secret store...');
-				await this.setToken(oldValue);
-				await keytar.deletePassword(`${vscode.env.uriScheme}-github.login`, 'account');
-			}
-
-			return oldValue;
-		} catch (_) {
-			// Ignore
-			return Promise.resolve(undefined);
-		}
-	}
 }
--- a/extensions/github-authentication/src/github.ts
+++ b/extensions/github-authentication/src/github.ts
@@ -117,7 +117,7 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 		let sessionData: SessionData[];
 		try {
 			this._logger.info('Reading sessions from keychain...');
-			const storedSessions = await this._keychain.getToken() || await this._keychain.tryMigrate();
+			const storedSessions = await this._keychain.getToken();
 			if (!storedSessions) {
 				return [];
 			}
@@ -195,12 +195,13 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 				scopes: JSON.stringify(scopes),
 			});

-			const token = await this._githubServer.login(scopes.join(' '));
+			const scopeString = scopes.join(' ');
+			const token = await this._githubServer.login(scopeString);
 			this.afterTokenLoad(token);
 			const session = await this.tokenToSession(token, scopes);

 			const sessions = await this._sessionsPromise;
-			const sessionIndex = sessions.findIndex(s => s.id === session.id);
+			const sessionIndex = sessions.findIndex(s => s.id === session.id || s.scopes.join(' ') === scopeString);
 			if (sessionIndex > -1) {
 				sessions.splice(sessionIndex, 1, session);
 			} else {
--- a/extensions/github-authentication/src/githubServer.ts
+++ b/extensions/github-authentication/src/githubServer.ts
@@ -122,15 +122,13 @@ export class GitHubServer implements IGitHubServer {
 	// TODO@joaomoreno TODO@TylerLeonhardt
 	private async isNoCorsEnvironment(): Promise<boolean> {
 		const uri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/dummy`));
-		return (uri.scheme === 'https' && /^(vscode|github)\./.test(uri.authority)) || (uri.scheme === 'http' && /^localhost/.test(uri.authority));
+		return (uri.scheme === 'https' && /^((insiders\.)?vscode|github)\./.test(uri.authority)) || (uri.scheme === 'http' && /^localhost/.test(uri.authority));
 	}

 	public async login(scopes: string): Promise<string> {
 		this._logger.info(`Logging in for the following scopes: ${scopes}`);

-		// TODO@joaomoreno TODO@TylerLeonhardt
-		const nocors = await this.isNoCorsEnvironment();
-		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/did-authenticate${nocors ? '?nocors=true' : ''}`));
+		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/did-authenticate`));

 		if (this.isTestEnvironment(callbackUri)) {
 			const token = await vscode.window.showInputBox({ prompt: 'GitHub Personal Access Token', ignoreFocusOut: true });
@@ -148,7 +146,7 @@ export class GitHubServer implements IGitHubServer {
 					return tokenScopes.includes(splitScopes);
 				});
 			})) {
-				throw new Error(`The provided token is does not match the requested scopes: ${scopes}`);
+				throw new Error(`The provided token does not match the requested scopes: ${scopes}`);
 			}

 			return token;
@@ -160,7 +158,7 @@ export class GitHubServer implements IGitHubServer {
 		const existingStates = this._pendingStates.get(scopes) || [];
 		this._pendingStates.set(scopes, [...existingStates, state]);

-		const uri = vscode.Uri.parse(`https://${AUTH_RELAY_SERVER}/authorize/?callbackUri=${encodeURIComponent(callbackUri.toString())}&scope=${scopes}&state=${state}&responseType=code&authServer=https://github.com${nocors ? '&nocors=true' : ''}`);
+		const uri = vscode.Uri.parse(`https://${AUTH_RELAY_SERVER}/authorize/?callbackUri=${encodeURIComponent(callbackUri.toString())}&scope=${scopes}&state=${state}&responseType=code&authServer=https://github.com`);
 		await vscode.env.openExternal(uri);

 		// Register a single listener for the URI callback, in case the user starts the login process multiple times
@@ -208,34 +206,23 @@ export class GitHubServer implements IGitHubServer {
 			const url = `https://${AUTH_RELAY_SERVER}/token?code=${code}&state=${query.state}`;
 			this._logger.info('Exchanging code for token...');

-			// TODO@joao: remove
-			if (query.nocors) {
-				try {
-					const json: any = await vscode.commands.executeCommand('_workbench.fetchJSON', url, 'POST');
+			try {
+				const result = await fetch(url, {
+					method: 'POST',
+					headers: {
+						Accept: 'application/json'
+					}
+				});
+
+				if (result.ok) {
+					const json = await result.json();
 					this._logger.info('Token exchange success!');
 					resolve(json.access_token);
-				} catch (err) {
-					reject(err);
-				}
-			} else {
-				try {
-					const result = await fetch(url, {
-						method: 'POST',
-						headers: {
-							Accept: 'application/json'
-						}
-					});
-
-					if (result.ok) {
-						const json = await result.json();
-						this._logger.info('Token exchange success!');
-						resolve(json.access_token);
-					} else {
-						reject(result.statusText);
-					}
-				} catch (ex) {
-					reject(ex);
+				} else {
+					reject(result.statusText);
 				}
+			} catch (ex) {
+				reject(ex);
 			}
 		};

@@ -291,6 +278,9 @@ export class GitHubServer implements IGitHubServer {
 	}

 	public async sendAdditionalTelemetryInfo(token: string): Promise<void> {
+		if (!vscode.env.isTelemetryEnabled) {
+			return;
+		}
 		const nocors = await this.isNoCorsEnvironment();

 		if (nocors) {
@@ -394,7 +384,7 @@ export class GitHubEnterpriseServer implements IGitHubServer {
 				return tokenScopes.includes(splitScopes);
 			});
 		})) {
-			throw new Error(`The provided token is does not match the requested scopes: ${scopes}`);
+			throw new Error(`The provided token does not match the requested scopes: ${scopes}`);
 		}

 		return token;
--- a/extensions/github-authentication/yarn.lock
+++ b/extensions/github-authentication/yarn.lock
@@ -99,10 +99,10 @@ uuid@8.1.0:
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d"
  integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==

-vscode-extension-telemetry@0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.2.8.tgz#670c625c44791237c040cee2cb9f567ca34784ac"
-  integrity sha512-Vf52im5qzORRD2K5Ryp8PXo31YXVcJAYRSDDZGegWlt0OATOd83DYabS1U/WIq9nR5g80UQKH3+BsenhpQHUaA==
+vscode-extension-telemetry@0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.4.2.tgz#6ef847a80c9cfc207eb15e3a254f235acebb65a5"
+  integrity sha512-y0f51mVoFxHIzULQNCC26TBFIKdEC7uckS3tFoK++OOOl8mU2LlOxgmbd52T/SXoXNg5aI7xqs+4V2ug5ITvKw==

 vscode-nls@^5.0.0:
  version "5.0.0"