diff --git a/.vscode/cspell.json b/.vscode/cspell.json
index 4dab0986ea5b6..82357ba234178 100644
--- a/.vscode/cspell.json
+++ b/.vscode/cspell.json
@@ -71,6 +71,7 @@
"dotnetcli",
"dtmf",
"eastus",
+ "entra",
"epsg",
"expando",
"fhir",
diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/README.md b/sdk/identity/Azure.Identity.BrokeredAuthentication/README.md
index 643b5d77d7d21..9239f9514ff13 100644
--- a/sdk/identity/Azure.Identity.BrokeredAuthentication/README.md
+++ b/sdk/identity/Azure.Identity.BrokeredAuthentication/README.md
@@ -1,7 +1,7 @@
# Azure Identity Brokered Authentication client library for .NET
- The library extends the Azure.Identity library to provide authentication broker support. It includes the necessary dependencies, and provides the `InteractiveBrowserCredentialBrokerOptions` class. This options class can be used to create an `InteractiveBrowserCredential` capable of using the system authentication broker in lieu of the system browser when available.
+ The library extends the Azure.Identity library to provide authentication broker support. It includes the necessary dependencies, and provides the `InteractiveBrowserCredentialBrokerOptions` class. This options class can be used to create an `InteractiveBrowserCredential` capable of using the system authentication broker in lieu of the system browser when available.
- [Source code][source] | [Package (nuget)][package] | [API reference documentation][identity_api_docs] | [Azure Active Directory documentation][aad_doc]
+ [Source code][source] | [Package (nuget)][package] | [API reference documentation][identity_api_docs] | [Microsoft Entra ID documentation][aad_doc]
## Getting started
@@ -60,7 +60,7 @@ catch (AuthenticationFailedException e)
}
```
-For more details on dealing with errors arising from failed requests to Azure Active Directory, or managed identity endpoints please refer to the Azure Active Directory [documentation on authorization error codes][aad_err_doc].
+For more details on dealing with errors arising from failed requests to Microsoft Entra ID, or managed identity endpoints please refer to the Microsoft Entra ID [documentation on authorization error codes][aad_err_doc].
### Logging
diff --git a/sdk/identity/Azure.Identity/CHANGELOG.md b/sdk/identity/Azure.Identity/CHANGELOG.md
index 3979a75b0b42b..f1d2199a1e8b9 100644
--- a/sdk/identity/Azure.Identity/CHANGELOG.md
+++ b/sdk/identity/Azure.Identity/CHANGELOG.md
@@ -78,7 +78,7 @@
## 1.8.2 (2023-02-08)
### Bugs Fixed
-- Fixed error message parsing in `AzurePowerShellCredential` which would misinterpret AAD errors with the need to install PowerShell. [#31998](https://github.com/Azure/azure-sdk-for-net/issues/31998)
+- Fixed error message parsing in `AzurePowerShellCredential` which would misinterpret Microsoft Entra ID errors with the need to install PowerShell. [#31998](https://github.com/Azure/azure-sdk-for-net/issues/31998)
- Fix regional endpoint validation error when using `ManagedIdentityCredential`. [#32498])(https://github.com/Azure/azure-sdk-for-net/issues/32498)
## 1.8.1 (2023-01-13)
@@ -89,7 +89,7 @@
## 1.8.0 (2022-11-08)
### Bugs Fixed
-- Fixed error message parsing in `AzureCliCredential` which would misinterpret AAD errors with the need to login with `az login`. [#26894](https://github.com/Azure/azure-sdk-for-net/issues/26894), [#29109](https://github.com/Azure/azure-sdk-for-net/issues/29109)
+- Fixed error message parsing in `AzureCliCredential` which would misinterpret Microsoft Entra ID errors with the need to login with `az login`. [#26894](https://github.com/Azure/azure-sdk-for-net/issues/26894), [#29109](https://github.com/Azure/azure-sdk-for-net/issues/29109)
- `ManagedIdentityCredential` will no longer fail when a response received from the endpoint is invalid JSON. It now treats this scenario as if the credential is unavailable. [#30467](https://github.com/Azure/azure-sdk-for-net/issues/30467), [#32061](https://github.com/Azure/azure-sdk-for-net/issues/32061)
## 1.9.0-beta.1 (2022-10-13)
@@ -216,7 +216,7 @@ Thank you to our developer community members who helped to make Azure Identity b
### Features Added
- `DefaultAzureCredentialOptions` now has a `InteractiveBrowserClientId` property which allows passing a ClientId value to the `InteractiveBrowserCredential` when constructing a `DefaultAzureCredential`.
-- Implement `OnBehalfOfCredential` which enables authentication to Azure Active Directory using an On-Behalf-Of flow.
+- Implement `OnBehalfOfCredential` which enables authentication to Microsoft Entra ID using an On-Behalf-Of flow.
- Added support to `ManagedIdentityCredential` for Azure hosts using federated token exchange for managed identity.
### Bugs Fixed
@@ -226,7 +226,7 @@ Thank you to our developer community members who helped to make Azure Identity b
### Other Changes
- Updated credentials using `MsalConfidentialClient` to include MSAL log output in logs
-- Added additional logging to `AzureCliCredential`, `AzurePowerShellCredential`, `VisualStudioCrednetial`, and `VisualStudioCodeCredential` when `IsPIILoggingEnabled` is set to true.
+- Added additional logging to `AzureCliCredential`, `AzurePowerShellCredential`, `VisualStudioCredential`, and `VisualStudioCodeCredential` when `IsPIILoggingEnabled` is set to true.
## 1.5.0-beta.3 (2021-08-10)
@@ -270,7 +270,7 @@ Thank you to our developer community members who helped to make Azure Identity b
- Added support to `ManagedIdentityCredential` for Bridge to Kubernetes local development authentication.
- TenantId values returned from service challenge responses can now be used to request tokens from the correct tenantId. To support this feature, there is a new `AllowMultiTenantAuthentication` option on `TokenCredentialOptions`.
- By default, `AllowMultiTenantAuthentication` is false. When this option property is false and the tenant Id configured in the credential options differs from the tenant Id set in the `TokenRequestContext` sent to a credential, an `AuthorizationFailedException` will be thrown. This is potentially breaking change as it could be a different exception than what was thrown previously. This exception behavior can be overridden by either setting an `AppContext` switch named "Azure.Identity.EnableLegacyTenantSelection" to `true` or by setting the environment variable "AZURE_IDENTITY_ENABLE_LEGACY_TENANT_SELECTION" to "true". Note: AppContext switches can also be configured via configuration like below:
-- Added `OnBehalfOfFlowCredential` which enables support for AAD On-Behalf-Of (OBO) flow. See the [Azure Active Directory documentation](https://docs.microsoft.com/azure/active-directory/develop/v2-oauth2-on-behalf-of-flow) to learn more about OBO flow scenarios.
+- Added `OnBehalfOfFlowCredential` which enables support for Microsoft Entra On-Behalf-Of (OBO) flow. See the [Microsoft Entra ID documentation](https://learn.microsoft.com/azure/active-directory/develop/v2-oauth2-on-behalf-of-flow) to learn more about OBO flow scenarios.
```xml
@@ -290,7 +290,7 @@ Thank you to our developer community members who helped to make Azure Identity b
### New Features
- By default, the MSAL Public Client Client Capabilities are populated with "CP1" to enable support for [Continuous Access Evaluation (CAE)](https://docs.microsoft.com/azure/active-directory/develop/app-resilience-continuous-access-evaluation).
-This indicates to AAD that your application is CAE ready and can handle the CAE claim challenge. This capability can be disabled, if necessary, by either setting an `AppContext` switch named "Azure.Identity.DisableCP1" to `true` or by setting the environment variable;
+This indicates to Microsoft Entra ID that your application is CAE ready and can handle the CAE claim challenge. This capability can be disabled, if necessary, by either setting an `AppContext` switch named "Azure.Identity.DisableCP1" to `true` or by setting the environment variable;
"AZURE_IDENTITY_DISABLE_CP1" to "true". Note: AppContext switches can also be configured via configuration like below:
```xml
diff --git a/sdk/identity/Azure.Identity/README.md b/sdk/identity/Azure.Identity/README.md
index ea4aa4bdd14d1..f01f3b2222c56 100644
--- a/sdk/identity/Azure.Identity/README.md
+++ b/sdk/identity/Azure.Identity/README.md
@@ -1,8 +1,8 @@
# Azure Identity client library for .NET
-The Azure Identity library provides [Azure Active Directory (Azure AD)](https://learn.microsoft.com/azure/active-directory/fundamentals/active-directory-whatis) token authentication support across the Azure SDK. It provides a set of [`TokenCredential`](https://learn.microsoft.com/dotnet/api/azure.core.tokencredential?view=azure-dotnet) implementations which can be used to construct Azure SDK clients which support Azure AD token authentication.
+The Azure Identity library provides [Microsoft Entra ID](https://learn.microsoft.com/azure/active-directory/fundamentals/active-directory-whatis) ([formerly Azure Active Directory](https://learn.microsoft.com/azure/active-directory/fundamentals/new-name)) token authentication support across the Azure SDK. It provides a set of [`TokenCredential`](https://learn.microsoft.com/dotnet/api/azure.core.tokencredential?view=azure-dotnet) implementations which can be used to construct Azure SDK clients which support Microsoft Entra token authentication.
- [Source code][source] | [Package (NuGet)][package] | [API reference documentation][identity_api_docs] | [Azure AD documentation][aad_doc]
+ [Source code][source] | [Package (NuGet)][package] | [API reference documentation][identity_api_docs] | [Microsoft Entra ID documentation][aad_doc]
## Getting started
@@ -25,9 +25,9 @@ When debugging and executing code locally it is typical for a developer to use t
#### Authenticate via Visual Studio
-Developers using Visual Studio 2017 or later can authenticate an Azure AD account through the IDE. Applications using the `DefaultAzureCredential` or the `VisualStudioCredential` can then use this account to authenticate calls in their application when running locally.
+Developers using Visual Studio 2017 or later can authenticate a Microsoft Entra account through the IDE. Applications using the `DefaultAzureCredential` or the `VisualStudioCredential` can then use this account to authenticate calls in their application when running locally.
-To authenticate in Visual Studio, select the **Tools** > **Options** menu to launch the Options dialog. Then navigate to the `Azure Service Authentication` options to sign in with your Azure AD account.
+To authenticate in Visual Studio, select the **Tools** > **Options** menu to launch the Options dialog. Then navigate to the `Azure Service Authentication` options to sign in with your Microsoft Entra account.
![Visual Studio Account Selection][vs_login_image]
@@ -71,7 +71,7 @@ For systems without a default web browser, the `Connect-AzAccount` command will
A credential is a class which contains or can obtain the data needed for a service client to authenticate requests. Service clients across the Azure SDK accept credentials when they're constructed. Service clients use those credentials to authenticate requests to the service.
-The Azure Identity library focuses on OAuth authentication with Azure AD, and it offers a variety of credential classes capable of acquiring an Azure AD token to authenticate service requests. All of the credential classes in this library are implementations of the `TokenCredential` abstract class in [Azure.Core][azure_core_library], and any of them can be used to construct service clients capable of authenticating with a `TokenCredential`.
+The Azure Identity library focuses on OAuth authentication with Microsoft Entra ID, and it offers a variety of credential classes capable of acquiring a Microsoft Entra token to authenticate service requests. All of the credential classes in this library are implementations of the `TokenCredential` abstract class in [Azure.Core][azure_core_library], and any of them can be used to construct service clients capable of authenticating with a `TokenCredential`.
See [Credential Classes](#credential-classes) for a complete listing of available credential types.
@@ -182,7 +182,7 @@ var client = new SecretClient(new Uri("https://myvault.vault.azure.net/"), crede
## Cloud configuration
-Credentials default to authenticating to the Azure AD endpoint for the Azure public cloud. To access resources in other clouds, such as Azure Government or a private cloud, configure credentials with the `AuthorityHost` argument. [AzureAuthorityHosts](https://learn.microsoft.com/dotnet/api/azure.identity.azureauthorityhosts?view=azure-dotnet) defines authorities for well-known clouds:
+Credentials default to authenticating to the Microsoft Entra endpoint for the Azure public cloud. To access resources in other clouds, such as Azure Government or a private cloud, configure credentials with the `AuthorityHost` argument. [AzureAuthorityHosts](https://learn.microsoft.com/dotnet/api/azure.identity.azureauthorityhosts?view=azure-dotnet) defines authorities for well-known clouds:
```C# Snippet:AuthenticatingWithAuthorityHost
var credential = new DefaultAzureCredential(new DefaultAzureCredentialOptions { AuthorityHost = AzureAuthorityHosts.AzureGovernment });
@@ -200,7 +200,7 @@ Not all credentials require this configuration. Credentials which authenticate t
|[`ChainedTokenCredential`][ref_ChainedTokenCredential]|Allows users to define custom authentication flows composing multiple credentials.
|[`EnvironmentCredential`][ref_EnvironmentCredential]|Authenticates a service principal or user via credential information specified in environment variables.
|[`ManagedIdentityCredential`][ref_ManagedIdentityCredential]|Authenticates the managed identity of an Azure resource.
-|[`WorkloadIdentityCredential`][ref_WorkloadIdentityCredential]|Supports [Azure AD workload identity](https://learn.microsoft.com/azure/aks/workload-identity-overview) on Kubernetes.
+|[`WorkloadIdentityCredential`][ref_WorkloadIdentityCredential]|Supports [Microsoft Entra Workload ID](https://learn.microsoft.com/azure/aks/workload-identity-overview) on Kubernetes.
### Authenticate service principals
@@ -240,16 +240,16 @@ Not all credentials require this configuration. Credentials which authenticate t
|Variable name|Value
|-|-
-|`AZURE_CLIENT_ID`|ID of an Azure AD application
-|`AZURE_TENANT_ID`|ID of the application's Azure AD tenant
+|`AZURE_CLIENT_ID`|ID of a Microsoft Entra application
+|`AZURE_TENANT_ID`|ID of the application's Microsoft Entra tenant
|`AZURE_CLIENT_SECRET`|one of the application's client secrets
#### Service principal with certificate
|variable name|Value
|-|-
-|`AZURE_CLIENT_ID`|ID of an Azure AD application
-|`AZURE_TENANT_ID`|ID of the application's Azure AD tenant
+|`AZURE_CLIENT_ID`|ID of a Microsoft Entra application
+|`AZURE_TENANT_ID`|ID of the application's Microsoft Entra tenant
|`AZURE_CLIENT_CERTIFICATE_PATH`|path to a PFX or PEM-encoded certificate file including private key
|`AZURE_CLIENT_CERTIFICATE_PASSWORD`|(optional) the password protecting the certificate file (currently only supported for PFX (PKCS12) certificates)
|`AZURE_CLIENT_SEND_CERTIFICATE_CHAIN`|(optional) send certificate chain in x5c header to support subject name / issuer based authentication
@@ -258,8 +258,8 @@ Not all credentials require this configuration. Credentials which authenticate t
|Variable name|Value
|-|-
-|`AZURE_CLIENT_ID`|ID of an Azure AD application
-|`AZURE_TENANT_ID`|ID of the application's Azure AD tenant
+|`AZURE_CLIENT_ID`|ID of a Microsoft Entra application
+|`AZURE_TENANT_ID`|ID of the application's Microsoft Entra tenant
|`AZURE_USERNAME`|a username (usually an email address)
|`AZURE_PASSWORD`|that user's password
@@ -277,7 +277,7 @@ Token caching is a feature provided by the Azure Identity library that allows ap
* Cache tokens in memory (default) or on disk (opt-in).
* Improve resilience and performance.
-* Reduce the number of requests made to Azure Active Directory (Azure AD) to obtain access tokens.
+* Reduce the number of requests made to Microsoft Entra ID to obtain access tokens.
The Azure Identity library offers both in-memory and persistent disk caching. For more details, see the [token caching documentation](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/identity/Azure.Identity/samples/TokenCache.md)
@@ -306,7 +306,7 @@ catch (AuthenticationFailedException e)
}
```
-For more information on dealing with errors arising from failed requests to Azure AD or managed identity endpoints, see the Azure AD [documentation on authorization error codes][aad_err_doc].
+For more information on dealing with errors arising from failed requests to Microsoft Entra ID or managed identity endpoints, see the Microsoft Entra ID [documentation on authorization error codes][aad_err_doc].
### Logging
diff --git a/sdk/identity/Azure.Identity/TROUBLESHOOTING.md b/sdk/identity/Azure.Identity/TROUBLESHOOTING.md
index d127b396981c3..d8441ac5d9bdc 100644
--- a/sdk/identity/Azure.Identity/TROUBLESHOOTING.md
+++ b/sdk/identity/Azure.Identity/TROUBLESHOOTING.md
@@ -1,4 +1,4 @@
-# Troubleshoot Azure Identity authentication issues
+# Troubleshoot Azure Identity authentication issues
This troubleshooting guide covers failure investigation techniques, common errors for the credential types in the Azure Identity library for .NET, and mitigation steps to resolve these errors.
@@ -67,7 +67,7 @@ Calls to service clients resulting in `RequestFailedException` with a `StatusCod
## Find relevant information in exception messages
-`AuthenticationFailedException` is thrown when unexpected errors occurred while a credential is authenticating. This can include errors received from requests to the Azure AD STS and often contains information helpful to diagnosis. Consider the following `AuthenticationFailedException` message.
+`AuthenticationFailedException` is thrown when unexpected errors occurred while a credential is authenticating. This can include errors received from requests to the Microsoft Entra STS and often contains information helpful to diagnosis. Consider the following `AuthenticationFailedException` message.
![AuthenticationFailedException Message Example](https://raw.githubusercontent.com/Azure/azure-sdk-for-net/main/sdk/identity/Azure.Identity/images/AuthFailedErrorMessageExample.png)
@@ -75,7 +75,7 @@ This error contains several pieces of information:
- __Failing Credential Type__: The type of credential that failed to authenticate. This can be helpful when diagnosing issues with chained credential types such as `DefaultAzureCredential` or `ChainedTokenCredential`.
-- __STS Error Code and Message__: The error code and message returned from the Azure AD STS. This can give insight into the specific reason the request failed. For instance, in this specific case because the provided client secret is incorrect. More information on STS error codes can be found [here](https://learn.microsoft.com/azure/active-directory/develop/reference-aadsts-error-codes#aadsts-error-codes).
+- __STS Error Code and Message__: The error code and message returned from the Microsoft Entra STS. This can give insight into the specific reason the request failed. For instance, in this specific case because the provided client secret is incorrect. More information on STS error codes can be found [here](https://learn.microsoft.com/azure/active-directory/develop/reference-aadsts-error-codes#aadsts-error-codes).
- __Correlation ID and Timestamp__: The correlation ID and call Timestamp used to identify the request in server-side logs. This information can be useful to support engineers when diagnosing unexpected STS failures.
@@ -138,7 +138,7 @@ DefaultAzureCredentialOptions options = new DefaultAzureCredentialOptions()
| Error Code | Description | Mitigation |
|---|---|---|
-|AADSTS700027|Client assertion contains an invalid signature.|Ensure the specified certificate has been uploaded to the Azure AD application registration. Instructions for uploading certificates to the application registration can be found [here](https://learn.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal#option-1-upload-a-certificate).|
+|AADSTS700027|Client assertion contains an invalid signature.|Ensure the specified certificate has been uploaded to the Microsoft Entra application registration. Instructions for uploading certificates to the application registration can be found [here](https://learn.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal#option-1-upload-a-certificate).|
|AADSTS700016|The specified application wasn't found in the specified tenant.| Ensure the specified `clientId` and `tenantId` are correct for your application registration. For multi-tenant apps, ensure the application has been added to the desired tenant by a tenant admin. To add a new application in the desired tenant, follow the instructions [here](https://learn.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal).
## Troubleshoot `ClientAssertionCredential` authentication issues
@@ -165,7 +165,7 @@ DefaultAzureCredentialOptions options = new DefaultAzureCredentialOptions()
| Error Message |Description| Mitigation |
|---|---|---|
-|`CredentialUnavailableException` raised with message. "WorkloadIdentityCredential authentication unavailable. The workload options are not fully configured."|The `WorkloadIdentityCredential` requires `ClientId`, `TenantId` and `TokenFilePath` to authenticate with Azure Active Directory.| - If using `DefaultAzureCredential` then:
- Ensure client ID is specified via `WorkloadIdentityClientId` property on `DefaultAzureCredentialOptions` or `AZURE_CLIENT_ID` env variable.
- Ensure tenant ID is specified via `AZURE_TENANT_ID` env variable.
- Ensure token file path is specified via `AZURE_FEDERATED_TOKEN_FILE` env variable.
- Ensure authority host is specified via `AZURE_AUTHORITY_HOST` env variable.
- If using `WorkloadIdentityCredential` then:
- Ensure tenant ID is specified via the `TenantId` property on the `WorkloadIdentityCredentialOptions` or `AZURE_TENANT_ID` env variable.
- Ensure client ID is specified via the `ClientId` property on the `WorkloadIdentityCredentialOptions` or `AZURE_CLIENT_ID` env variable.
- Ensure token file path is specified via the `TokenFilePath` property on the `WorkloadIdentityCredentialOptions` instance or `AZURE_FEDERATED_TOKEN_FILE` environment variable.
- Consult the [product troubleshooting guide](https://azure.github.io/azure-workload-identity/docs/troubleshooting.html) for other issues.
+|`CredentialUnavailableException` raised with message. "WorkloadIdentityCredential authentication unavailable. The workload options are not fully configured."|The `WorkloadIdentityCredential` requires `ClientId`, `TenantId` and `TokenFilePath` to authenticate with Microsoft Entra ID.| - If using `DefaultAzureCredential` then:
- Ensure client ID is specified via `WorkloadIdentityClientId` property on `DefaultAzureCredentialOptions` or `AZURE_CLIENT_ID` env variable.
- Ensure tenant ID is specified via `AZURE_TENANT_ID` env variable.
- Ensure token file path is specified via `AZURE_FEDERATED_TOKEN_FILE` env variable.
- Ensure authority host is specified via `AZURE_AUTHORITY_HOST` env variable.
- If using `WorkloadIdentityCredential` then:
- Ensure tenant ID is specified via the `TenantId` property on the `WorkloadIdentityCredentialOptions` or `AZURE_TENANT_ID` env variable.
- Ensure client ID is specified via the `ClientId` property on the `WorkloadIdentityCredentialOptions` or `AZURE_CLIENT_ID` env variable.
- Ensure token file path is specified via the `TokenFilePath` property on the `WorkloadIdentityCredentialOptions` instance or `AZURE_FEDERATED_TOKEN_FILE` environment variable.
- Consult the [product troubleshooting guide](https://azure.github.io/azure-workload-identity/docs/troubleshooting.html) for other issues.
|The workload options are not fully configured.|The workload identity configuration wasn't provided in environment variables or through `WorkloadIdentityCredentialOptions`.|Ensure the appropriate environment variables are set **prior to application startup** or are specified in code.
- To configure the `WorkloadIdentityCredential` via the environment, ensure the variables `AZURE_AUTHORITY_HOST`, `AZURE_CLIENT_ID`, `AZURE_TENANT_ID`, and `AZURE_FEDERATED_TOKEN_FILE` are set by the admission webhook.
- To configure the `WorkloadIdentityCredential` in code, ensure `ClientId`, `TenantId`, and `TokenFilePath` are set on the `WorkloadIdentityCredentialOptions` passed to the `WorkloadIdentityCredential` constructor.
|
## Troubleshoot `ManagedIdentityCredential` authentication issues
@@ -240,7 +240,7 @@ curl 'http://169.254.169.254/metadata/identity/oauth2/token?resource=https://man
|Failed To Read VS Code CredentialsORAuthenticate via Azure Tools plugin in VS Code|No Azure account information was found in the VS Code configuration.|- Ensure the [Azure Account plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.azure-account) is properly installed
- Use **View > Command Palette** to execute the **Azure: Sign In** command. This command opens a browser window and displays a page that allows you to sign in to Azure.
- If you already had the Azure Account extension installed and logged in to your account, try logging out and logging in again. Doing so will repopulate the cache and potentially mitigate the error you're getting.
|
|MSAL Interaction Required Error|The `VisualStudioCodeCredential` was able to read the cached credentials from the cache but the cached token is likely expired.|Log into the Azure Account extension via **View > Command Palette** to execute the **Azure: Sign In** command in the VS Code IDE.|
|ADFS tenant not supported|ADFS tenants aren't currently supported by Visual Studio `Azure Service Authentication`.|Use credentials from a supported cloud when authenticating with Visual Studio. The supported clouds are:- AZURE PUBLIC CLOUD - https://login.microsoftonline.com/
- AZURE GERMANY - https://login.microsoftonline.de/
- AZURE CHINA - https://login.chinacloudapi.cn/
- AZURE GOVERNMENT - https://login.microsoftonline.us/
|
-|AADSTS50020| User account '{EmailHidden}' from identity provider 'live.com' doesn't exist in tenant 'Microsoft Services' and cannot access the application '04f0c124-f2bc-4f59-8241-bf6df9866bbd'(VS with native MSA) in that tenant. The account needs to be added as an external user in the tenant first. Sign out and sign in again with a different Azure Active Directory user account.|Specify a `TenantId` value that corresponds to the resource to which you're authenticating in the `VisualStudioCredentialOptions` (or the `DefaultAzureCredentialOptions` if you're using `DefaultAzureCredential`).|
+|AADSTS50020| User account '{EmailHidden}' from identity provider 'live.com' doesn't exist in tenant 'Microsoft Services' and cannot access the application '04f0c124-f2bc-4f59-8241-bf6df9866bbd'(VS with native MSA) in that tenant. The account needs to be added as an external user in the tenant first. Sign out and sign in again with a different Microsoft Entra user account.|Specify a `TenantId` value that corresponds to the resource to which you're authenticating in the `VisualStudioCredentialOptions` (or the `DefaultAzureCredentialOptions` if you're using `DefaultAzureCredential`).|
## Troubleshoot `VisualStudioCredential` authentication issues
@@ -248,7 +248,7 @@ curl 'http://169.254.169.254/metadata/identity/oauth2/token?resource=https://man
| Error Message |Description| Mitigation |
|---|---|---|
-|Failed To Read CredentialsORAuthenticate via Azure Service Authentication|The `VisualStudioCredential` failed to retrieve a token from the Visual Studio authentication utility `Microsoft.Asal.TokenService.exe`.|- In Visual Studio, select the **Tools** > **Options** menu to launch the **Options** dialog.
- Navigate to the **Azure Service Authentication** options to sign in with your Azure Active Directory account.
- If you already logged in to your account, try logging out and logging in again. Doing so will repopulate the cache and potentially mitigate the error you're getting.
|
+|Failed To Read CredentialsORAuthenticate via Azure Service Authentication|The `VisualStudioCredential` failed to retrieve a token from the Visual Studio authentication utility `Microsoft.Asal.TokenService.exe`.|- In Visual Studio, select the **Tools** > **Options** menu to launch the **Options** dialog.
- Navigate to the **Azure Service Authentication** options to sign in with your Microsoft Entra account.
- If you already logged in to your account, try logging out and logging in again. Doing so will repopulate the cache and potentially mitigate the error you're getting.
|
|ADFS tenant not supported|ADFS tenants aren't currently supported by Visual Studio `Azure Service Authentication`.|Use credentials from a supported cloud when authenticating with Visual Studio. The supported clouds are:- AZURE PUBLIC CLOUD - https://login.microsoftonline.com/
- AZURE GERMANY - https://login.microsoftonline.de/
- AZURE CHINA - https://login.chinacloudapi.cn/
- AZURE GOVERNMENT - https://login.microsoftonline.us/
|
## Troubleshoot `AzureCliCredential` authentication issues
@@ -342,9 +342,9 @@ Get-AzAccessToken -ResourceUrl "https://management.core.windows.net"
## Troubleshoot WAM with MSA login issues
-When using `InteractiveBrowserCredential`, by default, only the Azure AD account is listed:
+When using `InteractiveBrowserCredential`, by default, only the Microsoft Entra account is listed:
-![MSA Azure AD only](./images/MSA1.png)
+![MSA Microsoft Entra ID only](./images/MSA1.png)
If you choose "Use another account" and type in an MSA outlook.com account, it fails:
diff --git a/sdk/identity/Azure.Identity/samples/ClientCertificateCredentialSamples.md b/sdk/identity/Azure.Identity/samples/ClientCertificateCredentialSamples.md
index eb0ef41783016..033c8f460c0a9 100644
--- a/sdk/identity/Azure.Identity/samples/ClientCertificateCredentialSamples.md
+++ b/sdk/identity/Azure.Identity/samples/ClientCertificateCredentialSamples.md
@@ -1,6 +1,6 @@
# Using the ClientCertificateCredential
-Applications which execute in a protected environment can authenticate using a client assertion signed by a private key whose public key or root certificate is registered with AAD. The Azure.Identity library provides the `ClientCertificateCredential` for applications choosing to authenticate this way. Below are some examples of how applications can utilize the `ClientCertificateCredential` to authenticate clients.
+Applications which execute in a protected environment can authenticate using a client assertion signed by a private key whose public key or root certificate is registered with Microsoft Entra ID. The Azure.Identity library provides the `ClientCertificateCredential` for applications choosing to authenticate this way. Below are some examples of how applications can utilize the `ClientCertificateCredential` to authenticate clients.
## Loading certificates from disk
@@ -20,7 +20,7 @@ var credential = new ClientCertificateCredential(tenantId, clientId, certificate
## Loading certificates from an X509Store
-Applications running on platforms which provide a secure certificate store might prefer to store and retrieve certificates from there. While the `ClientCertificateCredential` doesn't directly provide a mechanism for this, the application can retrieve the appropriate certificate from the store and use it to construct the `ClientCertificateCredential`.
+Applications running on platforms which provide a secure certificate store might prefer to store and retrieve certificates from there. While the `ClientCertificateCredential` doesn't directly provide a mechanism for this, the application can retrieve the appropriate certificate from the store and use it to construct the `ClientCertificateCredential`.
Consider the scenario where a pinned certificate used for development authentication is stored in the Personal certificate store. Since the certificate is pinned it can be identified by its thumbprint, which the application might read from configuration or the environment.
@@ -36,13 +36,13 @@ var credential = new ClientCertificateCredential(tenantId, clientId, certificate
## Rolling Certificates
-Long running applications may have the need to roll certificates during process execution. Certificate rotation is not currently supported by the `ClientCertficateCredential` which treats the certificate used to construct the credential as immutable. This means that any clients constructed with an `ClientCertificateCredential` using a particular cert would fail to authenticate requests after that cert has been rolled and the original is no longer valid.
+Long running applications may have the need to roll certificates during process execution. Certificate rotation is not currently supported by the `ClientCertificateCredential` which treats the certificate used to construct the credential as immutable. This means that any clients constructed with an `ClientCertificateCredential` using a particular cert would fail to authenticate requests after that cert has been rolled and the original is no longer valid.
However, if an application wants to roll this certificate without creating new service clients, it can accomplish this by creating its own `TokenCredential` implementation which wraps the `ClientCertificateCredential`. The implementation of this custom credential `TokenCredential` would somewhat depend on how the application handles certificate rotation.
### Explicit rotation
-If the application get's notified of certificate rotations and it can directly respond, it might choose to wrap the `ClientCertificateCredential` in a custom credential which provides a means for rotating the certificate.
+If the application get's notified of certificate rotations and it can directly respond, it might choose to wrap the `ClientCertificateCredential` in a custom credential which provides a means for rotating the certificate.
```C# Snippet:Identity_CertificateCredenetial_RotatableCredential
public class RotatableCertificateCredential : TokenCredential
@@ -78,7 +78,7 @@ public class RotatableCertificateCredential : TokenCredential
The above example shows a custom credential type `RotatableCertificateCredential` which provides a `RotateCertificateMethod`. The implementation internally relies on a `ClientCertificateCredential` instance `_credential`, and `RotateCertificate` simply replaces this instance with a new instance using the updated certificate.
### Implicit rotation
-Some applications might want to respond to certificate rotations which are external to the application, for instance a separate process rotates the certificate by updating it on disk. Here the application create a custom credential which checks for certificate updates when tokens are requested.
+Some applications might want to respond to certificate rotations which are external to the application, for instance a separate process rotates the certificate by updating it on disk. Here the application create a custom credential which checks for certificate updates when tokens are requested.
```C# Snippet:Identity_CertificateCredenetial_RotatingCredential
public class RotatingCertificateCredential : TokenCredential
@@ -130,4 +130,4 @@ public class RotatingCertificateCredential : TokenCredential
}
```
-In this example the custom credential type `RotatingCertifiateCredential` again uses a `ClientCertificateCredential` instance `_credential` to retrieve tokens. However, in this case it will attempt to refresh the certificate prior to obtaining the token. The method `RefreshCertificate` will query to see if the certificate has changed, and if so it will replace the instance `_credential` with a new instance using the new certificate.
+In this example the custom credential type `RotatingCertificateCredential` again uses a `ClientCertificateCredential` instance `_credential` to retrieve tokens. However, in this case it will attempt to refresh the certificate prior to obtaining the token. The method `RefreshCertificate` will query to see if the certificate has changed, and if so it will replace the instance `_credential` with a new instance using the new certificate.
diff --git a/sdk/identity/Azure.Identity/samples/DefiningCustomCredentialTypes.md b/sdk/identity/Azure.Identity/samples/DefiningCustomCredentialTypes.md
index 0c9c18176ad9b..da4701ea88010 100644
--- a/sdk/identity/Azure.Identity/samples/DefiningCustomCredentialTypes.md
+++ b/sdk/identity/Azure.Identity/samples/DefiningCustomCredentialTypes.md
@@ -1,5 +1,5 @@
# Defining Custom Credential types
-The Azure.Identity library covers a broad range of Azure Active Directory authentication scenarios. However, it's possible the credential implementations in Azure.Identity might not meet the specific needs your application, or an application might want to avoid taking a dependency on the Azure.Identity library.
+The Azure.Identity library covers a broad range of Microsoft Entra authentication scenarios. However, it's possible the credential implementations in Azure.Identity might not meet the specific needs your application, or an application might want to avoid taking a dependency on the Azure.Identity library.
## Authenticating with a prefetched access token
diff --git a/sdk/identity/Azure.Identity/samples/TokenCache.md b/sdk/identity/Azure.Identity/samples/TokenCache.md
index 586599d94120f..8bef4187b7d47 100644
--- a/sdk/identity/Azure.Identity/samples/TokenCache.md
+++ b/sdk/identity/Azure.Identity/samples/TokenCache.md
@@ -3,16 +3,16 @@
*Token caching* is a feature provided by the Azure Identity library that allows apps to:
- Improve their resilience and performance.
-- Reduce the number of requests made to Azure Active Directory (Azure AD) to obtain access tokens.
+- Reduce the number of requests made to Microsoft Entra ID to obtain access tokens.
- Reduce the number of times the user is prompted to authenticate.
-When an app needs to access a protected Azure resource, it typically needs to obtain an access token from Azure AD. Obtaining that token involves sending a request to Azure AD and may also involve prompting the user. Azure AD then validates the credentials provided in the request and issues an access token.
+When an app needs to access a protected Azure resource, it typically needs to obtain an access token from Microsoft Entra ID. Obtaining that token involves sending a request to Microsoft Entra ID and may also involve prompting the user. Microsoft Entra ID then validates the credentials provided in the request and issues an access token.
-Token caching, via the Azure Identity library, allows the app to store this access token [in memory](#in-memory-token-caching), where it's accessible to the current process, or [on disk](#persistent-token-caching) where it can be accessed across application or process invocations. The token can then be retrieved quickly and easily the next time the app needs to access the same resource. The app can avoid making another request to Azure AD, which reduces network traffic and improves resilience. Additionally, in scenarios where the app is authenticating users, token caching also avoids prompting the user each time new tokens are requested.
+Token caching, via the Azure Identity library, allows the app to store this access token [in memory](#in-memory-token-caching), where it's accessible to the current process, or [on disk](#persistent-token-caching) where it can be accessed across application or process invocations. The token can then be retrieved quickly and easily the next time the app needs to access the same resource. The app can avoid making another request to Microsoft Entra ID, which reduces network traffic and improves resilience. Additionally, in scenarios where the app is authenticating users, token caching also avoids prompting the user each time new tokens are requested.
### In-memory token caching
-*In-memory token caching* is the default option provided by the Azure Identity library. This caching approach allows apps to store access tokens in memory. With in-memory token caching, the library first determines if a valid access token for the requested resource is already stored in memory. If a valid token is found, it's returned to the app without the need to make another request to Azure AD. If a valid token isn't found, the library will automatically acquire a token by sending a request to Azure AD.
+*In-memory token caching* is the default option provided by the Azure Identity library. This caching approach allows apps to store access tokens in memory. With in-memory token caching, the library first determines if a valid access token for the requested resource is already stored in memory. If a valid token is found, it's returned to the app without the need to make another request to Microsoft Entra ID. If a valid token isn't found, the library will automatically acquire a token by sending a request to Microsoft Entra ID.
The in-memory token cache provided by the Azure Identity library is thread-safe.
@@ -32,10 +32,10 @@ As there are many levels of cache, it's not possible to disable in-memory cachin
| macOS | Keychain |
| Windows | DPAPI |
-With persistent disk token caching enabled, the library first determines if a valid access token for the requested resource is already stored in the persistent cache. If a valid token is found, it's returned to the app without the need to make another request to Azure AD. Additionally, the tokens are preserved across app runs, which:
+With persistent disk token caching enabled, the library first determines if a valid access token for the requested resource is already stored in the persistent cache. If a valid token is found, it's returned to the app without the need to make another request to Microsoft Entra ID. Additionally, the tokens are preserved across app runs, which:
- Makes the app more resilient to failures.
-- Ensures the app can continue to function during an Azure AD outage or disruption.
+- Ensures the app can continue to function during a Microsoft Entra ID outage or disruption.
- Avoids having to prompt users to authenticate each time the process is restarted.
diff --git a/sdk/identity/Azure.Identity/src/AzureAuthorityHosts.cs b/sdk/identity/Azure.Identity/src/AzureAuthorityHosts.cs
index d707aaafe3d77..d831421ddd784 100644
--- a/sdk/identity/Azure.Identity/src/AzureAuthorityHosts.cs
+++ b/sdk/identity/Azure.Identity/src/AzureAuthorityHosts.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
@@ -15,22 +15,22 @@ public static class AzureAuthorityHosts
private const string AzureGermanyHostUrl = "https://login.microsoftonline.de/";
private const string AzureGovernmentHostUrl = "https://login.microsoftonline.us/";
///
- /// The host of the Azure Active Directory authority for tenants in the Azure Public Cloud.
+ /// The host of the Microsoft Entra authority for tenants in the Azure Public Cloud.
///
public static Uri AzurePublicCloud { get; } = new Uri(AzurePublicCloudHostUrl);
///
- /// The host of the Azure Active Directory authority for tenants in the Azure China Cloud.
+ /// The host of the Microsoft Entra authority for tenants in the Azure China Cloud.
///
public static Uri AzureChina { get; } = new Uri(AzureChinaHostUrl);
///
- /// The host of the Azure Active Directory authority for tenants in the Azure German Cloud.
+ /// The host of the Microsoft Entra authority for tenants in the Azure German Cloud.
///
public static Uri AzureGermany { get; } = new Uri(AzureGermanyHostUrl);
///
- /// The host of the Azure Active Directory authority for tenants in the Azure US Government Cloud.
+ /// The host of the Microsoft Entra authority for tenants in the Azure US Government Cloud.
///
public static Uri AzureGovernment { get; } = new Uri(AzureGovernmentHostUrl);
diff --git a/sdk/identity/Azure.Identity/src/Credentials/AuthorizationCodeCredential.cs b/sdk/identity/Azure.Identity/src/Credentials/AuthorizationCodeCredential.cs
index deb75f3111f53..cb62f975a48ac 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/AuthorizationCodeCredential.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/AuthorizationCodeCredential.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
@@ -12,8 +12,8 @@
namespace Azure.Identity
{
///
- /// Authenticates by redeeming an authorization code previously obtained from Azure Active Directory. See
- /// for more information
+ /// Authenticates by redeeming an authorization code previously obtained from Microsoft Entra ID. See
+ /// for more information
/// about the authorization code authentication flow.
///
public class AuthorizationCodeCredential : TokenCredential
@@ -35,7 +35,7 @@ protected AuthorizationCodeCredential()
}
///
- /// Creates an instance of the ClientSecretCredential with the details needed to authenticate against Azure Active Directory with a prefetched authorization code.
+ /// Creates an instance of the ClientSecretCredential with the details needed to authenticate against Microsoft Entra ID with a prefetched authorization code.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -48,7 +48,7 @@ public AuthorizationCodeCredential(string tenantId, string clientId, string clie
}
///
- /// Creates an instance of the ClientSecretCredential with the details needed to authenticate against Azure Active Directory with a prefetched authorization code.
+ /// Creates an instance of the ClientSecretCredential with the details needed to authenticate against Microsoft Entra ID with a prefetched authorization code.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -65,7 +65,7 @@ public AuthorizationCodeCredential(
{ }
///
- /// Creates an instance of the ClientSecretCredential with the details needed to authenticate against Azure Active Directory with a prefetched authorization code.
+ /// Creates an instance of the ClientSecretCredential with the details needed to authenticate against Microsoft Entra ID with a prefetched authorization code.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -107,7 +107,7 @@ internal AuthorizationCodeCredential(string tenantId, string clientId, string cl
}
///
- /// Obtains a token from the Azure Active Directory service, using the specified authorization code to authenticate. Acquired tokens
+ /// Obtains a token from Microsoft Entra ID, using the specified authorization code to authenticate. Acquired tokens
/// are cached by the credential instance. Token lifetime and refreshing is handled automatically. Where possible, reuse credential
/// instances to optimize cache effectiveness.
///
@@ -120,7 +120,7 @@ public override AccessToken GetToken(TokenRequestContext requestContext, Cancell
}
///
- /// Obtains a token from the Azure Active Directory service, using the specified authorization code to authenticate. Acquired tokens
+ /// Obtains a token from Microsoft Entra ID, using the specified authorization code to authenticate. Acquired tokens
/// are cached by the credential instance. Token lifetime and refreshing is handled automatically. Where possible, reuse credential
/// instances to optimize cache effectiveness.
///
diff --git a/sdk/identity/Azure.Identity/src/Credentials/AzureCliCredential.cs b/sdk/identity/Azure.Identity/src/Credentials/AzureCliCredential.cs
index 8360f77bb8970..33ace73f40c77 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/AzureCliCredential.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/AzureCliCredential.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
@@ -16,7 +16,7 @@
namespace Azure.Identity
{
///
- /// Enables authentication to Azure Active Directory using Azure CLI to obtain an access token.
+ /// Enables authentication to Microsoft Entra ID using Azure CLI to obtain an access token.
///
public class AzureCliCredential : TokenCredential
{
diff --git a/sdk/identity/Azure.Identity/src/Credentials/AzureDeveloperCliCredential.cs b/sdk/identity/Azure.Identity/src/Credentials/AzureDeveloperCliCredential.cs
index aada387c93cc5..8b3ca75c8a6e2 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/AzureDeveloperCliCredential.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/AzureDeveloperCliCredential.cs
@@ -16,7 +16,7 @@
namespace Azure.Identity
{
///
- /// Enables authentication to Azure Active Directory using Azure Developer CLI to obtain an access token.
+ /// Enables authentication to Microsoft Entra ID using Azure Developer CLI to obtain an access token.
///
public class AzureDeveloperCliCredential : TokenCredential
{
diff --git a/sdk/identity/Azure.Identity/src/Credentials/AzurePowerShellCredential.cs b/sdk/identity/Azure.Identity/src/Credentials/AzurePowerShellCredential.cs
index 2f3148507a66c..0fd4d3bfdda12 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/AzurePowerShellCredential.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/AzurePowerShellCredential.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
@@ -16,7 +16,7 @@
namespace Azure.Identity
{
///
- /// Enables authentication to Azure Active Directory using Azure PowerShell to obtain an access token.
+ /// Enables authentication to Microsoft Entra ID using Azure PowerShell to obtain an access token.
///
public class AzurePowerShellCredential : TokenCredential
{
diff --git a/sdk/identity/Azure.Identity/src/Credentials/ClientAssertionCredential.cs b/sdk/identity/Azure.Identity/src/Credentials/ClientAssertionCredential.cs
index 632aa1b7c67cb..6585aa1e7ac9f 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/ClientAssertionCredential.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/ClientAssertionCredential.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
@@ -13,7 +13,7 @@
namespace Azure.Identity
{
///
- /// Enables authentication of an AAD service principal using a signed client assertion.
+ /// Enables authentication of a Microsoft Entra service principal using a signed client assertion.
///
public class ClientAssertionCredential : TokenCredential
{
@@ -32,7 +32,7 @@ protected ClientAssertionCredential()
{ }
///
- /// Creates an instance of the ClientCertificateCredential with an asynchronous callback that provides a signed client assertion to authenticate against Azure Active Directory.
+ /// Creates an instance of the ClientCertificateCredential with an asynchronous callback that provides a signed client assertion to authenticate against Microsoft Entra ID.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -51,7 +51,7 @@ public ClientAssertionCredential(string tenantId, string clientId, Func
- /// Creates an instance of the ClientCertificateCredential with a synchronous callback that provides a signed client assertion to authenticate against Azure Active Directory.
+ /// Creates an instance of the ClientCertificateCredential with a synchronous callback that provides a signed client assertion to authenticate against Microsoft Entra ID.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -70,7 +70,7 @@ public ClientAssertionCredential(string tenantId, string clientId, Func
}
///
- /// Obtains a token from the Azure Active Directory service, by calling the assertionCallback specified when constructing the credential to obtain a client assertion for authentication.
+ /// Obtains a token from Microsoft Entra ID, by calling the assertionCallback specified when constructing the credential to obtain a client assertion for authentication.
///
/// The details of the authentication request.
/// A controlling the request lifetime.
@@ -94,7 +94,7 @@ public override AccessToken GetToken(TokenRequestContext requestContext, Cancell
}
///
- /// Obtains a token from the Azure Active Directory service, by calling the assertionCallback specified when constructing the credential to obtain a client assertion for authentication.
+ /// Obtains a token from Microsoft Entra ID, by calling the assertionCallback specified when constructing the credential to obtain a client assertion for authentication.
///
/// The details of the authentication request.
/// A controlling the request lifetime.
diff --git a/sdk/identity/Azure.Identity/src/Credentials/ClientCertificateCredential.cs b/sdk/identity/Azure.Identity/src/Credentials/ClientCertificateCredential.cs
index cdfbcdbe86f9c..3659ea8f3f771 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/ClientCertificateCredential.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/ClientCertificateCredential.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using Azure.Core;
@@ -13,16 +13,16 @@
namespace Azure.Identity
{
///
- /// Enables authentication of a service principal in to Azure Active Directory using a X509 certificate that is assigned to it's App Registration. More information
+ /// Enables authentication of a service principal to Microsoft Entra ID using a X509 certificate that is assigned to it's App Registration. More information
/// on how to configure certificate authentication can be found here:
- /// https://docs.microsoft.com/azure/active-directory/develop/active-directory-certificate-credentials#register-your-certificate-with-azure-ad
+ /// https://learn.microsoft.com/azure/active-directory/develop/active-directory-certificate-credentials#register-your-certificate-with-azure-ad
///
public class ClientCertificateCredential : TokenCredential
{
internal const string Troubleshooting = "See the troubleshooting guide for more information. https://aka.ms/azsdk/net/identity/clientcertificatecredential/troubleshoot";
///
- /// Gets the Azure Active Directory tenant (directory) Id of the service principal
+ /// Gets the Microsoft Entra tenant (directory) ID of the service principal
///
internal string TenantId { get; }
@@ -46,7 +46,7 @@ protected ClientCertificateCredential()
{ }
///
- /// Creates an instance of the ClientCertificateCredential with the details needed to authenticate against Azure Active Directory with the specified certificate.
+ /// Creates an instance of the ClientCertificateCredential with the details needed to authenticate against Microsoft Entra ID with the specified certificate.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -56,7 +56,7 @@ public ClientCertificateCredential(string tenantId, string clientId, string clie
{ }
///
- /// Creates an instance of the ClientCertificateCredential with the details needed to authenticate against Azure Active Directory with the specified certificate.
+ /// Creates an instance of the ClientCertificateCredential with the details needed to authenticate against Microsoft Entra ID with the specified certificate.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -68,7 +68,7 @@ public ClientCertificateCredential(string tenantId, string clientId, string clie
{ }
///
- /// Creates an instance of the ClientCertificateCredential with the details needed to authenticate against Azure Active Directory with the specified certificate.
+ /// Creates an instance of the ClientCertificateCredential with the details needed to authenticate against Microsoft Entra ID with the specified certificate.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -79,7 +79,7 @@ public ClientCertificateCredential(string tenantId, string clientId, string clie
{ }
///
- /// Creates an instance of the ClientCertificateCredential with the details needed to authenticate against Azure Active Directory with the specified certificate.
+ /// Creates an instance of the ClientCertificateCredential with the details needed to authenticate against Microsoft Entra ID with the specified certificate.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -89,7 +89,7 @@ public ClientCertificateCredential(string tenantId, string clientId, X509Certifi
{ }
///
- /// Creates an instance of the ClientCertificateCredential with the details needed to authenticate against Azure Active Directory with the specified certificate.
+ /// Creates an instance of the ClientCertificateCredential with the details needed to authenticate against Microsoft Entra ID with the specified certificate.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -101,7 +101,7 @@ public ClientCertificateCredential(string tenantId, string clientId, X509Certifi
{ }
///
- /// Creates an instance of the ClientCertificateCredential with the details needed to authenticate against Azure Active Directory with the specified certificate.
+ /// Creates an instance of the ClientCertificateCredential with the details needed to authenticate against Microsoft Entra ID with the specified certificate.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -171,7 +171,7 @@ internal ClientCertificateCredential(
}
///
- /// Obtains a token from the Azure Active Directory service, using the specified X509 certificate to authenticate. Acquired tokens are
+ /// Obtains a token from Microsoft Entra ID, using the specified X509 certificate to authenticate. Acquired tokens are
/// cached by the credential instance. Token lifetime and refreshing is handled automatically. Where possible, reuse credential
/// instances to optimize cache effectiveness.
///
@@ -196,7 +196,7 @@ public override AccessToken GetToken(TokenRequestContext requestContext, Cancell
}
///
- /// Obtains a token from the Azure Active Directory service, using the specified X509 certificate to authenticate. Acquired tokens are
+ /// Obtains a token from Microsoft Entra ID, using the specified X509 certificate to authenticate. Acquired tokens are
/// cached by the credential instance. Token lifetime and refreshing is handled automatically. Where possible, reuse credential
/// instances to optimize cache effectiveness.
///
diff --git a/sdk/identity/Azure.Identity/src/Credentials/ClientSecretCredential.cs b/sdk/identity/Azure.Identity/src/Credentials/ClientSecretCredential.cs
index d8713acb28e3a..5bc95da240e63 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/ClientSecretCredential.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/ClientSecretCredential.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
@@ -11,7 +11,7 @@
namespace Azure.Identity
{
///
- /// Enables authentication to Azure Active Directory using a client secret that was generated for an App Registration. More information on how
+ /// Enables authentication to Microsoft Entra ID using a client secret that was generated for an App Registration. More information on how
/// to configure a client secret can be found here:
/// https://docs.microsoft.com/azure/active-directory/develop/quickstart-configure-app-access-web-apis#add-credentials-to-your-web-application
///
@@ -24,7 +24,7 @@ public class ClientSecretCredential : TokenCredential
internal MsalConfidentialClient Client { get; }
///
- /// Gets the Azure Active Directory tenant (directory) Id of the service principal
+ /// Gets the Microsoft Entra tenant (directory) Id of the service principal
///
internal string TenantId { get; }
@@ -46,7 +46,7 @@ protected ClientSecretCredential()
}
///
- /// Creates an instance of the ClientSecretCredential with the details needed to authenticate against Azure Active Directory with a client secret.
+ /// Creates an instance of the ClientSecretCredential with the details needed to authenticate against Microsoft Entra ID with a client secret.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -57,7 +57,7 @@ public ClientSecretCredential(string tenantId, string clientId, string clientSec
}
///
- /// Creates an instance of the ClientSecretCredential with the details needed to authenticate against Azure Active Directory with a client secret.
+ /// Creates an instance of the ClientSecretCredential with the details needed to authenticate against Microsoft Entra ID with a client secret.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -69,7 +69,7 @@ public ClientSecretCredential(string tenantId, string clientId, string clientSec
}
///
- /// Creates an instance of the ClientSecretCredential with the details needed to authenticate against Azure Active Directory with a client secret.
+ /// Creates an instance of the ClientSecretCredential with the details needed to authenticate against Microsoft Entra ID with a client secret.
///
/// The Azure Active Directory tenant (directory) Id of the service principal.
/// The client (application) ID of the service principal
@@ -102,7 +102,7 @@ internal ClientSecretCredential(string tenantId, string clientId, string clientS
}
///
- /// Obtains a token from the Azure Active Directory service, using the specified client secret to authenticate. Acquired tokens are cached by the credential instance. Token lifetime and refreshing is handled automatically. Where possible, reuse credential instances to optimize cache effectiveness.
+ /// Obtains a token from Microsoft Entra ID, using the specified client secret to authenticate. Acquired tokens are cached by the credential instance. Token lifetime and refreshing is handled automatically. Where possible, reuse credential instances to optimize cache effectiveness.
///
/// The details of the authentication request.
/// A controlling the request lifetime.
@@ -125,7 +125,7 @@ public override async ValueTask GetTokenAsync(TokenRequestContext r
}
///
- /// Obtains a token from the Azure Active Directory service, using the specified client secret to authenticate. Acquired tokens are cached by the credential instance. Token lifetime and refreshing is handled automatically. Where possible, reuse credential instances to optimize cache effectiveness.
+ /// Obtains a token from Microsoft Entra ID, using the specified client secret to authenticate. Acquired tokens are cached by the credential instance. Token lifetime and refreshing is handled automatically. Where possible, reuse credential instances to optimize cache effectiveness.
///
/// The details of the authentication request.
/// A controlling the request lifetime.
diff --git a/sdk/identity/Azure.Identity/src/Credentials/EnvironmentCredential.cs b/sdk/identity/Azure.Identity/src/Credentials/EnvironmentCredential.cs
index 7493994d7e2f3..2486f5f26c28e 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/EnvironmentCredential.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/EnvironmentCredential.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
@@ -11,7 +11,7 @@
namespace Azure.Identity
{
///
- /// Enables authentication to Azure Active Directory using a client secret or certificate, or as a user
+ /// Enables authentication to Microsoft Entra ID using a client secret or certificate, or as a user
/// with a username and password.
///
/// Configuration is attempted in this order, using these environment variables:
@@ -20,7 +20,7 @@ namespace Azure.Identity
/// Service principal with secret:
///
/// VariableDescription
- /// - AZURE_TENANT_IDThe Azure Active Directory tenant (directory) ID.
+ /// - AZURE_TENANT_IDThe Microsoft Entra tenant (directory) ID.
/// - AZURE_CLIENT_IDThe client (application) ID of an App Registration in the tenant.
/// - AZURE_CLIENT_SECRETA client secret that was generated for the App Registration.
///
@@ -28,7 +28,7 @@ namespace Azure.Identity
/// Service principal with certificate:
///
/// VariableDescription
- /// - AZURE_TENANT_IDThe Azure Active Directory tenant (directory) ID.
+ /// - AZURE_TENANT_IDThe Microsoft Entra tenant (directory) ID.
/// - AZURE_CLIENT_IDThe client (application) ID of an App Registration in the tenant.
/// - AZURE_CLIENT_CERTIFICATE_PATHA path to certificate and private key pair in PEM or PFX format, which can authenticate the App Registration.
/// - AZURE_CLIENT_CERTIFICATE_PASSWORD(Optional) The password protecting the certificate file (currently only supported for PFX (PKCS12) certificates).
@@ -38,10 +38,10 @@ namespace Azure.Identity
/// Username and password:
///
/// VariableDescription
- /// - AZURE_TENANT_IDThe Azure Active Directory tenant (directory) ID.
+ /// - AZURE_TENANT_IDThe Microsoft Entra tenant (directory) ID.
/// - AZURE_CLIENT_IDThe client (application) ID of an App Registration in the tenant.
- /// - AZURE_USERNAMEThe username, also known as upn, of an Azure Active Directory user account.
- /// - AZURE_PASSWORDThe password of the Azure Active Directory user account. Note this does not support accounts with MFA enabled.
+ /// - AZURE_USERNAMEThe username, also known as upn, of a Microsoft Entra user account.
+ /// - AZURE_PASSWORDThe password of the Microsoft Entra user account. Note this does not support accounts with MFA enabled.
///
///
/// This credential ultimately uses a , , or to
@@ -126,7 +126,7 @@ internal EnvironmentCredential(CredentialPipeline pipeline, TokenCredential cred
}
///
- /// Obtains a token from the Azure Active Directory service, using the specified client details specified in the environment variables
+ /// Obtains a token from Microsoft Entra ID, using the specified client details specified in the environment variables
/// AZURE_TENANT_ID, AZURE_CLIENT_ID, and AZURE_CLIENT_SECRET or AZURE_USERNAME and AZURE_PASSWORD to authenticate.
/// Acquired tokens are cached by the credential instance. Token lifetime and refreshing is handled automatically. Where possible,
/// reuse credential instances to optimize cache effectiveness.
@@ -143,7 +143,7 @@ public override AccessToken GetToken(TokenRequestContext requestContext, Cancell
}
///
- /// Obtains a token from the Azure Active Directory service, using the specified client details specified in the environment variables
+ /// Obtains a token from Microsoft Entra ID, using the specified client details specified in the environment variables
/// AZURE_TENANT_ID, AZURE_CLIENT_ID, and AZURE_CLIENT_SECRET or AZURE_USERNAME and AZURE_PASSWORD to authenticate.
/// Acquired tokens are cached by the credential instance. Token lifetime and refreshing is handled automatically. Where possible,
/// reuse credential instances to optimize cache effectiveness.
diff --git a/sdk/identity/Azure.Identity/src/Credentials/OnBehalfOfCredential.cs b/sdk/identity/Azure.Identity/src/Credentials/OnBehalfOfCredential.cs
index cd720f8119827..c8bb2f0ec7454 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/OnBehalfOfCredential.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/OnBehalfOfCredential.cs
@@ -12,7 +12,7 @@
namespace Azure.Identity
{
///
- /// Enables authentication to Azure Active Directory using an On-Behalf-Of flow.
+ /// Enables authentication to Microsoft Entra ID using an On-Behalf-Of flow.
///
public class OnBehalfOfCredential : TokenCredential
{
@@ -31,9 +31,9 @@ protected OnBehalfOfCredential()
{ }
///
- /// Creates an instance of the with the details needed to authenticate against Azure Active Directory with the specified certificate.
+ /// Creates an instance of the with the details needed to authenticate against Microsoft Entra ID with the specified certificate.
///
- /// The Azure Active Directory tenant (directory) Id of the service principal.
+ /// The Microsoft Entra tenant (directory) ID of the service principal.
/// The client (application) ID of the service principal
/// The authentication X509 Certificate of the service principal
/// The access token that will be used by as the user assertion when requesting On-Behalf-Of tokens.
@@ -42,21 +42,21 @@ public OnBehalfOfCredential(string tenantId, string clientId, X509Certificate2 c
{ }
///
- /// Creates an instance of the with the details needed to authenticate against Azure Active Directory with the specified certificate.
+ /// Creates an instance of the with the details needed to authenticate against Microsoft Entra ID with the specified certificate.
///
- /// The Azure Active Directory tenant (directory) Id of the service principal.
+ /// The Microsoft Entra tenant (directory) ID of the service principal.
/// The client (application) ID of the service principal
/// The authentication X509 Certificate of the service principal
/// The access token that will be used by as the user assertion when requesting On-Behalf-Of tokens.
- /// Options that allow to configure the management of the requests sent to the Azure Active Directory service.
+ /// Options that allow to configure the management of the requests sent to Microsoft Entra ID.
public OnBehalfOfCredential(string tenantId, string clientId, X509Certificate2 clientCertificate, string userAssertion, OnBehalfOfCredentialOptions options)
: this(tenantId, clientId, clientCertificate, userAssertion, options, null, null)
{ }
///
- /// Creates an instance of the with the details needed to authenticate with Azure Active Directory.
+ /// Creates an instance of the with the details needed to authenticate with Microsoft Entra ID.
///
- /// The Azure Active Directory tenant (directory) Id of the service principal.
+ /// The Microsoft Entra tenant (directory) ID of the service principal.
/// The client (application) ID of the service principal
/// A client secret that was generated for the App Registration used to authenticate the client.
/// The access token that will be used by as the user assertion when requesting On-Behalf-Of tokens.
@@ -69,13 +69,13 @@ public OnBehalfOfCredential(
{ }
///
- /// Creates an instance of the with the details needed to authenticate with Azure Active Directory.
+ /// Creates an instance of the with the details needed to authenticate with Microsoft Entra ID.
///
- /// The Azure Active Directory tenant (directory) Id of the service principal.
+ /// The Microsoft Entra tenant (directory) ID of the service principal.
/// The client (application) ID of the service principal
/// A client secret that was generated for the App Registration used to authenticate the client.
/// The access token that will be used by as the user assertion when requesting On-Behalf-Of tokens.
- /// Options that allow to configure the management of the requests sent to the Azure Active Directory service.
+ /// Options that allow to configure the management of the requests sent to Microsoft Entra ID.
public OnBehalfOfCredential(
string tenantId,
string clientId,
@@ -154,7 +154,7 @@ internal OnBehalfOfCredential(
}
///
- /// Authenticates with Azure Active Directory and returns an access token if successful.
+ /// Authenticates with Microsoft Entra ID and returns an access token if successful.
/// Acquired tokens are cached by the credential instance. Token lifetime and refreshing is
/// handled automatically. Where possible, reuse credential instances to optimize cache
/// effectiveness.
@@ -166,7 +166,7 @@ public override AccessToken GetToken(TokenRequestContext requestContext, Cancell
GetTokenInternalAsync(requestContext, false, cancellationToken).EnsureCompleted();
///
- /// Authenticates with Azure Active Directory and returns an access token if successful.
+ /// Authenticates with Microsoft Entra ID and returns an access token if successful.
/// Acquired tokens are cached by the credential instance. Token lifetime and refreshing is
/// handled automatically. Where possible, reuse credential instances to optimize cache
/// effectiveness.
diff --git a/sdk/identity/Azure.Identity/src/Credentials/TokenCredentialOptions.cs b/sdk/identity/Azure.Identity/src/Credentials/TokenCredentialOptions.cs
index 915e4859afc07..cdd0086356869 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/TokenCredentialOptions.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/TokenCredentialOptions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
@@ -23,7 +23,7 @@ public TokenCredentialOptions()
}
///
- /// The host of the Azure Active Directory authority. The default is https://login.microsoftonline.com/. For well known authority hosts for Azure cloud instances see .
+ /// The host of the Microsoft Entra authority. The default is https://login.microsoftonline.com/. For well known authority hosts for Azure cloud instances see .
///
public Uri AuthorityHost
{
diff --git a/sdk/identity/Azure.Identity/src/Credentials/UsernamePasswordCredential.cs b/sdk/identity/Azure.Identity/src/Credentials/UsernamePasswordCredential.cs
index cf21e82f20751..551ce7c531468 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/UsernamePasswordCredential.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/UsernamePasswordCredential.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using Azure.Core;
@@ -12,7 +12,7 @@
namespace Azure.Identity
{
///
- /// Enables authentication to Azure Active Directory using a user's username and password. If the user has MFA enabled this
+ /// Enables authentication to Microsoft Entra ID using a user's username and password. If the user has MFA enabled this
/// credential will fail to get a token throwing an . Also, this credential requires a high degree of
/// trust and is not recommended outside of prototyping when more secure credentials can be used.
///
@@ -38,7 +38,7 @@ protected UsernamePasswordCredential()
{ }
///
- /// Creates an instance of the with the details needed to authenticate against Azure Active Directory with a simple username
+ /// Creates an instance of the with the details needed to authenticate against Microsoft Entra ID with a simple username
/// and password.
///
/// The user account's username, also known as UPN.
@@ -50,7 +50,7 @@ public UsernamePasswordCredential(string username, string password, string tenan
{ }
///
- /// Creates an instance of the with the details needed to authenticate against Azure Active Directory with a simple username
+ /// Creates an instance of the with the details needed to authenticate against Microsoft Entra ID with a simple username
/// and password.
///
/// The user account's user name, UPN.
@@ -63,7 +63,7 @@ public UsernamePasswordCredential(string username, string password, string tenan
{ }
///
- /// Creates an instance of the with the details needed to authenticate against Azure Active Directory with a simple username
+ /// Creates an instance of the with the details needed to authenticate against Microsoft Entra ID with a simple username
/// and password.
///
/// The user account's user name, UPN.
diff --git a/sdk/identity/Azure.Identity/src/Credentials/VisualStudioCodeCredential.cs b/sdk/identity/Azure.Identity/src/Credentials/VisualStudioCodeCredential.cs
index 4e482cf87a4eb..9e3fde5810421 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/VisualStudioCodeCredential.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/VisualStudioCodeCredential.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
@@ -15,7 +15,7 @@
namespace Azure.Identity
{
///
- /// Enables authentication to Azure Active Directory as the user signed in to Visual Studio Code via
+ /// Enables authentication to Microsoft Entra ID as the user signed in to Visual Studio Code via
/// the 'Azure Account' extension.
///
/// It's a known issue that `VisualStudioCodeCredential`
diff --git a/sdk/identity/Azure.Identity/src/Credentials/VisualStudioCredential.cs b/sdk/identity/Azure.Identity/src/Credentials/VisualStudioCredential.cs
index f8d1301b1b1dd..01afc5f504877 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/VisualStudioCredential.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/VisualStudioCredential.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
@@ -17,7 +17,7 @@
namespace Azure.Identity
{
///
- /// Enables authentication to Azure Active Directory using data from Visual Studio 2017 or later. See
+ /// Enables authentication to Microsoft Entra ID using data from Visual Studio 2017 or later. See
/// for more information
/// on how to configure Visual Studio for Azure development.
///
diff --git a/sdk/identity/Azure.Identity/src/Credentials/WorkloadIdentityCredential.cs b/sdk/identity/Azure.Identity/src/Credentials/WorkloadIdentityCredential.cs
index f41a3ac678b1a..e77bddcd266af 100644
--- a/sdk/identity/Azure.Identity/src/Credentials/WorkloadIdentityCredential.cs
+++ b/sdk/identity/Azure.Identity/src/Credentials/WorkloadIdentityCredential.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
@@ -13,8 +13,8 @@
namespace Azure.Identity
{
///
- /// WorkloadIdentityCredential supports Azure workload identity authentication on Kubernetes and other hosts supporting workload identity.
- /// Refer to Azure Active Directory Workload Identity for more information.
+ /// WorkloadIdentityCredential supports Microsoft Entra Workload ID authentication on Kubernetes and other hosts supporting workload identity.
+ /// Refer to Microsoft Entra Workload ID for more information.
///
public class WorkloadIdentityCredential : TokenCredential
{