ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate account entries (#21575)

Browse Source
This commit is contained in:
Christopher Suh
2023-01-12 12:35:16 -08:00
committed by GitHub
parent 0a93f1f3ef
commit 90ef8e4907
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/sql/workbench/services/accountManagement/browser/accountManagementService.ts
View File

@@ -213,11 +213,17 @@ export class AccountManagementService implements IAccountManagementService {
let result = await self._accountStore.addOrUpdate(account); let result = await self._accountStore.addOrUpdate(account);
if (result.accountAdded) { if (result.accountAdded) {
// Double check that there isn't a matching account
let indexToRemove = this.findAccountIndex(provider.accounts, result.changedAccount);
if (indexToRemove >= 0) {
self._accountStore.remove(provider.accounts[indexToRemove].key);
provider.accounts.splice(indexToRemove, 1);
}
// Add the account to the list // Add the account to the list
provider.accounts.push(result.changedAccount!); provider.accounts.push(result.changedAccount!);
} }
if (result.accountModified) { if (result.accountModified) {
// Find the updated account and splice the updated on in // Find the updated account and splice the updated one in
let indexToRemove: number = provider.accounts.findIndex(account => { let indexToRemove: number = provider.accounts.findIndex(account => {
return account.key.accountId === result.changedAccount!.key.accountId; return account.key.accountId === result.changedAccount!.key.accountId;
}); });
@@ -566,7 +572,7 @@ export class AccountManagementService implements IAccountManagementService {
// if not, add the account and mark it stale. The original account is marked as taken so its not picked again. // if not, add the account and mark it stale. The original account is marked as taken so its not picked again.
for (let account of altLibraryAccounts) { for (let account of altLibraryAccounts) {
await this.removeAccount(account.key); await this.removeAccount(account.key);
if (currentLibraryAccounts.find(a => account.displayInfo.email === a.displayInfo.email)) { if (this.findAccountIndex(currentLibraryAccounts, account) >= 0) {
continue; continue;
} else { } else {
// TODO: Refresh access token for the account if feasible. // TODO: Refresh access token for the account if feasible.
@@ -578,6 +584,25 @@ export class AccountManagementService implements IAccountManagementService {
} }
return currentLibraryAccounts; return currentLibraryAccounts;
} }
public findAccountIndex(accounts: azdata.Account[], accountToFind: azdata.Account): number {
let indexToRemove: number = accounts.findIndex(account => {
// corner case handling for personal accounts
if (account.key.accountId.includes('#') || accountToFind.key.accountId.includes('#')) {
return account.displayInfo.email === accountToFind.displayInfo.email;
}
// MSAL account added
if (accountToFind.key.accountId.includes('.')) {
return account.key.accountId === accountToFind!.key.accountId.split('.')[0];
}
// ADAL account added
if (account.key.accountId.includes('.')) {
return account.key.accountId.split('.')[0] === accountToFind!.key.accountId;
}
return account.key.accountId === accountToFind!.key.accountId;
});
return indexToRemove;
}
} }
/** /**