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

Fix account and tenant selection behavior (#21749) (#21759)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-01-27 11:54:24 -08:00
committed by GitHub
parent a32edffa57
commit 5a79e41ed3
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/base/browser/ui/selectBox/selectBox.ts
View File

@@ -193,14 +193,14 @@ export class SelectBox extends vsSelectBox {
this.applyStyles(); this.applyStyles();
} }
public selectWithOptionName(optionName?: string): void { public selectWithOptionName(optionName?: string, selectFirstByDefault: boolean = true): void {
let option: number | undefined; let option: number | undefined;
if (optionName !== undefined) { if (optionName !== undefined) {
option = this._optionsDictionary.get(optionName); option = this._optionsDictionary.get(optionName);
} }
if (option !== undefined) { if (option !== undefined) {
this.select(option); this.select(option);
} else { } else if (selectFirstByDefault) {
this.select(0); this.select(0);
} }
} }

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

@@ -623,7 +623,7 @@ export class ConnectionWidget extends lifecycle.Disposable {
} }
accountDropdownOptions.push({ text: this._addAzureAccountMessage, value: this._addAzureAccountMessage }); accountDropdownOptions.push({ text: this._addAzureAccountMessage, value: this._addAzureAccountMessage });
this._azureAccountDropdown.setOptions(accountDropdownOptions); this._azureAccountDropdown.setOptions(accountDropdownOptions);
this._azureAccountDropdown.selectWithOptionName(oldSelection); this._azureAccountDropdown.selectWithOptionName(oldSelection, false);
} }
private updateRefreshCredentialsLink(): void { private updateRefreshCredentialsLink(): void {
@@ -689,15 +689,12 @@ export class ConnectionWidget extends lifecycle.Disposable {
} }
} }
else { else {
this._azureTenantId = selectedAccount.properties.tenants[0].id;
this.onAzureTenantSelected(0); this.onAzureTenantSelected(0);
} }
} else { } else {
if (selectedAccount && selectedAccount.properties.tenants && selectedAccount.properties.tenants.length === 1) { if (selectedAccount && selectedAccount.properties.tenants && selectedAccount.properties.tenants.length === 1) {
this._azureTenantId = selectedAccount.properties.tenants[0].id; this._azureTenantId = selectedAccount.properties.tenants[0].id;
} else {
this._azureTenantId = undefined;
} }
this._tableContainer.classList.add(hideTenantsClassName); this._tableContainer.classList.add(hideTenantsClassName);
} }
@@ -841,15 +838,24 @@ export class ConnectionWidget extends lifecycle.Disposable {
if (this.authType === AuthenticationType.AzureMFA || this.authType === AuthenticationType.AzureMFAAndUser) { if (this.authType === AuthenticationType.AzureMFA || this.authType === AuthenticationType.AzureMFAAndUser) {
this.fillInAzureAccountOptions().then(async () => { this.fillInAzureAccountOptions().then(async () => {
let tenantId = connectionInfo.azureTenantId;
let accountName = (this.authType === AuthenticationType.AzureMFA) let accountName = (this.authType === AuthenticationType.AzureMFA)
? connectionInfo.azureAccount : connectionInfo.userName; ? connectionInfo.azureAccount : connectionInfo.userName;
// For backwards compatibility with ADAL, we need to check if the account ID matches with tenant Id or just the account ID let account: azdata.Account;
// The OR case can be removed once we no longer support ADAL if (accountName) {
let account = this._azureAccountList.find(account => account.key.accountId === this.getModelValue(accountName) // For backwards compatibility with ADAL, we need to check if the account ID matches with tenant Id or just the account ID
|| account.key.accountId.split('.')[0] === this.getModelValue(accountName)); // The OR case can be removed once we no longer support ADAL
this._azureAccountDropdown.selectWithOptionName(account.key.accountId); account = this._azureAccountList.find(account => account.key.accountId === this.getModelValue(accountName)
|| account.key.accountId.split('.')[0] === this.getModelValue(accountName));
this._azureAccountDropdown.selectWithOptionName(account.key.accountId);
} else {
// If account was not filled in from received configuration, select the first account.
this._azureAccountDropdown.select(0);
account = this._azureAccountList[0];
accountName = account.key.accountId;
}
await this.onAzureAccountSelected(); await this.onAzureAccountSelected();
let tenantId = connectionInfo.azureTenantId;
if (account && account.properties.tenants && account.properties.tenants.length > 1) { if (account && account.properties.tenants && account.properties.tenants.length > 1) {
let tenant = account.properties.tenants.find(tenant => tenant.id === tenantId); let tenant = account.properties.tenants.find(tenant => tenant.id === tenantId);
if (tenant) { if (tenant) {
@@ -921,6 +927,13 @@ export class ConnectionWidget extends lifecycle.Disposable {
if (this._authTypeSelectBox) { if (this._authTypeSelectBox) {
this._authTypeSelectBox.disable(); this._authTypeSelectBox.disable();
} }
if (this.authType === AuthenticationType.AzureMFA || this.authType === AuthenticationType.AzureMFAAndUser) {
this._azureAccountDropdown.disable();
this._azureTenantDropdown?.disable();
if (!this._azureAccountDropdown.value) {
this._azureAccountDropdown.select(0);
}
}
if (this._customOptionWidgets) { if (this._customOptionWidgets) {
this._customOptionWidgets.forEach(widget => { this._customOptionWidgets.forEach(widget => {
widget.disable(); widget.disable();
@@ -963,6 +976,12 @@ export class ConnectionWidget extends lifecycle.Disposable {
if (this._databaseNameInputBox) { if (this._databaseNameInputBox) {
this._databaseNameInputBox.enabled = true; this._databaseNameInputBox.enabled = true;
} }
if (this.authType === AuthenticationType.AzureMFA || this.authType === AuthenticationType.AzureMFAAndUser) {
this._azureAccountDropdown.enable();
this._azureTenantDropdown?.enable();
}
if (this._customOptionWidgets) { if (this._customOptionWidgets) {
this._customOptionWidgets.forEach(widget => { this._customOptionWidgets.forEach(widget => {
widget.enable(); widget.enable();