From ec7612dd9cb46f38d0450671b148067514d28da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Sat, 24 May 2025 18:40:01 +0200 Subject: [PATCH] Fix invalid resource identifiers --- .../OpenIddictResources.resx | 172 +++++++++--------- .../OpenIddictClientWebIntegrationHandlers.cs | 12 +- ...penIddictClientWebIntegrationProviders.xml | 30 +-- 3 files changed, 107 insertions(+), 107 deletions(-) diff --git a/src/OpenIddict.Abstractions/OpenIddictResources.resx b/src/OpenIddict.Abstractions/OpenIddictResources.resx index b9d130e9..76f1516f 100644 --- a/src/OpenIddict.Abstractions/OpenIddictResources.resx +++ b/src/OpenIddict.Abstractions/OpenIddictResources.resx @@ -1660,6 +1660,92 @@ To use the Entity Framework 6.x integration, reference the 'OpenIddict.EntityFra To use the Entity Framework Core integration, reference the 'OpenIddict.EntityFrameworkCore' package and call 'services.AddOpenIddict().AddCore().UseEntityFrameworkCore()'. To use the MongoDB integration, reference the 'OpenIddict.MongoDb' package and call 'services.AddOpenIddict().AddCore().UseMongoDb()'. + + 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 specified Genesys Cloud region is not valid. Supported values are: +'Asia Pacific (Mumbai)' (or 'ap-south-1'), +'Asia Pacific (Osaka)' (or 'ap-northeast-3'), +'Asia Pacific (Seoul)' (or 'ap-northeast-2'), +'Asia Pacific (Sydney)' (or 'ap-southeast-2'), +'Asia Pacific (Tokyo)' (or 'ap-northeast-1'), +'Canada (Central)' (or 'ca-central-1'), +'Europe (Frankfurt)' (or 'eu-central-1'), +'Europe (Ireland)' (or 'eu-west-1'), +'Europe (London)' (or 'eu-west-2'), +'Europe (Zurich)' (or 'eu-central-2'), +'Middle East (UAE)' (or 'me-central-1'), +'South America (São Paulo)' (or 'sa-east-1'), +'US East (Virginia)' (or 'us-east-1'), +'US East 2 (Ohio)' (or 'us-east-2'), +'US West (Oregon)' (or 'us-west-2'). + + + The specified Stripe Connect account type is not valid. Supported values are 'Standard' and 'Express'. + The security token is missing. @@ -2209,92 +2295,6 @@ To use the MongoDB integration, reference the 'OpenIddict.MongoDb' package and c 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 specified Genesys Cloud region is not valid. Supported values are: -'Asia Pacific (Mumbai)' (or 'ap-south-1'), -'Asia Pacific (Osaka)' (or 'ap-northeast-3'), -'Asia Pacific (Seoul)' (or 'ap-northeast-2'), -'Asia Pacific (Sydney)' (or 'ap-southeast-2'), -'Asia Pacific (Tokyo)' (or 'ap-northeast-1'), -'Canada (Central)' (or 'ca-central-1'), -'Europe (Frankfurt)' (or 'eu-central-1'), -'Europe (Ireland)' (or 'eu-west-1'), -'Europe (London)' (or 'eu-west-2'), -'Europe (Zurich)' (or 'eu-central-2'), -'Middle East (UAE)' (or 'me-central-1'), -'South America (São Paulo)' (or 'sa-east-1'), -'US East (Virginia)' (or 'us-east-1'), -'US East 2 (Ohio)' (or 'us-east-2'), -'US West (Oregon)' (or 'us-west-2'). - - - The specified Stripe Connect account type is not valid. Supported values are 'Standard' and 'Express'. - 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 df1b6d17..da5ac6d1 100644 --- a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs +++ b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs @@ -549,7 +549,7 @@ public static partial class OpenIddictClientWebIntegrationHandlers "UK" => new Uri("https://accounts.zoho.uk/oauth/v2/token", UriKind.Absolute), "US" => new Uri("https://accounts.zoho.com/oauth/v2/token", UriKind.Absolute), - _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID2188)) + _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID0477)) }, ProviderTypes.Zoho when context.GrantType is GrantTypes.RefreshToken @@ -566,7 +566,7 @@ public static partial class OpenIddictClientWebIntegrationHandlers "UK" => new Uri("https://accounts.zoho.uk/oauth/v2/token", UriKind.Absolute), "US" => new Uri("https://accounts.zoho.com/oauth/v2/token", UriKind.Absolute), - _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID2188)) + _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID0477)) }, _ => context.TokenEndpoint @@ -1079,7 +1079,7 @@ public static partial class OpenIddictClientWebIntegrationHandlers "UK" => new Uri("https://accounts.zoho.uk/oauth/user/info", UriKind.Absolute), "US" => new Uri("https://accounts.zoho.com/oauth/user/info", UriKind.Absolute), - _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID2188)) + _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID0477)) }, ProviderTypes.Zoho when context.GrantType is GrantTypes.RefreshToken @@ -1096,7 +1096,7 @@ public static partial class OpenIddictClientWebIntegrationHandlers "UK" => new Uri("https://accounts.zoho.uk/oauth/user/info", UriKind.Absolute), "US" => new Uri("https://accounts.zoho.com/oauth/user/info", UriKind.Absolute), - _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID2188)) + _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID0477)) }, _ => context.UserInfoEndpoint @@ -1696,7 +1696,7 @@ public static partial class OpenIddictClientWebIntegrationHandlers "express" => new Uri("https://connect.stripe.com/express/oauth/authorize", UriKind.Absolute), "standard" => new Uri("https://connect.stripe.com/oauth/authorize", UriKind.Absolute), - _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID2190)) + _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID0479)) }, // Zoho requires using a region-specific authorization endpoint. @@ -1715,7 +1715,7 @@ public static partial class OpenIddictClientWebIntegrationHandlers "UK" => new Uri("https://accounts.zoho.uk/oauth/v2/auth", UriKind.Absolute), "US" => new Uri("https://accounts.zoho.com/oauth/v2/auth", UriKind.Absolute), - _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID2188)) + _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID0477)) }, _ => context.AuthorizationEndpoint diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml index 789d7d6f..02b6160c 100644 --- a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml +++ b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml @@ -92,12 +92,12 @@ 'China' or 'CN' => 'https://oauth.aliyun.com/', 'Global' or 'GLB' => 'https://oauth.alibabacloud.com/', - _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID2184)) }}" + _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID0473)) }}" ConfigurationEndpoint="{settings.Region switch { 'China' or 'CN' => 'https://oauth.aliyun.com/.well-known/openid-configuration', 'Global' or 'GLB' => 'https://oauth.alibabacloud.com/.well-known/openid-configuration', - _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID2184)) }}" /> + _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID0473)) }}" /> @@ -313,7 +313,7 @@ 'European Union' or 'EU' => 'https://oauth.battle.net/', 'United States' or 'US' => 'https://oauth.battle.net/', - _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID2185)) }}" /> + _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID0474)) }}" /> @@ -480,7 +480,7 @@ string value when Regex.IsMatch(value, @'^[a-z]{2,}(-[a-z]+-)?[a-z]+-\d+$') => $'https://cognito-idp.{value}.amazonaws.com/{settings.UserPoolId}', - _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID2186)) }}" /> + _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID0475)) }}" />