From 22e45e9f88ef2fb6904bbbdfd0e72e252c6e281a Mon Sep 17 00:00:00 2001 From: svennergr Date: Mon, 10 Jan 2022 20:35:20 +0100 Subject: [PATCH] Add proper error message on getUserInfo (#140277) * Add proper error message on getUserInfo * improved error message on getUserInfo either display the response message or the http status text Co-authored-by: Sven Grossmann --- .../github-authentication/src/githubServer.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts index 2f263991de8..91503c3a12e 100644 --- a/extensions/github-authentication/src/githubServer.ts +++ b/extensions/github-authentication/src/githubServer.ts @@ -97,8 +97,18 @@ async function getUserInfo(token: string, serverUri: vscode.Uri, logger: Log): P logger.info('Got account info!'); return { id: json.id, accountName: json.login }; } else { - logger.error(`Getting account info failed: ${result.statusText}`); - throw new Error(result.statusText); + // either display the response message or the http status text + let errorMessage = result.statusText; + try { + const json = await result.json(); + if (json.message) { + errorMessage = json.message; + } + } catch (err) { + // noop + } + logger.error(`Getting account info failed: ${errorMessage}`); + throw new Error(errorMessage); } }