Merge from vscode 1b314ab317fbff7d799b21754326b7d849889ceb

extensions/github-authentication/src/extension.ts

@@ -24,19 +24,27 @@ export async function activate(context: vscode.ExtensionContext) {
 
 	vscode.authentication.registerAuthenticationProvider({
 		id: 'github',
-		displayName: 'GitHub',
+		label: 'GitHub',
 		supportsMultipleAccounts: false,
 		onDidChangeSessions: onDidChangeSessions.event,
 		getSessions: () => Promise.resolve(loginService.sessions),
 		login: async (scopeList: string[]) => {
 			try {
+				/* __GDPR__
+					"login" : { }
+				*/
 				telemetryReporter.sendTelemetryEvent('login');
+
 				const session = await loginService.login(scopeList.sort().join(' '));
 				Logger.info('Login success!');
 				onDidChangeSessions.fire({ added: [session.id], removed: [], changed: [] });
 				return session;
 			} catch (e) {
+				/* __GDPR__
+					"loginFailed" : { }
+				*/
 				telemetryReporter.sendTelemetryEvent('loginFailed');
+
 				vscode.window.showErrorMessage(`Sign in failed: ${e}`);
 				Logger.error(e);
 				throw e;
@@ -44,11 +52,19 @@ export async function activate(context: vscode.ExtensionContext) {
 		},
 		logout: async (id: string) => {
 			try {
+				/* __GDPR__
+					"logout" : { }
+				*/
 				telemetryReporter.sendTelemetryEvent('logout');
+
 				await loginService.logout(id);
 				onDidChangeSessions.fire({ added: [], removed: [id], changed: [] });
 			} catch (e) {
+				/* __GDPR__
+					"logoutFailed" : { }
+				*/
 				telemetryReporter.sendTelemetryEvent('logoutFailed');
+
 				vscode.window.showErrorMessage(`Sign out failed: ${e}`);
 				Logger.error(e);
 				throw e;