Add Alibaba Cloud (Aliyun) to the list of supported providers

openiddict · Feb 25, 2025 · 2cc49d8 · 2cc49d8
1 parent ac64191
commit 2cc49d8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Exchange.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Exchange.cs
@@ -357,23 +357,23 @@ public ValueTask HandleAsync(ExtractTokenResponseContext context)
                     context.Response.RefreshToken = null;
                 }
 
+                // Note: Alibaba Cloud and Exact Online returns a non-standard "expires_in"
+                // parameter formatted as a string instead of a numeric type.
+                if (context.Registration.ProviderType is ProviderTypes.AlibabaCloud or ProviderTypes.ExactOnline &&
+                         long.TryParse((string?) context.Response[Parameters.ExpiresIn],
+                             NumberStyles.Integer, CultureInfo.InvariantCulture, out long value))
+                {
+                    context.Response.ExpiresIn = value;
+                }
+
                 // Note: Deezer doesn't return a standard "expires_in" parameter
                 // but returns an equivalent "expires" integer parameter instead.
-                if (context.Registration.ProviderType is ProviderTypes.Deezer)
+                else if (context.Registration.ProviderType is ProviderTypes.Deezer)
                 {
                     context.Response[Parameters.ExpiresIn] = context.Response["expires"];
                     context.Response["expires"] = null;
                 }
 
-                // Note: Exact Online returns a non-standard "expires_in"
-                // parameter formatted as a string instead of a numeric type.
-                else if (context.Registration.ProviderType is ProviderTypes.ExactOnline &&
-                    long.TryParse((string?) context.Response[Parameters.ExpiresIn],
-                        NumberStyles.Integer, CultureInfo.InvariantCulture, out long value))
-                {
-                    context.Response.ExpiresIn = value;
-                }
-
                 // Note: Huawei returns a non-standard "error" parameter as a numeric value, which is not allowed
                 // by OpenIddict (that requires a string). Huawei also returns a non-standard "sub_error" parameter
                 // that contains additional error information, with which the error code can demonstrate a specific

diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml
@@ -74,6 +74,27 @@
     </Environment>
   </Provider>
 
+  <!--
+                            ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+                            █ ▄▄▀██ ████▄ ▄██ ▄▄▀█ ▄▄▀██ ▄▄▀█ ▄▄▀████ ▄▄▀██ █████ ▄▄▄ ██ ██ ██ ▄▄▀██
+                            █ ▀▀ ██ █████ ███ ▄▄▀█ ▀▀ ██ ▄▄▀█ ▀▀ ████ █████ █████ ███ ██ ██ ██ ██ ██
+                            █ ██ ██ ▀▀ █▀ ▀██ ▀▀ █ ██ ██ ▀▀ █ ██ ████ ▀▀▄██ ▀▀ ██ ▀▀▀ ██▄▀▀▄██ ▀▀ ██
+                            ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+  -->
+
+  <Provider Name="AlibabaCloud" DisplayName="Alibaba Cloud (Aliyun)" Id="078caf87-3c5b-46aa-a8af-31e7cb2f4b7a"
+            Documentation="https://www.alibabacloud.com/help/en/ram/user-guide/oauth-management/">
+    <!--
+      Note: Alibaba Cloud serves global users, but it is known as Aliyun in China, which has a separate issuer and domain.
+    -->
+
+    <Environment Issuer="https://oauth.{(settings.Region?.ToUpperInvariant() is 'CN' ? 'aliyun' : 'alibabacloud')}.com/"
+                 ConfigurationEndpoint="https://oauth.{(settings.Region?.ToUpperInvariant() is 'CN' ? 'aliyun' : 'alibabacloud')}.com/.well-known/openid-configuration" />
+
+    <Setting PropertyName="Region" ParameterName="region" Type="String" Required="false" DefaultValue="Global"
+             Description="The Alibaba Cloud (Aliyun) service region ('Global' for the global Alibaba Cloud by default, or can be set to 'CN' for Aliyun)" />
+  </Provider>
+
   <!--
                                             ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
                                             █ ▄▄▀██ ▄▀▄ █ ▄▄▀██ ▄▄▄ ██ ▄▄▄ ██ ▀██ ██