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

Filter accounts based on Auth library in accounts management service (#21501)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-01-03 20:16:08 -08:00
committed by GitHub
parent 29c88923f5
commit e7fcda7351
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ export class AccountManagementService implements IAccountManagementService {
public _providers: { [id: string]: AccountProviderWithMetadata } = {}; public _providers: { [id: string]: AccountProviderWithMetadata } = {};
public _serviceBrand: undefined; public _serviceBrand: undefined;
private _accountStore: AccountStore; private _accountStore: AccountStore;
private _authLibrary: AuthLibrary;
private _accountDialogController?: AccountDialogController; private _accountDialogController?: AccountDialogController;
private _autoOAuthDialogController?: AutoOAuthDialogController; private _autoOAuthDialogController?: AutoOAuthDialogController;
private _mementoContext?: Memento; private _mementoContext?: Memento;
@@ -72,6 +73,10 @@ export class AccountManagementService implements IAccountManagementService {
this._updateAccountListEmitter = new Emitter<UpdateAccountListEventParams>(); this._updateAccountListEmitter = new Emitter<UpdateAccountListEventParams>();
this.configurationService = configurationService; this.configurationService = configurationService;
// Determine authentication library in use, to support filtering accounts respectively.
// When this value is changed a restart is required so there isn't a need to dynamically update this value at runtime.
this._authLibrary = this.configurationService.getValue('azure.authenticationLibrary');
_storageService.onWillSaveState(() => this.shutdown()); _storageService.onWillSaveState(() => this.shutdown());
this.registerListeners(); this.registerListeners();
} }
@@ -221,9 +226,11 @@ export class AccountManagementService implements IAccountManagementService {
let self = this; let self = this;
// 1) Get the accounts from the store // 1) Get the accounts from the store
// 2) Update our local cache of accounts // 2) Filter the accounts based on the auth library
// 3) Update our local cache of accounts
return this.doWithProvider(providerId, provider => { return this.doWithProvider(providerId, provider => {
return self._accountStore.getAccountsByProvider(provider.metadata.id) return self._accountStore.getAccountsByProvider(provider.metadata.id)
.then(accounts => this._authLibrary ? filterAccounts(accounts, this._authLibrary) : accounts)
.then(accounts => { .then(accounts => {
self._providers[providerId].accounts = accounts; self._providers[providerId].accounts = accounts;
return accounts; return accounts;
@@ -232,10 +239,11 @@ export class AccountManagementService implements IAccountManagementService {
} }
/** /**
* Retrieves all the accounts registered with ADS. * Retrieves all the accounts registered with ADS based on auth library in use.
*/ */
public getAccounts(): Promise<azdata.Account[]> { public getAccounts(): Promise<azdata.Account[]> {
return this._accountStore.getAllAccounts(); return this._accountStore.getAllAccounts()
.then(accounts => this._authLibrary ? filterAccounts(accounts, this._authLibrary) : accounts);
} }
/** /**