@microsoft/vscode-azext-azureauth 6.0.0-alpha.2 → 6.0.0-alpha.4

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

@@ -41,6 +41,7 @@ exports.AzureDevOpsSubscriptionProvider = void 0;
 exports.createAzureDevOpsSubscriptionProviderFactory = createAzureDevOpsSubscriptionProviderFactory;
 const azureEnv = __importStar(require("@azure/ms-rest-azure-env")); // This package is so small that it's not worth lazy loading
 const crypto = __importStar(require("crypto"));
+const configuredAzureEnv_1 = require("../utils/configuredAzureEnv");
 const isAuthenticationWwwAuthenticateRequest_1 = require("../utils/isAuthenticationWwwAuthenticateRequest");
 const NotSignedInError_1 = require("../utils/NotSignedInError");
 const AzureSubscriptionProviderBase_1 = require("./AzureSubscriptionProviderBase");
@@ -90,6 +91,7 @@ class AzureDevOpsSubscriptionProvider extends AzureSubscriptionProviderBase_1.Az
             {
                 id: 'test-account-id',
                 label: 'test-account',
+                environment: new configuredAzureEnv_1.ExtendedEnvironment(azureEnv.Environment.AzureCloud, false),
             }
         ]);
     }

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

@@ -38,6 +38,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzureSubscriptionProviderBase = void 0;
+const util_1 = require("util");
 const vscode = __importStar(require("vscode"));
 const AzureSubscriptionProviderRequestOptions_1 = require("../contracts/AzureSubscriptionProviderRequestOptions");
 const configuredAzureEnv_1 = require("../utils/configuredAzureEnv");
@@ -165,7 +166,9 @@ class AzureSubscriptionProviderBase {
                                         this.logForTenant(tenant, 'Skipping account+tenant because it is not signed in');
                                         return;
                                     }
-                                    throw err;
+                                    // Don't rethrow--skip tenants that fail for other reasons
+                                    // (e.g., locked account) so remaining tenants can still be listed
+                                    this.errorForTenant(tenant, 'Skipping account+tenant due to error', err);
                                 }
                             }));
                         }
@@ -175,6 +178,8 @@ class AzureSubscriptionProviderBase {
                             this.logForAccount(account, 'Skipping account because it is not signed in');
                             return;
                         }
+                        // Log and skip accounts that fail for other reasons (e.g., locked account)
+                        this.errorForAccount(account, 'Skipping account due to error', err);
                     }
                 }));
             }
