Propogate login error, fixes microsoft#89518

Rachel Macfarlane · Rachel Macfarlane · commit 7302c88f2100 · 2020-02-18T11:33:16.000-08:00
diff --git a/extensions/vscode-account/src/AADHelper.ts b/extensions/vscode-account/src/AADHelper.ts
@@ -274,9 +274,9 @@ export class AzureActiveDirectoryService {
 				res.writeHead(302, { Location: '/' });
 				res.end();
 			} catch (err) {
-				Logger.error(err.message);
 				res.writeHead(302, { Location: `/?error=${encodeURIComponent(err && err.message || 'Unknown error')}` });
 				res.end();
+				throw new Error(err.message);
 			}
 		} catch (e) {
 			Logger.error(e.message);
@@ -285,6 +285,7 @@ export class AzureActiveDirectoryService {
 			if (e.message === 'Error listening to server' || e.message === 'Closed' || e.message === 'Timeout waiting for port') {
 				await this.loginWithoutLocalServer(scope);
 			}
+			throw new Error(e.message);
 		} finally {
 			setTimeout(() => {
 				server.close();
diff --git a/extensions/vscode-account/src/extension.ts b/extensions/vscode-account/src/extension.ts
@@ -22,7 +22,6 @@ export async function activate(_: vscode.ExtensionContext) {
 				await loginService.login(scopes.sort().join(' '));
 				return loginService.sessions[0]!;
 			} catch (e) {
-				vscode.window.showErrorMessage(`Logging in failed: ${e}`);
 				throw e;
 			}
 		},
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -569,7 +569,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 		try {
 			await this.setActiveAccount(await this.authenticationService.login(this.userDataSyncStore!.authenticationProviderId, ['https://management.core.windows.net/.default', 'offline_access']));
 		} catch (e) {
-			this.notificationService.error(e);
+			this.notificationService.error(localize('loginFailed', "Logging in failed: {0}", e));
 			throw e;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ export async function activate(_: vscode.ExtensionContext) {`
`22`	`22`	`await loginService.login(scopes.sort().join(' '));`
`23`	`23`	`return loginService.sessions[0]!;`
`24`	`24`	`} catch (e) {`
`25`		- vscode.window.showErrorMessage(`Logging in failed: ${e}`);
`26`	`25`	`throw e;`
`27`	`26`	`}`
`28`	`27`	`},`
Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`569`	`569`	`try {`
`570`	`570`	`await this.setActiveAccount(await this.authenticationService.login(this.userDataSyncStore!.authenticationProviderId, ['https://management.core.windows.net/.default', 'offline_access']));`
`571`	`571`	`} catch (e) {`
`572`		`- this.notificationService.error(e);`
	`572`	`+ this.notificationService.error(localize('loginFailed', "Logging in failed: {0}", e));`
`573`	`573`	`throw e;`
`574`	`574`	`}`
`575`	`575`	`}`