auth: Display account name on duplicate tenant picks (#1862)

* Display account on duplicate tenants * Bump version * Update changelog
microsoft · Dec 20, 2024 · dd33af7 · dd33af7
1 parent 64f08cd
commit dd33af7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/auth/CHANGELOG.md b/auth/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## 4.0.3 - 2024-12-20
+* [#1862](https://github.com/microsoft/vscode-azuretools/pull/1862) Display account name on duplicate tenant picks
+
 ## 4.0.2 - 2024-12-19
 
 * [#1861](https://github.com/microsoft/vscode-azuretools/pull/1861) Remove unecessary if statement

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": "4.0.2",
+    "version": "4.0.3",
     "description": "Azure authentication helpers for Visual Studio Code",
     "tags": [
         "azure",

diff --git a/auth/src/signInToTenant.ts b/auth/src/signInToTenant.ts
@@ -34,12 +34,20 @@ interface TenantQuickPickItem extends vscode.QuickPickItem {
 
 async function getPicks(subscriptionProvider: AzureSubscriptionProvider): Promise<TenantQuickPickItem[]> {
     const unauthenticatedTenants = await getUnauthenticatedTenants(subscriptionProvider);
+    const duplicateTenants: Set<string | undefined> = new Set(
+        unauthenticatedTenants
+            .filter((tenant, index, self) => index !== self.findIndex(t => t.tenantId === tenant.tenantId))
+            .map(tenant => tenant.tenantId)
+    );
+    const isDuplicate = (tenantId: string) => duplicateTenants.has(tenantId);
+
     const picks: TenantQuickPickItem[] = unauthenticatedTenants
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         .sort((a, b) => (a.displayName!).localeCompare(b.displayName!))
         .map(tenant => ({
             label: tenant.displayName ?? '',
-            description: tenant.tenantId ?? '',
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            description: `${tenant.tenantId!}${isDuplicate(tenant.tenantId!) ? ` (${tenant.account.label})` : ''}`,
             detail: tenant.defaultDomain ?? '',
             tenant,
         }));

diff --git a/auth/src/utils/getUnauthenticatedTenants.ts b/auth/src/utils/getUnauthenticatedTenants.ts
@@ -3,15 +3,15 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import type { TenantIdDescription } from "@azure/arm-resources-subscriptions";
 import type { AzureSubscriptionProvider } from "../AzureSubscriptionProvider";
+import type { AzureTenant } from "../AzureTenant";
 
 /**
  * @returns list of tenants that VS Code doesn't have sessions for
  */
-export async function getUnauthenticatedTenants(subscriptionProvider: AzureSubscriptionProvider): Promise<TenantIdDescription[]> {
+export async function getUnauthenticatedTenants(subscriptionProvider: AzureSubscriptionProvider): Promise<AzureTenant[]> {
     const tenants = await subscriptionProvider.getTenants();
-    const unauthenticatedTenants: TenantIdDescription[] = [];
+    const unauthenticatedTenants: AzureTenant[] = [];
     for await (const tenant of tenants) {
         if (!await subscriptionProvider.isSignedIn(tenant.tenantId, tenant.account)) {
             unauthenticatedTenants.push(tenant);