@@ -198,7 +203,13 @@ class AzureSubscriptionProviderBase {
             const startTime = Date.now();
             this.log('Fetching accounts...');
             this.silenceRefreshEvents();
-            const results = await vscode.authentication.getAccounts((0, configuredAzureEnv_1.getConfiguredAuthProviderId)());
+            const environment = (0, configuredAzureEnv_1.getConfiguredAzureEnv)();
+            const results = (await vscode.authentication.getAccounts((0, configuredAzureEnv_1.getConfiguredAuthProviderId)())).map(account => {
+                return {
+                    ...account,
+                    environment,
+                };
+            });
             if (results.length === 0) {
                 this.log('No accounts found');
                 throw new NotSignedInError_1.NotSignedInError();
@@ -292,7 +303,6 @@ class AzureSubscriptionProviderBase {
                     name: subscription.displayName,
                     subscriptionId: subscription.subscriptionId,
                     /* eslint-enable @typescript-eslint/no-non-null-assertion */
-                    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                     tenantId: subscription.tenantId || tenant.tenantId, // In rare cases, a subscription may be listed but come from a different tenant
                     account: tenant.account,
                 });
@@ -314,11 +324,13 @@ class AzureSubscriptionProviderBase {
      * @returns A {@link SubscriptionClient}, {@link TokenCredential}, and {@link AzureAuthentication} for the given account+tenant.
      */
     async getSubscriptionClient(tenant) {
+        // Credential ignores requested scopes and always uses default scopes (managementEndpointUrl),
+        // matching the scope used during signIn(). This avoids a refresh token round-trip that can
+        // fail when MSAL has stale cache entries for a different scope.
         const credential = {
-            getToken: async (scopes, options) => {
+            getToken: async (_scopes, options) => {
                 this.silenceRefreshEvents();
-                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                const session = await (0, getSessionFromVSCode_1.getSessionFromVSCode)(scopes, options?.tenantId || tenant.tenantId, { createIfNone: false, silent: true, account: tenant.account });
+                const session = await (0, getSessionFromVSCode_1.getSessionFromVSCode)(undefined, options?.tenantId || tenant.tenantId, { createIfNone: false, silent: true, account: tenant.account });
                 if (!session) {
                     throw new NotSignedInError_1.NotSignedInError();
                 }
@@ -364,6 +376,30 @@ class AzureSubscriptionProviderBase {
     logForTenant(tenant, message) {
         this.logger?.debug(`[auth] [account: ${(0, screen_1.screen)(tenant.account)}] [tenant: ${(0, screen_1.screen)(tenant)}] ${message}`);
     }
+    warnForAccount(account, message) {
+        this.logger?.warn(`[auth] [account: ${(0, screen_1.screen)(account)}] ${message}`);
+    }
+    warnForTenant(tenant, message) {
+        this.logger?.warn(`[auth] [account: ${(0, screen_1.screen)(tenant.account)}] [tenant: ${(0, screen_1.screen)(tenant)}] ${message}`);
+    }
+    errorForAccount(account, message, err) {
+        this.logger?.error(`[auth] [account: ${(0, screen_1.screen)(account)}] ${message}`);
+        if (err instanceof Error) {
+            this.logger?.error(err);
+        }
+        else {
+            this.logger?.error(`[auth] [account: ${(0, screen_1.screen)(account)}] ${(0, util_1.inspect)(err)}`);
+        }
+    }
+    errorForTenant(tenant, message, err) {
+        this.logger?.error(`[auth] [account: ${(0, screen_1.screen)(tenant.account)}] [tenant: ${(0, screen_1.screen)(tenant)}] ${message}`);
+        if (err instanceof Error) {
+            this.logger?.error(err);
+        }
+        else {
+            this.logger?.error(`[auth] [account: ${(0, screen_1.screen)(tenant.account)}] [tenant: ${(0, screen_1.screen)(tenant)}] ${(0, util_1.inspect)(err)}`);
+        }
+    }
     throwIfCancelled(token) {
         if (token?.isCancellationRequested) {
             throw new vscode.CancellationError();

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

@@ -37,6 +37,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExtendedEnvironment = void 0;
 exports.getConfiguredAzureEnv = getConfiguredAzureEnv;
 exports.setConfiguredAzureEnv = setConfiguredAzureEnv;
 exports.getConfiguredAuthProviderId = getConfiguredAuthProviderId;
@@ -62,6 +63,7 @@ class ExtendedEnvironment extends azureEnv.Environment {
         Object.assign(this, parameters);
     }
 }
+exports.ExtendedEnvironment = ExtendedEnvironment;
 /**
  * Gets the configured Azure environment.
  *

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

@@ -1,5 +1,8 @@
 import type * as vscode from 'vscode';
+import type { ExtendedEnvironment } from '../utils/configuredAzureEnv';
 /**
  * A shortcut type for {@link vscode.AuthenticationSessionAccountInformation}
  */
-export type AzureAccount = Readonly<vscode.AuthenticationSessionAccountInformation>;
+export type AzureAccount = Readonly<vscode.AuthenticationSessionAccountInformation> & {
+    readonly environment: ExtendedEnvironment;
+};

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

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as azureEnv from '@azure/ms-rest-azure-env'; // This package is so small that it's not worth lazy loading
 import * as crypto from 'crypto';
+import { ExtendedEnvironment } from '../utils/configuredAzureEnv';
 import { isAuthenticationWwwAuthenticateRequest } from '../utils/isAuthenticationWwwAuthenticateRequest';
 import { NotSignedInError } from '../utils/NotSignedInError';
 import { AzureSubscriptionProviderBase } from './AzureSubscriptionProviderBase';
@@ -53,6 +54,7 @@ export class AzureDevOpsSubscriptionProvider extends AzureSubscriptionProviderBa
             {
                 id: 'test-account-id',
                 label: 'test-account',
+                environment: new ExtendedEnvironment(azureEnv.Environment.AzureCloud, false),
             }
         ]);
     }

package/dist/esm/src/providers/AzureSubscriptionProviderBase.d.ts

@@ -67,6 +67,10 @@ export declare abstract class AzureSubscriptionProviderBase implements AzureSubs
     protected log(message: string): void;
     protected logForAccount(account: AzureAccount, message: string): void;
     protected logForTenant(tenant: TenantIdAndAccount, message: string): void;
+    protected warnForAccount(account: AzureAccount, message: string): void;
+    protected warnForTenant(tenant: TenantIdAndAccount, message: string): void;
+    protected errorForAccount(account: AzureAccount, message: string, err: unknown): void;
+    protected errorForTenant(tenant: TenantIdAndAccount, message: string, err: unknown): void;
     protected throwIfCancelled(token: vscode.CancellationToken | undefined): void;
     private timeout;
     private silenceRefreshEvents;

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

@@ -2,6 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+import { inspect } from 'util';
 import * as vscode from 'vscode';
 import { DefaultOptions, DefaultSignInOptions } from '../contracts/AzureSubscriptionProviderRequestOptions';
 import { getConfiguredAuthProviderId, getConfiguredAzureEnv } from '../utils/configuredAzureEnv';
@@ -129,7 +130,9 @@ export class AzureSubscriptionProviderBase {
                                         this.logForTenant(tenant, 'Skipping account+tenant because it is not signed in');
                                         return;
                                     }
-                                    throw err;
+                                    // Don't rethrow--skip tenants that fail for other reasons
+                                    // (e.g., locked account) so remaining tenants can still be listed
+                                    this.errorForTenant(tenant, 'Skipping account+tenant due to error', err);
                                 }
                             }));
                         }
