From e26937b101b83e6e68c918688ff441e7a5f7d779 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Fri, 28 Apr 2023 21:22:26 -0700
Subject: [PATCH] Touch up MSAL errors (#22906)

---
 .../azurecore/src/account-provider/auths/azureAuth.ts       | 6 +++---
 .../azurecore/src/account-provider/azureAccountProvider.ts  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/azurecore/src/account-provider/auths/azureAuth.ts b/extensions/azurecore/src/account-provider/auths/azureAuth.ts
index f1aaa7c7ee..90d175b59f 100644
--- a/extensions/azurecore/src/account-provider/auths/azureAuth.ts
+++ b/extensions/azurecore/src/account-provider/auths/azureAuth.ts
@@ -327,7 +327,7 @@ export abstract class AzureAuth implements vscode.Disposable {
 
 		if (!resource) {
 			Logger.error(`Unable to find Azure resource ${azureResource}`);
-			return null;
+			throw new Error(localize('msal.resourceNotFoundError', `Unable to find configuration for Azure Resource {0}`, azureResource));
 		}
 
 		// Resource endpoint must end with '/' to form a valid scope for MSAL token request.
@@ -336,7 +336,7 @@ export abstract class AzureAuth implements vscode.Disposable {
 		let account: AccountInfo | null = await this.getAccountFromMsalCache(accountId);
 		if (!account) {
 			Logger.error('Error: Could not fetch account when acquiring token');
-			return null;
+			throw new Error(localize('msal.accountNotFoundError', `Unable to find account info when acquiring token.`));
 		}
 		let newScope;
 		if (resource.azureResourceId === azdata.AzureResource.ResourceManagement) {
@@ -735,7 +735,7 @@ export abstract class AzureAuth implements vscode.Disposable {
 			response = await result.action(tenant.id);
 		}
 
-		return response;
+		return result?.booleanResult || response;
 	}
 	//#endregion
 
diff --git a/extensions/azurecore/src/account-provider/azureAccountProvider.ts b/extensions/azurecore/src/account-provider/azureAccountProvider.ts
index 804afb890e..eda170212e 100644
--- a/extensions/azurecore/src/account-provider/azureAccountProvider.ts
+++ b/extensions/azurecore/src/account-provider/azureAccountProvider.ts
@@ -182,7 +182,7 @@ export class AzureAccountProvider implements azdata.AccountProvider, vscode.Disp
 						}
 						return token;
 					} else {
-						Logger.error(`MSAL: getToken call failed`);
+						Logger.error(`MSAL: getToken call failed: ${authResult}`);
 						// Throw error with MSAL-specific code/message, else throw generic error message
 						if (this.isProviderError(authResult)) {
 							throw new Error(localize('msalTokenError', `{0} occurred when acquiring token. \n{1}`, authResult.errorCode, authResult.errorMessage));