Replace references to Azure Active Directory by Microsoft Entra ID

openiddict · Jul 13, 2023 · dcde046 · dcde046
1 parent 76c0501
commit dcde046
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Discovery.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Discovery.cs
@@ -58,7 +58,7 @@ public ValueTask HandleAsync(HandleConfigurationResponseContext context)
                     // such responses as the issuer wouldn't match the expected value. To work around that, the
                     // issuer is replaced by this handler to always use a static value (e.g "common" or "consumers").
                     //
-                    // For more information about the special tenants supported by Microsoft Account/Azure AD, see
+                    // For more information about the special tenants supported by Microsoft Account/Entra ID, see
                     // https://learn.microsoft.com/en-us/azure/active-directory/develop/v2-protocols-oidc#find-your-apps-openid-configuration-document-uri.
                     ProviderTypes.Microsoft when context.Registration.GetMicrosoftSettings() is { Tenant: string tenant } =>
                         string.Equals(tenant, "common", StringComparison.OrdinalIgnoreCase)        ? "https://login.microsoftonline.com/common/v2.0" :

diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Protection.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Protection.cs
@@ -57,7 +57,7 @@ public ValueTask HandleAsync(ValidateTokenContext context)
                     // that is associated with the client application. Since the tenant cannot be
                     // inferred when targeting these special tenants, issuer validation is disabled.
                     //
-                    // For more information about the special tenants supported by Microsoft Account/Azure AD, see
+                    // For more information about the special tenants supported by Microsoft Account/Entra ID, see
                     // https://learn.microsoft.com/en-us/azure/active-directory/develop/v2-protocols-oidc#find-your-apps-openid-configuration-document-uri.
                     ProviderTypes.Microsoft when
                         context.Registration.GetMicrosoftSettings() is { Tenant: string tenant } &&

diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs
@@ -677,9 +677,9 @@ public ValueTask HandleAsync(ProcessAuthenticationContext context)
 
             context.SendUserinfoRequest = context.Registration.ProviderType switch
             {
-                // Note: the frontchannel or backchannel access tokens returned by Azure AD when a
-                // Xbox scope is requested cannot be used with the userinfo endpoint as they use a
-                // legacy format that is not supported by the Azure AD userinfo implementation.
+                // Note: the frontchannel or backchannel access tokens returned by Microsoft Entra ID
+                // when a Xbox scope is requested cannot be used with the userinfo endpoint as they use
+                // a legacy format that is not supported by the Microsoft Entra userinfo implementation.
                 //
                 // To work around this limitation, userinfo retrieval is disabled when a Xbox scope is requested.
                 ProviderTypes.Microsoft => context.GrantType switch

diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml
@@ -601,7 +601,7 @@
               ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
   -->
 
-  <Provider Name="Microsoft" DisplayName="Microsoft Account/Azure Active Directory" Id="b533a06a-3fd6-4754-aeca-025d4e3666ad"
+  <Provider Name="Microsoft" DisplayName="Microsoft Account/Entra ID" Id="b533a06a-3fd6-4754-aeca-025d4e3666ad"
             Documentation="https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-protocols-oidc">
     <!--
       Note: Microsoft is a multitenant provider that relies on virtual paths to identify instances.
@@ -613,7 +613,7 @@
     <Environment Issuer="https://login.microsoftonline.com/{settings.Tenant}/v2.0" />
 
     <Setting PropertyName="Tenant" ParameterName="tenant" Type="String" Required="false" DefaultValue="common"
-             Description="The tenant used to identify the Azure AD instance (by default, the common tenant is used)" />
+             Description="The tenant used to identify the Microsoft Entra instance (by default, the common tenant is used)" />
   </Provider>
 
   <!--