diff --git a/gen/OpenIddict.Client.WebIntegration.Generators/OpenIddictClientWebIntegrationGenerator.cs b/gen/OpenIddict.Client.WebIntegration.Generators/OpenIddictClientWebIntegrationGenerator.cs index fb642c88..6ca0a99e 100644 --- a/gen/OpenIddict.Client.WebIntegration.Generators/OpenIddictClientWebIntegrationGenerator.cs +++ b/gen/OpenIddict.Client.WebIntegration.Generators/OpenIddictClientWebIntegrationGenerator.cs @@ -937,6 +937,7 @@ public static partial class OpenIddictClientWebIntegrationConstants var template = Template.Parse(@"#nullable enable #pragma warning disable CS0618 +using System.Text.RegularExpressions; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Microsoft.IdentityModel.Tokens; diff --git a/src/OpenIddict.Abstractions/OpenIddictResources.resx b/src/OpenIddict.Abstractions/OpenIddictResources.resx index bef5a482..49673e4f 100644 --- a/src/OpenIddict.Abstractions/OpenIddictResources.resx +++ b/src/OpenIddict.Abstractions/OpenIddictResources.resx @@ -2303,6 +2303,71 @@ To apply pushed authorization responses, create a class implementing 'IOpenIddic This client application is not allowed to use the pushed authorization request endpoint. + + The specified Alibaba Cloud/Aliyun region is not valid. Supported values are: +'China' (or 'CN'), +'Global' (or 'GLB'). + + + The specified Battle.net region is not valid. Supported values are: +'Asia-Pacific' (or 'APAC'), +'China' (or 'CN'), +'European Union' (or 'EU'), +'United States' (or 'US'). + + + The specified Amazon Cognito region is not valid. Supported values are: +'US East (Ohio)' (or 'us-east-2'), +'US East (N. Virginia)' (or 'us-east-1'), +'US West (N. California)' (or 'us-west-1'), +'US West (Oregon)' (or 'us-west-2'), +'Africa (Cape Town)' (or 'af-south-1'), +'Asia Pacific (Hong Kong)' (or 'ap-east-1'), +'Asia Pacific (Hyderabad)' (or 'ap-south-2'), +'Asia Pacific (Jakarta)' (or 'ap-southeast-3'), +'Asia Pacific (Malaysia)' (or 'ap-southeast-5'), +'Asia Pacific (Melbourne)' (or 'ap-southeast-4'), +'Asia Pacific (Mumbai)' (or 'ap-south-1'), +'Asia Pacific (Osaka)' (or 'ap-northeast-3'), +'Asia Pacific (Seoul)' (or 'ap-northeast-2'), +'Asia Pacific (Singapore)' (or 'ap-southeast-1'), +'Asia Pacific (Sydney)' (or 'ap-southeast-2'), +'Asia Pacific (Tokyo)' (or 'ap-northeast-1'), +'Canada (Central)' (or 'ca-central-1'), +'Canada West (Calgary)' (or 'ca-west-1'), +'Europe (Frankfurt)' (or 'eu-central-1'), +'Europe (Ireland)' (or 'eu-west-1'), +'Europe (London)' (or 'eu-west-2'), +'Europe (Milan)' (or 'eu-south-1'), +'Europe (Paris)' (or 'eu-west-3'), +'Europe (Spain)' (or 'eu-south-2'), +'Europe (Stockholm)' (or 'eu-north-1'), +'Europe (Zurich)' (or 'eu-central-2'), +'Israel (Tel Aviv)' (or 'il-central-1'), +'Middle East (Bahrain)' (or 'me-south-1'), +'Middle East (UAE)' (or 'me-central-1'), +'South America (São Paulo)' (or 'sa-east-1'), +'AWS GovCloud (US-East)' (or 'us-gov-east-1'), +'AWS GovCloud (US-West)' (or 'us-gov-west-1'). + +Alternatively, any value respecting the '[region]-[subregion]-[identifier]' pattern can also be specified. + + + The specified Lark/Feishu region is not valid. Supported values are: +'China' (or 'CN'), +'Global' (or 'GLB'). + + + The specified Zoho region is not valid. Supported values are: +'Australia' (or 'AU'), +'Canada' (or 'CA'), +'European Union' (or 'EU'), +'India' (or 'IN'), +'Japan' (or 'JP'), +'Saudi Arabia' (or 'SA'), +'United Kingdom' (or 'UK'), +'United States' (or 'US'). + The '{0}' parameter shouldn't be null or empty at this point. diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs index 84848684..63815d0c 100644 --- a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs +++ b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs @@ -1584,7 +1584,7 @@ public static partial class OpenIddictClientWebIntegrationHandlers // WordPress returns the user identifier as a custom "ID" node: ProviderTypes.WordPress => (string?) context.UserInfoResponse?["ID"], - // WordPress returns the user identifier as a custom "ZUID" node: + // Zoho returns the user identifier as a custom "ZUID" node: ProviderTypes.Zoho => (string?) context.UserInfoResponse?["ZUID"], _ => context.MergedPrincipal.GetClaim(ClaimTypes.NameIdentifier) @@ -1935,7 +1935,7 @@ public static partial class OpenIddictClientWebIntegrationHandlers else if (context.Registration.ProviderType is ProviderTypes.Linear) { var settings = context.Registration.GetLinearSettings(); - + context.Request.Prompt = settings.Prompt; } diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml index 903ab365..51e67cbe 100644 --- a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml +++ b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml @@ -88,11 +88,19 @@ Note: Alibaba Cloud serves global users, but it is known as Aliyun in China, which has a separate issuer and domain. --> - + + Description="The Alibaba Cloud (Aliyun) service region ('Global' for the global Alibaba Cloud by default, or can be set to 'China' for Aliyun)" /> @@ -296,10 +304,16 @@ Note: most Battle.net regions use the same issuer URI but a different domain is required for China. --> - + - + - + @@ -422,7 +436,43 @@ - + @@ -1055,17 +1105,33 @@ Note: Lark serves global users, but it is known as Feishu in China, which has a separate issuer and domain. --> - - + + + Description="The Lark (Feishu) service region ('Global' for the global Lark by default, or can be set to 'China' for Feishu)" /> - - +