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

Tenant filter fix (#11411)

Browse Source 
* Fix tenant filter

* Test for the azure filter feature
This commit is contained in:
Amir Omidi
2020-07-17 12:46:22 -07:00
committed by GitHub
parent fea0fb13f6
commit 648174e91d
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -435,7 +435,7 @@ export abstract class AzureAuth implements vscode.Disposable {
}
}
private async openConsentDialog(tenant: Tenant, resourceId: string): Promise<boolean> {
public async openConsentDialog(tenant: Tenant, resourceId: string): Promise<boolean> {
if (!tenant.displayName && !tenant.id) {
throw new Error('Tenant did not have display name or id');
}
@@ -451,18 +451,18 @@ export abstract class AzureAuth implements vscode.Disposable {
};
// The user wants to ignore this tenant.
if (getTenantConfigurationSet().has(tenant?.displayName ?? tenant?.id)) {
if (getTenantConfigurationSet().has(tenant.id)) {
return false;
}
const updateTenantConfigurationSet = (set: Set<string>): void => {
const updateTenantConfigurationSet = async (set: Set<string>): Promise<void> => {
const configuration = vscode.workspace.getConfiguration('azure.tenant.config');
configuration.update('filter', Array.from(set), vscode.ConfigurationTarget.Global);
await configuration.update('filter', Array.from(set), vscode.ConfigurationTarget.Global);
};
interface ConsentMessageItem extends vscode.MessageItem {
booleanResult: boolean;
action?: (tenantId: string) => void;
action?: (tenantId: string) => Promise<void>;
}
const openItem: ConsentMessageItem = {
@@ -479,10 +479,10 @@ export abstract class AzureAuth implements vscode.Disposable {
const dontAskAgainItem: ConsentMessageItem = {
title: localize('azurecore.consentDialog.ignore', "Ignore Tenant"),
booleanResult: false,
action: (tenantId: string) => {
action: async (tenantId: string) => {
let set = getTenantConfigurationSet();
set.add(tenantId);
updateTenantConfigurationSet(set);
await updateTenantConfigurationSet(set);
}
};
@@ -490,7 +490,7 @@ export abstract class AzureAuth implements vscode.Disposable {
const result = await vscode.window.showInformationMessage(messageBody, { modal: true }, openItem, closeItem, dontAskAgainItem);
if (result.action) {
result.action(tenant.id);
await result.action(tenant.id);
}
return result.booleanResult;