ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-08 17:24:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Azure Active Directory (Azure AD) is becoming Microsoft Entra ID (#24385)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-09-12 13:41:04 -07:00
committed by GitHub
parent 96c4257d25
commit 7e401bfa1a
16 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/azdata.d.ts vendored
View File

@@ -121,11 +121,11 @@ declare module 'azdata' {
*/
Integrated = 'Integrated',
/**
* Azure Active Directory - Universal with MFA support
* Microsoft Entra ID - Universal with MFA support
*/
AzureMFA = 'AzureMFA',
/**
* Azure Active Directory - Password
* Microsoft Entra ID - Password
*/
AzureMFAAndUser = 'AzureMFAAndUser',
/**

4
src/sql/platform/connection/common/constants.ts
View File

@@ -46,11 +46,11 @@ export enum AuthenticationType {
*/
Integrated = 'Integrated',
/**
* Azure Active Directory - Universal with MFA support
* Microsoft Entra ID - Universal with MFA support
*/
AzureMFA = 'AzureMFA',
/**
* Azure Active Directory - Password
* Microsoft Entra ID - Password
*/
AzureMFAAndUser = 'AzureMFAAndUser',
/**

4
src/sql/workbench/contrib/connection/browser/connection.contribution.ts
View File

@@ -181,8 +181,8 @@ configurationRegistry.registerConfiguration({
'description': localize('sql.defaultAuthenticationTypeDescription', "Default authentication type to use when connecting to Azure resources. "),
'enumDescriptions': [
localize('sql.defaultAuthenticationType.SqlLogin', "Sql Login"),
localize('sql.defaultAuthenticationType.AzureMFA', "Azure Active Directory - Universal with MFA support"),
localize('sql.defaultAuthenticationType.AzureMFAAndUser', "Azure Active Directory - Password"),
localize('sql.defaultAuthenticationType.AzureMFA', "Microsoft Entra ID - Universal with MFA support"),
localize('sql.defaultAuthenticationType.AzureMFAAndUser', "Microsoft Entra ID - Password"),
localize('sql.defaultAuthenticationType.Integrated', "Windows Authentication"),
],
'default': AuthenticationType.AzureMFA

2
src/sql/workbench/services/backupRestoreUrlBrowser/browser/urlBrowserDialog.ts
View File

@@ -147,7 +147,7 @@ export class BackupRestoreUrlBrowserDialog extends Modal {
));
linkAccountButton.appendChild(linkAccount.el);
let tenantLabel = localize('backupRestoreUrlBrowserDialog.tenant', "Azure AD Tenant");
let tenantLabel = localize('backupRestoreUrlBrowserDialog.tenant', "Microsoft Entra Tenant");
this._tenantSelectorBox = this._register(new SelectBox([], '', defaultSelectBoxStyles, this._contextViewService, null, { ariaLabel: tenantLabel }));
this._tenantSelectorBox.disable();
let tenantSelector = DialogHelper.appendRow(tableContainer, tenantLabel, 'url-input-label', 'url-input-box', null, true);

2
src/sql/workbench/services/connection/browser/connectionWidget.ts
View File

@@ -445,7 +445,7 @@ export class ConnectionWidget extends lifecycle.Disposable {
this._refreshCredentialsLink.href = '#';
this._refreshCredentialsLink.innerText = localize('connectionWidget.refreshAzureCredentials', "Refresh account credentials");
// Azure tenant picker
let tenantLabel = localize('connection.azureTenantDropdownLabel', "Azure AD tenant");
let tenantLabel = localize('connection.azureTenantDropdownLabel', "Microsoft Entra tenant");
let tenantDropdown = DialogHelper.appendRow(this._tableContainer, tenantLabel, 'connection-label', 'connection-input', ['azure-account-row', 'azure-tenant-row']);
this._azureTenantDropdown = new SelectBox([], undefined, defaultSelectBoxStyles, this._contextViewService, tenantDropdown, { ariaLabel: tenantLabel });
this._register(this._azureTenantDropdown);

2
src/vs/platform/environment/node/argv.ts
View File

@@ -166,7 +166,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
'enable-coi': { type: 'boolean' },
// {{SQL CARBON EDIT}} Start
'aad': { type: 'boolean', cat: 'o', description: localize('aadParameter', 'Use Azure Active Directory authentication, this option is depcrecated - use \'authenticationType\' instead.') },
'aad': { type: 'boolean', cat: 'o', description: localize('aadParameter', 'Use Microsoft Entra authentication, this option is depcrecated - use \'authenticationType\' instead.') },
'applicationName': { type: 'string', alias: 'A', cat: 'o', allowEmptyValue: true, description: localize('applicationNameParameter', 'Supports providing applicationName that will be used for connection profile app name.') },
'authenticationType': { type: 'string', alias: 'T', cat: 'o', allowEmptyValue: true, deprecates: ['aad', 'integrated'], description: localize('authenticationTypeParameter', 'Provide authentication mode to be used. Accepted values: AzureMFA, SqlLogin, Integrated, etc.') },
'command': { type: 'string', alias: 'c', cat: 'o', args: 'command-name', allowEmptyValue: true, description: localize('commandParameter', 'Name of command to run, accepted values: connect, openConnectionDialog') },