ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-04-01 09:30:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Introduce Tenant hierarchy in Azure resource tree for multi-tenant accounts (#23311)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-06-13 21:23:00 -07:00
committed by GitHub
parent 1ff0a07217
commit f6e70d28c9
46 changed files with 1167 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/azurecore/src/account-provider/auths/azureAuth.ts
View File

@@ -194,7 +194,7 @@ export abstract class AzureAuth implements vscode.Disposable {
public async hydrateAccount(token: Token | AccessToken, tokenClaims: TokenClaims): Promise<AzureAccount> {
let account: azdata.Account;
if (this._authLibrary === Constants.AuthLibrary.MSAL) {
const tenants = await this.getTenantsMsal(token.token);
const tenants = await this.getTenantsMsal(token.token, tokenClaims);
account = this.createAccount(tokenClaims, token.key, tenants);
} else { // fallback to ADAL as default
const tenants = await this.getTenantsAdal({ ...token });
@@ -471,7 +471,7 @@ export abstract class AzureAuth implements vscode.Disposable {
return result;
}
public async getTenantsMsal(token: string): Promise<Tenant[]> {
public async getTenantsMsal(token: string, tokenClaims: TokenClaims): Promise<Tenant[]> {
const tenantUri = url.resolve(this.metadata.settings.armResource.endpoint, 'tenants?api-version=2019-11-01');
try {
Logger.verbose(`Fetching tenants with uri: ${tenantUri}`);
@@ -499,7 +499,7 @@ export abstract class AzureAuth implements vscode.Disposable {
return {
id: tenantInfo.tenantId,
displayName: tenantInfo.displayName ? tenantInfo.displayName : tenantInfo.tenantId,
userId: token,
userId: tokenClaims.oid,
tenantCategory: tenantInfo.tenantCategory
} as Tenant;
});