From 283c8514940f3508eea41e57fcd9d8540e5eddf4 Mon Sep 17 00:00:00 2001
From: Amir Omidi <amomidi@microsoft.com>
Date: Tue, 21 Apr 2020 13:56:04 -0700
Subject: [PATCH] Clear all saved accounts regardless of failure (#10107)

---
 .../browser/accountManagementService.ts              | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts b/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts
index 93718e1ae3..2801b0ccd5 100644
--- a/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts
+++ b/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts
@@ -279,10 +279,14 @@ export class AccountManagementService implements IAccountManagementService {
 
 		let finalResult = true;
 		for (const account of accounts) {
-			const removeResult = await this.removeAccount(account.key);
-			if (removeResult === false) {
-				this._logService.info('Error when removing %s.', account.key);
-				finalResult = false;
+			try {
+				const removeResult = await this.removeAccount(account.key);
+				if (removeResult === false) {
+					this._logService.info('Error when removing %s.', account.key);
+					finalResult = false;
+				}
+			} catch (ex) {
+				this._logService.error('Error when removing an account %s. Exception: %s', account.key, JSON.stringify(ex));
 			}
 		}
 		return finalResult;