diff --git a/extensions/azurecore/package.json b/extensions/azurecore/package.json index 04688bfe7d..fa0bf77f22 100644 --- a/extensions/azurecore/package.json +++ b/extensions/azurecore/package.json @@ -126,7 +126,8 @@ "enumDescriptions": [ "Azure Active Directory Authentication Library", "Microsoft Authentication Library" - ] + ], + "deprecationMessage": "Warning: ADAL has been deprecated, and is scheduled to be removed in a future release. Please use MSAL (default option) instead." } } } diff --git a/extensions/azurecore/src/constants.ts b/extensions/azurecore/src/constants.ts index b3221f1032..ebfb7bda82 100644 --- a/extensions/azurecore/src/constants.ts +++ b/extensions/azurecore/src/constants.ts @@ -68,7 +68,7 @@ export const AzureTokenFolderName = 'Azure Accounts'; export const MSALCacheName = 'accessTokenCache'; -export const DefaultAuthLibrary = 'ADAL'; +export const DefaultAuthLibrary = 'MSAL'; export enum BuiltInCommands { SetContext = 'setContext' diff --git a/extensions/azurecore/src/extension.ts b/extensions/azurecore/src/extension.ts index bd277eb043..4decebccd1 100644 --- a/extensions/azurecore/src/extension.ts +++ b/extensions/azurecore/src/extension.ts @@ -305,6 +305,9 @@ async function onDidChangeConfiguration(e: vscode.ConfigurationChangeEvent): Pro updatePiiLoggingLevel(); } if (e.affectsConfiguration('azure.authenticationLibrary')) { + if (vscode.workspace.getConfiguration(Constants.AzureSection).get('authenticationLibrary') === 'ADAL') { + void vscode.window.showInformationMessage(loc.deprecatedOption); + } await displayReloadAds(); } } @@ -327,4 +330,3 @@ async function displayReloadAds(): Promise { } } - diff --git a/extensions/azurecore/src/localizedConstants.ts b/extensions/azurecore/src/localizedConstants.ts index 495f66c9d4..b6b9d40718 100644 --- a/extensions/azurecore/src/localizedConstants.ts +++ b/extensions/azurecore/src/localizedConstants.ts @@ -66,6 +66,8 @@ export const typeIcon = localize('azurecore.typeIcon', "Type Icon"); export const reloadPrompt = localize('azurecore.reloadPrompt', "Authentication Library has changed, please reload Azure Data Studio."); export const reloadChoice = localize('azurecore.reloadChoice', "Reload Azure Data Studio"); +export const deprecatedOption = localize('azurecore.deprecated', "Warning: ADAL has been deprecated, and is scheduled to be removed in a future release. Please use MSAL instead.") + // Azure Resource Types export const sqlServer = localize('azurecore.sqlServer', "SQL server"); export const sqlDatabase = localize('azurecore.sqlDatabase', "SQL database");