Fix remaining issues from #707 (#728)

microsoft · Jul 26, 2023 · ea3c668 · ea3c668
1 parent cd14e8a
commit ea3c668
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 23 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -384,10 +384,6 @@
                 }
             ],
             "commandPalette": [
-                {
-                    "command": "azureResourceGroups.logIn",
-                    "when": "isWeb"
-                },
                 {
                     "command": "azureResourceGroups.showGroupOptions",
                     "when": "never"
@@ -614,7 +610,7 @@
         "@azure/arm-resources": "^5.2.0",
         "@azure/arm-resources-profile-2020-09-01-hybrid": "^2.1.0",
         "@azure/arm-subscriptions": "^5.1.0",
-        "@microsoft/vscode-azext-azureauth": "^1.0.0",
+        "@microsoft/vscode-azext-azureauth": "^1.1.2",
         "@microsoft/vscode-azext-azureutils": "^2.0.0",
         "@microsoft/vscode-azext-utils": "^2.0.0",
         "buffer": "^6.0.3",

diff --git a/src/commands/accounts/logIn.ts b/src/commands/accounts/logIn.ts
@@ -6,8 +6,20 @@
 import { IActionContext } from '@microsoft/vscode-azext-utils';
 import { ext } from '../../extensionVariables';
 
+let _isLoggingIn: boolean = false;
+
 export async function logIn(_context: IActionContext): Promise<void> {
-    const provider = await ext.subscriptionProviderFactory();
-    await provider.signIn();
-    ext.actions.refreshAzureTree();
+    try {
+        const provider = await ext.subscriptionProviderFactory();
+        _isLoggingIn = true;
+        ext.actions.refreshAzureTree(); // Refresh to cause the "logging in" spinner to show
+        await provider.signIn();
+    } finally {
+        _isLoggingIn = false;
+        ext.actions.refreshAzureTree(); // Refresh now that sign in is complete
+    }
+}
+
+export function isLoggingIn(): boolean {
+    return _isLoggingIn;
 }
diff --git a/src/commands/accounts/selectSubscriptions.ts b/src/commands/accounts/selectSubscriptions.ts
@@ -32,7 +32,7 @@ export async function selectSubscriptions(context: IActionContext): Promise<void
             subscriptionQuickPickItems(),
             {
                 isPickSelected: (pick) => {
-                    return selectedSubscriptionIds.includes((pick as IAzureQuickPickItem<AzureSubscription>).data.subscriptionId);
+                    return selectedSubscriptionIds.length === 0 || selectedSubscriptionIds.includes((pick as IAzureQuickPickItem<AzureSubscription>).data.subscriptionId);
                 },
                 canPickMany: true,
                 placeHolder: localize('selectSubscriptions', 'Select Subscriptions')

diff --git a/src/tree/azure/AzureResourceTreeDataProvider.ts b/src/tree/azure/AzureResourceTreeDataProvider.ts
@@ -8,6 +8,7 @@ import { IActionContext, registerEvent } from '@microsoft/vscode-azext-utils';
 import * as vscode from 'vscode';
 import { ResourceModelBase } from '../../../api/src/index';
 import { AzureResourceProviderManager } from '../../api/ResourceProviderManagers';
+import { isLoggingIn } from '../../commands/accounts/logIn';
 import { showHiddenTypesSettingKey } from '../../constants';
 import { ext } from '../../extensionVariables';
 import { localize } from '../../utils/localize';
@@ -68,7 +69,15 @@ export class AzureResourceTreeDataProvider extends AzureResourceTreeDataProvider
             const subscriptionProvider = await this.getAzureSubscriptionProvider();
 
             if (subscriptionProvider) {
-                if (await subscriptionProvider.isSignedIn()) {
+                if (isLoggingIn()) {
+                    return [new GenericItem(
+                        localize('signingIn', 'Waiting for Azure sign-in...'),
+                        {
+                            commandId: 'azureResourceGroups.logIn',
+                            iconPath: new vscode.ThemeIcon('loading~spin')
+                        }
+                    )];
+                } else if (await subscriptionProvider.isSignedIn()) {
                     let subscriptions: AzureSubscription[];
 
                     if ((subscriptions = await subscriptionProvider.getSubscriptions(true)).length === 0) {

diff --git a/src/tree/azure/AzureResourceTreeDataProviderBase.ts b/src/tree/azure/AzureResourceTreeDataProviderBase.ts
@@ -64,8 +64,6 @@ export abstract class AzureResourceTreeDataProviderBase extends ResourceTreeData
                         // This event gets HEAVILY spammed and needs to be debounced
                         // Suppress additional messages for 1 second after the first one
                         this.notifyTreeDataChanged();
-                    } else {
-                        console.log("Too soon, ignoring this event");
                     }
                 }
             });