auth: Check if tenant is signed in before listing subscriptions (#1585)

* auth: Check if tenant is signed in before listing subscriptions * Bump version
microsoft · Sep 14, 2023 · 171a189 · 171a189
1 parent d3a81b5
commit 171a189
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/auth/package-lock.json b/auth/package-lock.json
diff --git a/auth/package.json b/auth/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@microsoft/vscode-azext-azureauth",
     "author": "Microsoft Corporation",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "description": "Azure authentication helpers for Visual Studio Code",
     "tags": [
         "azure",

diff --git a/auth/src/VSCodeAzureSubscriptionProvider.ts b/auth/src/VSCodeAzureSubscriptionProvider.ts
@@ -85,6 +85,11 @@ export class VSCodeAzureSubscriptionProvider extends vscode.Disposable implement
                     continue;
                 }
 
+                // If the user is not signed in to this tenant, then skip it
+                if (!(await this.isSignedIn(tenantId))) {
+                    continue;
+                }
+
                 // For each tenant, get the list of subscriptions
                 for (const subscription of await this.getSubscriptionsForTenant(tenantId)) {
                     // If filtering is enabled, and the current subscription is not in that list, then skip it
@@ -105,10 +110,12 @@ export class VSCodeAzureSubscriptionProvider extends vscode.Disposable implement
     /**
      * 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.
      */
-    public async isSignedIn(): Promise<boolean> {
-        const session = await vscode.authentication.getSession(getConfiguredAuthProviderId(), this.getDefaultScopes(), { createIfNone: false, silent: true });
+    public async isSignedIn(tenantId?: string): Promise<boolean> {
+        const session = await vscode.authentication.getSession(getConfiguredAuthProviderId(), this.getScopes([], tenantId), { createIfNone: false, silent: true });
         return !!session;
     }