ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix to not prompt user when token acquisition fails for stale user accounts. (#20516)

Browse Source
This commit is contained in:
Cheena Malhotra
2022-08-31 17:26:40 -07:00
committed by GitHub
parent 186b89f371
commit a8a235bded
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/azurecore/src/azureResource/services/subscriptionService.ts
View File

@@ -31,6 +31,7 @@ export class AzureResourceSubscriptionService implements IAzureResourceSubscript
for (const tenantId of tenantIds ?? account.properties.tenants.map(t => t.id)) { for (const tenantId of tenantIds ?? account.properties.tenants.map(t => t.id)) {
try { try {
const token = await azdata.accounts.getAccountSecurityToken(account, tenantId, azdata.AzureResource.ResourceManagement); const token = await azdata.accounts.getAccountSecurityToken(account, tenantId, azdata.AzureResource.ResourceManagement);
if (token !== undefined) {
const subClient = new SubscriptionClient(new TokenCredentials(token.token, token.tokenType), { baseUri: account.properties.providerSettings.settings.armResource.endpoint }); const subClient = new SubscriptionClient(new TokenCredentials(token.token, token.tokenType), { baseUri: account.properties.providerSettings.settings.armResource.endpoint });
const newSubs = await subClient.subscriptions.list(); const newSubs = await subClient.subscriptions.list();
subscriptions.push(...newSubs.map(newSub => { subscriptions.push(...newSubs.map(newSub => {
@@ -41,8 +42,14 @@ export class AzureResourceSubscriptionService implements IAzureResourceSubscript
}; };
})); }));
gotSubscriptions = true; gotSubscriptions = true;
}
else if (!account.isStale) {
const errorMsg = localize('azure.resource.tenantTokenError', "Failed to acquire Access Token for account '{0}' (tenant '{1}').", account.displayInfo.displayName, tenantId);
console.warn(errorMsg);
void vscode.window.showWarningMessage(errorMsg);
}
} catch (error) { } catch (error) {
const errorMsg = localize('azure.resource.tenantSubscriptionsError', "Failed to get subscriptions for account {0} (tenant '{1}'). {2}", account.key.accountId, tenantId, AzureResourceErrorMessageUtil.getErrorMessage(error)); const errorMsg = localize('azure.resource.tenantSubscriptionsError', "Failed to get subscriptions for account {0} (tenant '{1}'). {2}", account.displayInfo.displayName, tenantId, AzureResourceErrorMessageUtil.getErrorMessage(error));
console.warn(errorMsg); console.warn(errorMsg);
errors.push(error); errors.push(error);
void vscode.window.showWarningMessage(errorMsg); void vscode.window.showWarningMessage(errorMsg);