Merge from vscode 7eaf220cafb9d9e901370ffce02229171cbf3ea6

extensions/microsoft-authentication/package.json

@@ -12,7 +12,6 @@
 	],
 	"enableProposedApi": true,
 	"activationEvents": [
-		"*",
 		"onAuthenticationRequest:microsoft"
 	],
 	"extensionKind": [
@@ -20,6 +19,14 @@
 		"workspace",
 		"web"
 	],
+	"contributes": {
+		"authentication": [
+			{
+				"label": "Microsoft",
+				"id": "microsoft"
+			}
+		]
+	},
 	"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
 	"main": "./out/extension.js",
 	"browser": "./dist/browser/extension.js",

extensions/microsoft-authentication/src/AADHelper.ts

@@ -5,6 +5,7 @@
 
 import * as randomBytes from 'randombytes';
 import * as querystring from 'querystring';
+import { Buffer } from 'buffer';
 import * as vscode from 'vscode';
 import { createServer, startServer } from './authServer';
 
@@ -528,7 +529,7 @@ export class AzureActiveDirectoryService {
 			}
 		} catch (e) {
 			Logger.error('Refreshing token failed');
-			throw e;
+			throw new Error(REFRESH_NETWORK_FAILURE);
 		}
 	}