@microsoft/vscode-azext-azureauth 6.0.0-alpha.6 → 6.0.0-alpha.8

package/dist/cjs/src/providers/AzureSubscriptionProviderBase.js

@@ -51,7 +51,7 @@ const Limiter_1 = require("../utils/Limiter");
 const NotSignedInError_1 = require("../utils/NotSignedInError");
 const screen_1 = require("../utils/screen");
 const tryGetTokenExpiration_1 = require("../utils/tryGetTokenExpiration");
-const EventDebounce = 5 * 1000; // 5 seconds minimum between `onRefreshSuggested` events
+const EventDebounce = 2 * 1000; // 2 seconds minimum between `onRefreshSuggested` events
 const EventSilenceTime = 5 * 1000; // 5 seconds after sign-in to silence `onRefreshSuggested` events
 const TenantListConcurrency = 3; // We will try to list tenants for at most 3 accounts in parallel
 const SubscriptionListConcurrency = 5; // We will try to list subscriptions for at most 5 account+tenants in parallel
@@ -94,7 +94,11 @@ class AzureSubscriptionProviderBase {
         return this.refreshSuggestedEmitter.event(callback, thisArg, disposables);
     }
     fireRefreshSuggestedIfNeeded(evtArgs) {
-        if (this.suppressRefreshSuggestedEvents || Date.now() < this.lastRefreshSuggestedTime + EventDebounce) {
+        // subscriptionFilterChange is an explicit user action and must never be suppressed,
+        // otherwise re-selecting a subscription shortly after unselecting one gets swallowed
+        // by the debounce/silence window that the first refresh triggered.
+        if (evtArgs.reason !== 'subscriptionFilterChange' &&
+            (this.suppressRefreshSuggestedEvents || Date.now() < this.lastRefreshSuggestedTime + EventDebounce)) {
             // Suppress and/or debounce events to avoid flooding
             return false;
         }

package/dist/cjs/src/providers/VSCodeAzureSubscriptionProvider.js

@@ -40,6 +40,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VSCodeAzureSubscriptionProvider = void 0;
 const vscode = __importStar(require("vscode"));
 const AzureSubscriptionProviderRequestOptions_1 = require("../contracts/AzureSubscriptionProviderRequestOptions"); // eslint-disable-line @typescript-eslint/no-unused-vars -- It is used in the doc comments
+const configuredAzureEnv_1 = require("../utils/configuredAzureEnv");
 const dedupeSubscriptions_1 = require("../utils/dedupeSubscriptions");
 const CaselessMap_1 = require("../utils/map/CaselessMap");
 const TwoKeyCaselessMap_1 = require("../utils/map/TwoKeyCaselessMap");
@@ -71,6 +72,13 @@ class VSCodeAzureSubscriptionProvider extends AzureSubscriptionProviderBase_1.Az
             if (e.affectsConfiguration(`${ConfigPrefix}.${SelectedSubscriptionsConfigKey}`)) {
                 this.fireRefreshSuggestedIfNeeded({ reason: 'subscriptionFilterChange' });
             }
+            else if (e.affectsConfiguration(configuredAzureEnv_1.CustomCloudConfigurationSection)) {
+                this.accountCache.clear();
+                this.tenantCache.clear();
+                this.subscriptionCache.clear();
+                this.log('Cleared all caches due to cloud environment change');
+                this.fireRefreshSuggestedIfNeeded({ reason: 'cloudChange' });
+            }
         });
         return super.onRefreshSuggested(callback, thisArg, disposables);
     }

package/dist/cjs/src/utils/configuredAzureEnv.js

@@ -37,14 +37,14 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtendedEnvironment = void 0;
+exports.ExtendedEnvironment = exports.CustomCloudConfigurationSection = void 0;
 exports.getConfiguredAzureEnv = getConfiguredAzureEnv;
 exports.setConfiguredAzureEnv = setConfiguredAzureEnv;
 exports.getConfiguredAuthProviderId = getConfiguredAuthProviderId;
 const azureEnv = __importStar(require("@azure/ms-rest-azure-env")); // This package is so small that it's not worth lazy loading
 const vscode = __importStar(require("vscode"));
 // These strings come from https://github.com/microsoft/vscode/blob/eac16e9b63a11885b538db3e0b533a02a2fb8143/extensions/microsoft-authentication/package.json#L40-L99
