ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Show tenant dropdown when selecting 'AzureMFA' for first time (#21763) (#21764)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-01-27 16:11:17 -08:00
committed by GitHub
parent 5a79e41ed3
commit 33dce95b15
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/workbench/services/connection/browser/connectionWidget.ts
View File

@@ -562,8 +562,8 @@ export class ConnectionWidget extends lifecycle.Disposable {
this.fillInAzureAccountOptions().then(async () => { this.fillInAzureAccountOptions().then(async () => {
// Don't enable the control until we've populated it // Don't enable the control until we've populated it
this._azureAccountDropdown.enable(); this._azureAccountDropdown.enable();
// Populate tenants // Populate tenants (select first by default for initialization of tenant dialog)
await this.onAzureAccountSelected(); await this.onAzureAccountSelected(true);
this._azureTenantDropdown.enable(); this._azureTenantDropdown.enable();
}).catch(err => this._logService.error(`Unexpected error populating Azure Account dropdown : ${err}`)); }).catch(err => this._logService.error(`Unexpected error populating Azure Account dropdown : ${err}`));
// Immediately show/hide appropriate elements though so user gets immediate feedback while we load accounts // Immediately show/hide appropriate elements though so user gets immediate feedback while we load accounts
@@ -572,8 +572,8 @@ export class ConnectionWidget extends lifecycle.Disposable {
this.fillInAzureAccountOptions().then(async () => { this.fillInAzureAccountOptions().then(async () => {
// Don't enable the control until we've populated it // Don't enable the control until we've populated it
this._azureAccountDropdown.enable(); this._azureAccountDropdown.enable();
// Populate tenants // Populate tenants (select first by default for initialization of tenant dialog)
await this.onAzureAccountSelected(); await this.onAzureAccountSelected(true);
this._azureTenantDropdown.enable(); this._azureTenantDropdown.enable();
}).catch(err => this._logService.error(`Unexpected error populating Azure Account dropdown : ${err}`)); }).catch(err => this._logService.error(`Unexpected error populating Azure Account dropdown : ${err}`));
// Immediately show/hide appropriate elements though so user gets immediate feedback while we load accounts // Immediately show/hide appropriate elements though so user gets immediate feedback while we load accounts
@@ -638,7 +638,7 @@ export class ConnectionWidget extends lifecycle.Disposable {
} }
} }
private async onAzureAccountSelected(): Promise<void> { private async onAzureAccountSelected(selectFirstByDefault: boolean = false): Promise<void> {
// Reset the dropdown's validation message if the old selection was not valid but the new one is // Reset the dropdown's validation message if the old selection was not valid but the new one is
this.validateAzureAccountSelection(false); this.validateAzureAccountSelection(false);
@@ -670,6 +670,9 @@ export class ConnectionWidget extends lifecycle.Disposable {
// The OR case can be removed once we no longer support ADAL // The OR case can be removed once we no longer support ADAL
let selectedAccount = this._azureAccountList.find(account => account.key.accountId === this._azureAccountDropdown.value let selectedAccount = this._azureAccountList.find(account => account.key.accountId === this._azureAccountDropdown.value
|| account.key.accountId.split('.')[0] === this._azureAccountDropdown.value); || account.key.accountId.split('.')[0] === this._azureAccountDropdown.value);
if (!selectedAccount && selectFirstByDefault && this._azureAccountList.length > 0) {
selectedAccount = this._azureAccountList[0];
}
if (selectedAccount && selectedAccount.properties.tenants && selectedAccount.properties.tenants.length > 1) { if (selectedAccount && selectedAccount.properties.tenants && selectedAccount.properties.tenants.length > 1) {
// There are multiple tenants available so let the user select one // There are multiple tenants available so let the user select one
let options = selectedAccount.properties.tenants.map(tenant => tenant.displayName); let options = selectedAccount.properties.tenants.map(tenant => tenant.displayName);