@microsoft/vscode-azext-azureauth 1.1.1 → 1.1.3

package/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://dev.azure.com/ms-azuretools/AzCode/_apis/build/status/vscode-azuretools)](https://dev.azure.com/ms-azuretools/AzCode/_build/latest?definitionId=17)
 
-This package provides a simple way to authenticate to Azure and receive Azure subscription information.
+This package provides a simple way to authenticate to Azure and receive Azure subscription information. It uses the [built-in Microsoft Authentication extension](https://github.com/microsoft/vscode/tree/main/extensions/microsoft-authentication) and does not rely on the [Azure Account extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.azure-account) in any way.
 
 ## Azure Subscription Provider
 

package/out/src/VSCodeAzureSubscriptionProvider.d.ts

@@ -28,9 +28,11 @@ export declare class VSCodeAzureSubscriptionProvider extends vscode.Disposable i
     /**
      * Checks to see if a user is signed in.
      *
+     * @param tenantId (Optional) Provide to check if a user is signed in to a specific tenant.
+     *
      * @returns True if the user is signed in, false otherwise.
      */
-    isSignedIn(): Promise<boolean>;
+    isSignedIn(tenantId?: string): Promise<boolean>;
     /**
      * Asks the user to sign in or pick an account to use.
      *

package/out/src/VSCodeAzureSubscriptionProvider.js

@@ -81,9 +81,9 @@ class VSCodeAzureSubscriptionProvider extends vscode.Disposable {
     getSubscriptions(filter = true) {
         return __awaiter(this, void 0, void 0, function* () {
             const tenantIds = yield this.getTenantFilters();
-            const tenantFilterNormalized = filter && !!tenantIds.length; // If the list is empty it is treated as "no filter"
+            const shouldFilterTenants = filter && !!tenantIds.length; // If the list is empty it is treated as "no filter"
             const subscriptionIds = yield this.getSubscriptionFilters();
-            const subscriptionFilterNormalized = filter && !!subscriptionIds.length; // If the list is empty it is treated as "no filter"
+            const shouldFilterSubscriptions = filter && !!subscriptionIds.length; // If the list is empty it is treated as "no filter"
             const results = [];
             try {
                 this.suppressSignInEvents = true;
@@ -92,13 +92,17 @@ class VSCodeAzureSubscriptionProvider extends vscode.Disposable {
                     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                     const tenantId = tenant.tenantId;
                     // If filtering is enabled, and the current tenant is not in that list, then skip it
-                    if (tenantFilterNormalized && !tenantIds.includes(tenantId)) {
+                    if (shouldFilterTenants && !tenantIds.includes(tenantId)) {
+                        continue;
+                    }
+                    // If the user is not signed in to this tenant, then skip it
+                    if (!(yield this.isSignedIn(tenantId))) {
                         continue;
                     }
                     // For each tenant, get the list of subscriptions
                     for (const subscription of yield this.getSubscriptionsForTenant(tenantId)) {
                         // If filtering is enabled, and the current subscription is not in that list, then skip it
-                        if (subscriptionFilterNormalized && !subscriptionIds.includes(subscription.subscriptionId)) {
+                        if (shouldFilterSubscriptions && !subscriptionIds.includes(subscription.subscriptionId)) {
                             continue;
                         }
                         results.push(subscription);
@@ -108,17 +112,19 @@ class VSCodeAzureSubscriptionProvider extends vscode.Disposable {
             finally {
                 this.suppressSignInEvents = false;
             }
-            return results;
+            return results.sort((a, b) => a.name.localeCompare(b.name));
         });
     }
     /**
      * Checks to see if a user is signed in.
      *
+     * @param tenantId (Optional) Provide to check if a user is signed in to a specific tenant.
+     *
      * @returns True if the user is signed in, false otherwise.
      */
-    isSignedIn() {
+    isSignedIn(tenantId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const session = yield vscode.authentication.getSession((0, configuredAzureEnv_1.getConfiguredAuthProviderId)(), this.getDefaultScopes(), { createIfNone: false, silent: true });
+            const session = yield vscode.authentication.getSession((0, configuredAzureEnv_1.getConfiguredAuthProviderId)(), this.getScopes([], tenantId), { createIfNone: false, silent: true });
             return !!session;
         });
     }

package/package.json

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