-const CustomCloudConfigurationSection = 'microsoft-sovereign-cloud';
+exports.CustomCloudConfigurationSection = 'microsoft-sovereign-cloud';
 const CloudEnvironmentSettingName = 'environment';
 const CustomEnvironmentSettingName = 'customEnvironment';
 var CloudEnvironmentSettingValue;
@@ -70,7 +70,7 @@ exports.ExtendedEnvironment = ExtendedEnvironment;
  * @returns The configured Azure environment from the settings in the built-in authentication provider extension
  */
 function getConfiguredAzureEnv() {
-    const authProviderConfig = vscode.workspace.getConfiguration(CustomCloudConfigurationSection);
+    const authProviderConfig = vscode.workspace.getConfiguration(exports.CustomCloudConfigurationSection);
     const environmentSettingValue = authProviderConfig.get(CloudEnvironmentSettingName);
     if (environmentSettingValue === CloudEnvironmentSettingValue.ChinaCloud) {
         return new ExtendedEnvironment(azureEnv.Environment.ChinaCloud, false);
@@ -83,7 +83,7 @@ function getConfiguredAzureEnv() {
         if (customCloud) {
             return new ExtendedEnvironment(customCloud, true);
         }
-        throw new Error(vscode.l10n.t('The custom cloud choice is not configured. Please configure the setting `{0}.{1}`.', CustomCloudConfigurationSection, CustomEnvironmentSettingName));
+        throw new Error(vscode.l10n.t('The custom cloud choice is not configured. Please configure the setting `{0}.{1}`.', exports.CustomCloudConfigurationSection, CustomEnvironmentSettingName));
     }
     return new ExtendedEnvironment(azureEnv.Environment.AzureCloud, false);
 }
@@ -96,7 +96,7 @@ function getConfiguredAzureEnv() {
  * @param target (Optional) The configuration target to use, by default {@link vscode.ConfigurationTarget.Global}.
  */
 async function setConfiguredAzureEnv(cloud, target = vscode.ConfigurationTarget.Global) {
-    const authProviderConfig = vscode.workspace.getConfiguration(CustomCloudConfigurationSection);
+    const authProviderConfig = vscode.workspace.getConfiguration(exports.CustomCloudConfigurationSection);
     if (typeof cloud === 'undefined' || !cloud) {
         // Use public cloud implicitly--set `environment` setting to `undefined`
         await authProviderConfig.update(CloudEnvironmentSettingName, undefined, target);

package/dist/esm/src/contracts/AzureSubscriptionProvider.d.ts

@@ -10,7 +10,7 @@ export interface AzureSubscriptionProvider {
     /**
      * Fires when the list of available subscriptions may have changed, and a refresh is suggested.
      * The callback will be given a {@link RefreshSuggestedEvent} with more information.
-     * @note This will be fired at most every 5 seconds, to avoid flooding. It is also suppressed
+     * @note This will be fired at most every 2 seconds, to avoid flooding. It is also suppressed
      * during operations this provider is performing itself, such as during sign-in.
      */
     onRefreshSuggested: vscode.Event<RefreshSuggestedEvent>;
@@ -108,5 +108,5 @@ export interface RefreshSuggestedEvent {
     /**
      * The reason a refresh was suggested.
      */
-    reason: 'sessionChange' | 'subscriptionFilterChange';
+    reason: 'sessionChange' | 'subscriptionFilterChange' | 'cloudChange';
 }

package/dist/esm/src/providers/AzureSubscriptionProviderBase.js

@@ -15,7 +15,7 @@ import { Limiter } from '../utils/Limiter';
 import { isNotSignedInError, NotSignedInError } from '../utils/NotSignedInError';
 import { screen } from '../utils/screen';
 import { tryGetTokenExpiration } from '../utils/tryGetTokenExpiration';
-const EventDebounce = 5 * 1000; // 5 seconds minimum between `onRefreshSuggested` events
+const EventDebounce = 2 * 1000; // 2 seconds minimum between `onRefreshSuggested` events
 const EventSilenceTime = 5 * 1000; // 5 seconds after sign-in to silence `onRefreshSuggested` events
 const TenantListConcurrency = 3; // We will try to list tenants for at most 3 accounts in parallel
 const SubscriptionListConcurrency = 5; // We will try to list subscriptions for at most 5 account+tenants in parallel
@@ -58,7 +58,11 @@ export class AzureSubscriptionProviderBase {
         return this.refreshSuggestedEmitter.event(callback, thisArg, disposables);
     }
     fireRefreshSuggestedIfNeeded(evtArgs) {
-        if (this.suppressRefreshSuggestedEvents || Date.now() < this.lastRefreshSuggestedTime + EventDebounce) {
+        // subscriptionFilterChange is an explicit user action and must never be suppressed,
+        // otherwise re-selecting a subscription shortly after unselecting one gets swallowed
+        // by the debounce/silence window that the first refresh triggered.
+        if (evtArgs.reason !== 'subscriptionFilterChange' &&
+            (this.suppressRefreshSuggestedEvents || Date.now() < this.lastRefreshSuggestedTime + EventDebounce)) {
             // Suppress and/or debounce events to avoid flooding
             return false;
         }

package/dist/esm/src/providers/VSCodeAzureSubscriptionProvider.js

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as vscode from 'vscode';
 import { DefaultOptions, getCoalescenceKey } from '../contracts/AzureSubscriptionProviderRequestOptions'; // eslint-disable-line @typescript-eslint/no-unused-vars -- It is used in the doc comments
+import { CustomCloudConfigurationSection } from '../utils/configuredAzureEnv';
 import { dedupeSubscriptions } from '../utils/dedupeSubscriptions';
 import { CaselessMap } from '../utils/map/CaselessMap';
 import { TwoKeyCaselessMap } from '../utils/map/TwoKeyCaselessMap';
@@ -35,6 +36,13 @@ export class VSCodeAzureSubscriptionProvider extends AzureSubscriptionProviderBa
             if (e.affectsConfiguration(`${ConfigPrefix}.${SelectedSubscriptionsConfigKey}`)) {
                 this.fireRefreshSuggestedIfNeeded({ reason: 'subscriptionFilterChange' });
             }
+            else if (e.affectsConfiguration(CustomCloudConfigurationSection)) {
+                this.accountCache.clear();
+                this.tenantCache.clear();
+                this.subscriptionCache.clear();
+                this.log('Cleared all caches due to cloud environment change');
+                this.fireRefreshSuggestedIfNeeded({ reason: 'cloudChange' });
+            }
         });
         return super.onRefreshSuggested(callback, thisArg, disposables);
     }

package/dist/esm/src/utils/configuredAzureEnv.d.ts

@@ -1,5 +1,6 @@
 import * as azureEnv from '@azure/ms-rest-azure-env';
 import * as vscode from 'vscode';
+export declare const CustomCloudConfigurationSection = "microsoft-sovereign-cloud";
 export declare class ExtendedEnvironment extends azureEnv.Environment {
     readonly isCustomCloud: boolean;
     constructor(parameters: azureEnv.EnvironmentParameters, isCustomCloud: boolean);

package/dist/esm/src/utils/configuredAzureEnv.js

@@ -5,7 +5,7 @@
 import * as azureEnv from '@azure/ms-rest-azure-env'; // This package is so small that it's not worth lazy loading
 import * as vscode from 'vscode';
 // These strings come from https://github.com/microsoft/vscode/blob/eac16e9b63a11885b538db3e0b533a02a2fb8143/extensions/microsoft-authentication/package.json#L40-L99
-const CustomCloudConfigurationSection = 'microsoft-sovereign-cloud';
+export const CustomCloudConfigurationSection = 'microsoft-sovereign-cloud';
 const CloudEnvironmentSettingName = 'environment';
 const CustomEnvironmentSettingName = 'customEnvironment';
 var CloudEnvironmentSettingValue;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@microsoft/vscode-azext-azureauth",
     "author": "Microsoft Corporation",
-    "version": "6.0.0-alpha.6",
+    "version": "6.0.0-alpha.8",
     "description": "Azure authentication helpers for Visual Studio Code",
     "tags": [
         "azure",