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

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

@@ -115,12 +115,18 @@ class AzureSubscriptionProviderBase {
             // If silent, suppress with normal timeout
             this.silenceRefreshEvents();
         }
-        const session = await (0, getSessionFromVSCode_1.getSessionFromVSCode)(undefined, tenant?.tenantId, {
-            account: tenant?.account,
-            clearSessionPreference: options.clearSessionPreference ?? AzureSubscriptionProviderRequestOptions_1.DefaultSignInOptions.clearSessionPreference,
-            createIfNone: prompt,
-            silent: !prompt,
-        });
+        let session;
+        try {
+            session = await (0, getSessionFromVSCode_1.getSessionFromVSCode)(undefined, tenant?.tenantId, {
+                account: tenant?.account,
+                clearSessionPreference: options.clearSessionPreference ?? AzureSubscriptionProviderRequestOptions_1.DefaultSignInOptions.clearSessionPreference,
+                createIfNone: prompt,
+                silent: !prompt,
+            });
+        }
+        catch (err) {
+            throw maybeImproveSignInError(err, tenant?.tenantId);
+        }
         if (prompt) {
             // Interactive sign in can take a while, so silence events for a bit longer
             this.silenceRefreshEvents();
@@ -368,13 +374,13 @@ class AzureSubscriptionProviderBase {
         };
     }
     log(message) {
-        this.logger?.debug(`[auth] ${message}`);
+        this.logger?.info(`[auth] ${message}`);
     }
     logForAccount(account, message) {
-        this.logger?.debug(`[auth] [account: ${(0, screen_1.screen)(account)}] ${message}`);
+        this.logger?.info(`[auth] [account: ${(0, screen_1.screen)(account)}] ${message}`);
     }
     logForTenant(tenant, message) {
-        this.logger?.debug(`[auth] [account: ${(0, screen_1.screen)(tenant.account)}] [tenant: ${(0, screen_1.screen)(tenant)}] ${message}`);
+        this.logger?.info(`[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}`);
@@ -426,4 +432,28 @@ class AzureSubscriptionProviderBase {
     }
 }
 exports.AzureSubscriptionProviderBase = AzureSubscriptionProviderBase;
+/**
+ * Inspects an error thrown during sign-in and returns a more user-friendly
+ * error when possible (e.g. native broker errors), otherwise returns the
+ * original error unchanged.
+ */
+function maybeImproveSignInError(err, tenantId) {
+    if (!(err instanceof Error)) {
+        return err;
+    }
+    const message = err.message;
+    // The native MSAL broker surfaces opaque "platform_broker_error" messages
+    // that don't tell the user what went wrong. Re-wrap with actionable text.
+    if (message.includes('platform_broker_error')) {
+        const tenantHint = tenantId
+            ? vscode.l10n.t(' for tenant "{0}"', tenantId)
+            : '';
+        const improved = new Error(vscode.l10n.t('Sign-in failed{0}. The tenant may have expired or is no longer valid. Please verify the tenant is still active and try again.', tenantHint), { cause: err });
+        if (err.stack && improved.stack) {
+            improved.stack += `\nCaused by: ${err.stack}`;
+        }
+        return improved;
+    }
+    return err;
+}
 //# sourceMappingURL=AzureSubscriptionProviderBase.js.map

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

@@ -79,12 +79,18 @@ export class AzureSubscriptionProviderBase {
             // If silent, suppress with normal timeout
             this.silenceRefreshEvents();
         }
-        const session = await getSessionFromVSCode(undefined, tenant?.tenantId, {
-            account: tenant?.account,
-            clearSessionPreference: options.clearSessionPreference ?? DefaultSignInOptions.clearSessionPreference,
-            createIfNone: prompt,
-            silent: !prompt,
-        });
+        let session;
+        try {
+            session = await getSessionFromVSCode(undefined, tenant?.tenantId, {
+                account: tenant?.account,
+                clearSessionPreference: options.clearSessionPreference ?? DefaultSignInOptions.clearSessionPreference,
+                createIfNone: prompt,
+                silent: !prompt,
+            });
+        }
+        catch (err) {
+            throw maybeImproveSignInError(err, tenant?.tenantId);
+        }
         if (prompt) {
             // Interactive sign in can take a while, so silence events for a bit longer
             this.silenceRefreshEvents();
@@ -332,13 +338,13 @@ export class AzureSubscriptionProviderBase {
         };
     }
     log(message) {
-        this.logger?.debug(`[auth] ${message}`);
+        this.logger?.info(`[auth] ${message}`);
     }
     logForAccount(account, message) {
-        this.logger?.debug(`[auth] [account: ${screen(account)}] ${message}`);
+        this.logger?.info(`[auth] [account: ${screen(account)}] ${message}`);
     }
     logForTenant(tenant, message) {
-        this.logger?.debug(`[auth] [account: ${screen(tenant.account)}] [tenant: ${screen(tenant)}] ${message}`);
+        this.logger?.info(`[auth] [account: ${screen(tenant.account)}] [tenant: ${screen(tenant)}] ${message}`);
     }
     warnForAccount(account, message) {
         this.logger?.warn(`[auth] [account: ${screen(account)}] ${message}`);
@@ -389,4 +395,28 @@ export class AzureSubscriptionProviderBase {
         throw err;
     }
 }
+/**
+ * Inspects an error thrown during sign-in and returns a more user-friendly
+ * error when possible (e.g. native broker errors), otherwise returns the
+ * original error unchanged.
+ */
+function maybeImproveSignInError(err, tenantId) {
+    if (!(err instanceof Error)) {
+        return err;
+    }
+    const message = err.message;
+    // The native MSAL broker surfaces opaque "platform_broker_error" messages
+    // that don't tell the user what went wrong. Re-wrap with actionable text.
+    if (message.includes('platform_broker_error')) {
+        const tenantHint = tenantId
+            ? vscode.l10n.t(' for tenant "{0}"', tenantId)
+            : '';
+        const improved = new Error(vscode.l10n.t('Sign-in failed{0}. The tenant may have expired or is no longer valid. Please verify the tenant is still active and try again.', tenantHint), { cause: err });
+        if (err.stack && improved.stack) {
+            improved.stack += `\nCaused by: ${err.stack}`;
+        }
+        return improved;
+    }
+    return err;
+}
 //# sourceMappingURL=AzureSubscriptionProviderBase.js.map

package/package.json

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