ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-28 07:40:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prompt user to refresh account credentials for AADSTS70043 and AADSTS50173 error codes (#22853)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-04-27 20:44:22 -07:00
committed by GitHub
parent 942786c2a7
commit c04b8af1d2
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/azurecore/src/account-provider/auths/azureAuth.ts
View File

@@ -24,7 +24,7 @@ import axios, { AxiosRequestConfig, AxiosResponse } from 'axios';
import { Logger } from '../../utils/Logger';
import * as qs from 'qs';
import { AzureAuthError } from './azureAuthError';
import { AccountInfo, AuthenticationResult, InteractionRequiredAuthError, PublicClientApplication } from '@azure/msal-node';
import { AccountInfo, AuthError, AuthenticationResult, InteractionRequiredAuthError, PublicClientApplication } from '@azure/msal-node';
import { HttpClient } from './httpClient';
import { getProxyEnabledHttpClient, getTenantIgnoreList, updateTenantIgnoreList } from '../../utils';
import { errorToPromptFailedResult } from './networkUtils';
@@ -365,7 +365,7 @@ export abstract class AzureAuth implements vscode.Disposable {
return await this.clientApplication.acquireTokenSilent(tokenRequest);
} catch (e) {
Logger.error('Failed to acquireTokenSilent', e);
if (e instanceof InteractionRequiredAuthError) {
if (e instanceof AuthError && this.accountNeedsRefresh(e)) {
// build refresh token request
const tenant: Tenant = {
id: tenantId,
@@ -632,7 +632,6 @@ export abstract class AzureAuth implements vscode.Disposable {
}
//#endregion
//#region interaction handling
public async handleInteractionRequiredMsal(tenant: Tenant, resource: Resource): Promise<AuthenticationResult | null> {
const shouldOpen = await this.askUserForInteraction(tenant, resource);
@@ -654,6 +653,17 @@ export abstract class AzureAuth implements vscode.Disposable {
return undefined;
}
/**
* Determines whether the account needs to be refreshed based on received error instance
* and STS error codes from errorMessage.
* @param error AuthError instance
*/
private accountNeedsRefresh(error: AuthError): boolean {
return error instanceof InteractionRequiredAuthError
|| error.errorMessage.includes(Constants.AADSTS70043)
|| error.errorMessage.includes(Constants.AADSTS50173);
}
/**
* Asks the user if they would like to do the interaction based authentication as required by OAuth2
* @param tenant