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

Handle default tenant to be set when only 1 tenant exists (#21532)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-01-05 16:40:16 -08:00
committed by GitHub
parent e904439060
commit ec7e754009
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/azurecore/src/account-provider/azureAccountProvider.ts
View File

@@ -146,6 +146,7 @@ export class AzureAccountProvider implements azdata.AccountProvider, vscode.Disp
if (azureAuth) { if (azureAuth) {
Logger.pii(`Getting account security token for ${JSON.stringify(account.key)} (tenant ${tenantId}). Auth Method = ${azureAuth.userFriendlyName}`, [], []); Logger.pii(`Getting account security token for ${JSON.stringify(account.key)} (tenant ${tenantId}). Auth Method = ${azureAuth.userFriendlyName}`, [], []);
if (this.authLibrary === Constants.AuthLibrary.MSAL) { if (this.authLibrary === Constants.AuthLibrary.MSAL) {
tenantId = tenantId || account.properties.owningTenant.id;
let authResult = await azureAuth.getTokenMsal(account.key.accountId, resource, tenantId); let authResult = await azureAuth.getTokenMsal(account.key.accountId, resource, tenantId);
if (!authResult || !authResult.account || !authResult.account.idTokenClaims) { if (!authResult || !authResult.account || !authResult.account.idTokenClaims) {
Logger.error(`MSAL: getToken call failed`); Logger.error(`MSAL: getToken call failed`);

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

@@ -689,6 +689,7 @@ export class ConnectionWidget extends lifecycle.Disposable {
} }
} }
else { else {
this._azureTenantId = selectedAccount.properties.tenants[0].id;
this.onAzureTenantSelected(0); this.onAzureTenantSelected(0);
} }
@@ -860,6 +861,13 @@ export class ConnectionWidget extends lifecycle.Disposable {
} }
this.onAzureTenantSelected(this._azureTenantDropdown.values.indexOf(this._azureTenantDropdown.value)); this.onAzureTenantSelected(this._azureTenantDropdown.values.indexOf(this._azureTenantDropdown.value));
} }
else if (account && account.properties.tenants && account.properties.tenants.length === 1) {
this._azureTenantId = account.properties.tenants[0].id;
this.onAzureTenantSelected(0);
}
else {
this._logService.error(`fillInConnectionInputs : Could not find any tenants for account ${accountName}`);
}
}).catch(err => this._logService.error(`Unexpected error populating initial Azure Account options : ${err}`)); }).catch(err => this._logService.error(`Unexpected error populating initial Azure Account options : ${err}`));
} }