From dcde0464205c7f453218e0bef5c07a8c7b39a1b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Thu, 13 Jul 2023 17:19:58 +0200 Subject: [PATCH] Replace references to Azure Active Directory by Microsoft Entra ID --- .../OpenIddictClientWebIntegrationHandlers.Discovery.cs | 2 +- .../OpenIddictClientWebIntegrationHandlers.Protection.cs | 2 +- .../OpenIddictClientWebIntegrationHandlers.cs | 6 +++--- .../OpenIddictClientWebIntegrationProviders.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Discovery.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Discovery.cs index e873c82d1..26bc87d4d 100644 --- 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 index 833564a5f..d7f2b6e01 100644 --- 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 index b40e83324..063c54ccb 100644 --- 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 index b8f8dccfb..26a6c87e2 100644 --- a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml +++ b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml @@ -601,7 +601,7 @@ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ --> -