Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adopt error template and some minor tweaks to error rendering (#225426)

Browse Source 
NOTE: For this to get lit up, this PR needs to go in in MSAL-node: https://github.com/AzureAD/microsoft-authentication-library-for-js/pull/7247
This commit is contained in:
Tyler James Leonhardt
2024-08-12 11:05:04 -07:00
committed by GitHub
parent 7dde0a7943
commit a8b2cef91c
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/microsoft-authentication/src/node/authProvider.ts
View File

@@ -2,7 +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 { AccountInfo, AuthenticationResult } from '@azure/msal-node';
import { AccountInfo, AuthenticationResult, ServerError } from '@azure/msal-node';
import { AuthenticationGetSessionOptions, AuthenticationProvider, AuthenticationProviderAuthenticationSessionsChangeEvent, AuthenticationSession, AuthenticationSessionAccountInformation, CancellationError, env, EventEmitter, ExtensionContext, l10n, LogOutputChannel, Memento, SecretStorage, Uri, window } from 'vscode';
import { Environment } from '@azure/ms-rest-azure-env';
import { CachedPublicClientApplicationManager } from './publicClientCache';
@@ -132,10 +132,10 @@ export class MsalAuthProvider implements AuthenticationProvider {
result = await cachedPca.acquireTokenInteractive({
openBrowser: async (url: string) => { await env.openExternal(Uri.parse(url)); },
scopes: modifiedScopes,
// The logic for rendering one or the other of these templates is in the
// template itself, so we pass the same one for both.
successTemplate: loopbackTemplate,
// TODO: This is currently not working (the loopback client closes before this is rendered).
// There is an issue opened on MSAL Node to fix this. We should workaround this by re-implementing the Loopback client.
// errorTemplate: loopbackTemplate
errorTemplate: loopbackTemplate
});
this.setupRefresh(cachedPca, result, scopes);
} catch (e) {
@@ -154,6 +154,13 @@ export class MsalAuthProvider implements AuthenticationProvider {
throw e;
}
}
// This error comes from the backend and is likely not due to the user's machine
// failing to open a port or something local that would require us to try the
// URL handler loopback client.
if (e instanceof ServerError) {
this._telemetryReporter.sendLoginFailedEvent();
throw e;
}
const loopbackClient = new UriHandlerLoopbackClient(this._uriHandler, redirectUri);
try {
result = await cachedPca.acquireTokenInteractive({

8
extensions/microsoft-authentication/src/node/loopbackTemplate.ts
View File

@@ -63,6 +63,7 @@ export const loopbackTemplate = `
.error-message {
display: none;
max-width: 800px;
font-weight: 300;
font-size: 1.3rem;
}
@@ -123,11 +124,12 @@ export const loopbackTemplate = `
</div>
</div>
<script>
var search = window.location.search;
var error = (/[?&^]error=([^&]+)/.exec(search) || [])[1];
var search = new URLSearchParams(window.location.search);
var error = search.get('error');
if (error) {
const description = search.get('error_description');
document.querySelector('.error-text')
.textContent = decodeURIComponent(error);
.textContent = error + ' - ' + description;
document.querySelector('body')
.classList.add('error');
}