Connection management service updates to support multiple providers (#9698)

* Connection management service work

* Fix tests

* Change how accounts are deleted

* Be consistent with names

* feedback

* Fix based on feedback

* Change sqltoolsservice version
This commit is contained in:
Amir Omidi
2020-03-25 12:48:01 -07:00
committed by GitHub
parent 74b0dc28c4
commit 176edde2aa
15 changed files with 162 additions and 41 deletions

View File

@@ -37,6 +37,8 @@ import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
import { IViewPaneOptions, ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
import { attachModalDialogStyler, attachPanelStyler } from 'sql/workbench/common/styler';
import { IViewDescriptorService } from 'vs/workbench/common/views';
import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
@@ -135,8 +137,10 @@ export class AccountDialog extends Modal {
@ILogService logService: ILogService,
@IViewDescriptorService private viewDescriptorService: IViewDescriptorService,
@ITextResourcePropertiesService textResourcePropertiesService: ITextResourcePropertiesService,
@IQuickInputService private _quickInputService: IQuickInputService,
@INotificationService private _notificationService: INotificationService,
@IOpenerService protected readonly openerService: IOpenerService,
@ITelemetryService private readonly vstelemetryService: ITelemetryService,
@ITelemetryService private readonly vstelemetryService: ITelemetryService
) {
super(
localize('linkedAccounts', "Linked accounts"),
@@ -199,8 +203,34 @@ export class AccountDialog extends Modal {
this._addAccountButton = new Button(buttonSection);
this._addAccountButton.label = localize('accountDialog.addConnection', "Add an account");
this._register(this._addAccountButton.onDidClick(() => {
(<IProviderViewUiComponent>values(this._providerViewsMap)[0]).addAccountAction.run();
this._register(this._addAccountButton.onDidClick(async () => {
const vals = values(this._providerViewsMap);
let pickedValue: string;
if (vals.length === 0) {
this._notificationService.error(localize('accountDialog.noCloudsRegistered', "You have no clouds enabled. Go to Settings -> Search Azure Account Configuration -> Enable at least one cloud"));
return;
}
if (vals.length > 1) {
const buttons: IQuickPickItem[] = vals.map(v => {
return { label: v.view.title } as IQuickPickItem;
});
const picked = await this._quickInputService.pick(buttons, { canPickMany: false });
pickedValue = picked?.label;
} else {
pickedValue = vals[0].view.title;
}
const v = vals.filter(v => v.view.title === pickedValue)?.[0];
if (!v) {
this._notificationService.error(localize('accountDialog.didNotPickAuthProvider', "You didn't select any authentication provider. Please try again."));
return;
}
v.addAccountAction.run();
}));
DOM.append(container, this._noaccountViewContainer);

View File

@@ -206,6 +206,13 @@ export class AccountManagementService implements IAccountManagementService {
});
}
/**
* Retrieves all the accounts registered with ADS.
*/
public getAccounts(): Thenable<azdata.Account[]> {
return this._accountStore.getAllAccounts();
}
/**
* Generates a security token by asking the account's provider
* @param account Account to generate security token for
@@ -225,35 +232,49 @@ export class AccountManagementService implements IAccountManagementService {
* removed, false otherwise.
*/
public removeAccount(accountKey: azdata.AccountKey): Thenable<boolean> {
let self = this;
// Step 1) Remove the account
// Step 2) Clear the sensitive data from the provider (regardless of whether the account was removed)
// Step 3) Update the account cache and fire an event
return this.doWithProvider(accountKey.providerId, provider => {
return this._accountStore.remove(accountKey)
.then(result => {
provider.provider.clear(accountKey);
return result;
})
.then(result => {
if (!result) {
return result;
}
return this.doWithProvider(accountKey.providerId, async provider => {
const result = await this._accountStore.remove(accountKey);
await provider.provider.clear(accountKey);
if (!result) {
return result;
}
let indexToRemove: number = firstIndex(provider.accounts, account => {
return account.key.accountId === accountKey.accountId;
});
let indexToRemove: number = firstIndex(provider.accounts, account => {
return account.key.accountId === accountKey.accountId;
});
if (indexToRemove >= 0) {
provider.accounts.splice(indexToRemove, 1);
self.fireAccountListUpdate(provider, false);
}
return result;
});
if (indexToRemove >= 0) {
provider.accounts.splice(indexToRemove, 1);
this.fireAccountListUpdate(provider, false);
}
return result;
});
}
/**
* Removes all registered accounts
*/
public async removeAccounts(): Promise<boolean> {
const accounts = await this.getAccounts();
if (accounts.length === 0) {
return false;
}
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;
}
}
return finalResult;
}
// UI METHODS //////////////////////////////////////////////////////////
/**
* Opens the account list dialog

View File

@@ -51,7 +51,7 @@ export class AccountPickerService implements IAccountPickerService {
public renderAccountPicker(container: HTMLElement): void {
if (!this._accountPicker) {
// TODO: expand support to multiple providers
const providerId: string = 'azurePublicCloud';
const providerId: string = 'azure_publicCloud';
this._accountPicker = this._instantiationService.createInstance(AccountPicker, providerId);
this._accountPicker.createAccountPickerComponent();
}