@@ -139,6 +142,8 @@ export class AzureSubscriptionProviderBase {
                             this.logForAccount(account, 'Skipping account because it is not signed in');
                             return;
                         }
+                        // Log and skip accounts that fail for other reasons (e.g., locked account)
+                        this.errorForAccount(account, 'Skipping account due to error', err);
                     }
                 }));
             }
@@ -162,7 +167,13 @@ export class AzureSubscriptionProviderBase {
             const startTime = Date.now();
             this.log('Fetching accounts...');
             this.silenceRefreshEvents();
-            const results = await vscode.authentication.getAccounts(getConfiguredAuthProviderId());
+            const environment = getConfiguredAzureEnv();
+            const results = (await vscode.authentication.getAccounts(getConfiguredAuthProviderId())).map(account => {
+                return {
+                    ...account,
+                    environment,
+                };
+            });
             if (results.length === 0) {
                 this.log('No accounts found');
                 throw new NotSignedInError();
@@ -256,7 +267,6 @@ export class AzureSubscriptionProviderBase {
                     name: subscription.displayName,
                     subscriptionId: subscription.subscriptionId,
                     /* eslint-enable @typescript-eslint/no-non-null-assertion */
-                    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                     tenantId: subscription.tenantId || tenant.tenantId, // In rare cases, a subscription may be listed but come from a different tenant
                     account: tenant.account,
                 });
@@ -278,11 +288,13 @@ export class AzureSubscriptionProviderBase {
      * @returns A {@link SubscriptionClient}, {@link TokenCredential}, and {@link AzureAuthentication} for the given account+tenant.
      */
     async getSubscriptionClient(tenant) {
+        // Credential ignores requested scopes and always uses default scopes (managementEndpointUrl),
+        // matching the scope used during signIn(). This avoids a refresh token round-trip that can
+        // fail when MSAL has stale cache entries for a different scope.
         const credential = {
-            getToken: async (scopes, options) => {
+            getToken: async (_scopes, options) => {
                 this.silenceRefreshEvents();
-                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                const session = await getSessionFromVSCode(scopes, options?.tenantId || tenant.tenantId, { createIfNone: false, silent: true, account: tenant.account });
+                const session = await getSessionFromVSCode(undefined, options?.tenantId || tenant.tenantId, { createIfNone: false, silent: true, account: tenant.account });
                 if (!session) {
                     throw new NotSignedInError();
                 }
@@ -328,6 +340,30 @@ export class AzureSubscriptionProviderBase {
     logForTenant(tenant, message) {
         this.logger?.debug(`[auth] [account: ${screen(tenant.account)}] [tenant: ${screen(tenant)}] ${message}`);
     }
+    warnForAccount(account, message) {
+        this.logger?.warn(`[auth] [account: ${screen(account)}] ${message}`);
+    }
+    warnForTenant(tenant, message) {
+        this.logger?.warn(`[auth] [account: ${screen(tenant.account)}] [tenant: ${screen(tenant)}] ${message}`);
+    }
+    errorForAccount(account, message, err) {
+        this.logger?.error(`[auth] [account: ${screen(account)}] ${message}`);
+        if (err instanceof Error) {
+            this.logger?.error(err);
+        }
+        else {
+            this.logger?.error(`[auth] [account: ${screen(account)}] ${inspect(err)}`);
+        }
+    }
+    errorForTenant(tenant, message, err) {
+        this.logger?.error(`[auth] [account: ${screen(tenant.account)}] [tenant: ${screen(tenant)}] ${message}`);
+        if (err instanceof Error) {
+            this.logger?.error(err);
+        }
+        else {
+            this.logger?.error(`[auth] [account: ${screen(tenant.account)}] [tenant: ${screen(tenant)}] ${inspect(err)}`);
+        }
+    }
     throwIfCancelled(token) {
         if (token?.isCancellationRequested) {
             throw new vscode.CancellationError();

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

@@ -1,6 +1,6 @@
 import * as azureEnv from '@azure/ms-rest-azure-env';
 import * as vscode from 'vscode';
-declare class ExtendedEnvironment extends azureEnv.Environment {
+export declare class ExtendedEnvironment extends azureEnv.Environment {
     readonly isCustomCloud: boolean;
     constructor(parameters: azureEnv.EnvironmentParameters, isCustomCloud: boolean);
 }
@@ -24,4 +24,3 @@ export declare function setConfiguredAzureEnv(cloud: 'AzureCloud' | 'ChinaCloud'
  * @returns The provider ID to use, either `'microsoft'` or `'microsoft-sovereign-cloud'`
  */
 export declare function getConfiguredAuthProviderId(): string;
-export {};

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

@@ -14,7 +14,7 @@ var CloudEnvironmentSettingValue;
     CloudEnvironmentSettingValue["USGovernment"] = "USGovernment";
     CloudEnvironmentSettingValue["Custom"] = "custom";
 })(CloudEnvironmentSettingValue || (CloudEnvironmentSettingValue = {}));
-class ExtendedEnvironment extends azureEnv.Environment {
+export class ExtendedEnvironment extends azureEnv.Environment {
     isCustomCloud;
     constructor(parameters, isCustomCloud) {
         super(parameters);

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

@@ -6,4 +6,4 @@ import type { AzureTenant } from '../contracts/AzureTenant';
  * @param accountOrTenant The account or tenant to screen the label / display name of
  * @returns The screened label / display name
  */
-export declare function screen(accountOrTenant: AzureAccount | AzureTenant): string;
+export declare function screen(accountOrTenant: Pick<AzureAccount, 'id' | 'label'> | Pick<AzureTenant, 'tenantId' | 'displayName'>): string;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@microsoft/vscode-azext-azureauth",
     "author": "Microsoft Corporation",
-    "version": "6.0.0-alpha.2",
+    "version": "6.0.0-alpha.4",
     "description": "Azure authentication helpers for Visual Studio Code",
     "tags": [
         "azure",
@@ -49,7 +49,7 @@
     },
     "devDependencies": {
         "@azure/core-auth": "^1.10.1",
-        "@microsoft/vscode-azext-eng": "1.0.0-alpha.4",
+        "@microsoft/vscode-azext-eng": "1.0.0-alpha.13",
         "@types/node": "22.x",
         "@types/vscode": "1.106.0"
     },