From fa9a935064197455bdf42b6ce470266c3a8fd2bd Mon Sep 17 00:00:00 2001
From: DevTKSS <info@technische-konstruktion.com>
Date: Tue, 25 Nov 2025 17:58:18 +0100
Subject: [PATCH] chore: Add Non Standard Paramter Mapping and move
 CodeChallengeMethod to alphabetical order

---
 ...IddictClientWebIntegrationHandlers.Userinfo.cs | 15 +++++++++++++++
 .../OpenIddictClientWebIntegrationProviders.xml   | 11 +++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Userinfo.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Userinfo.cs
index 7ef40cad..efd8b771 100644
--- a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Userinfo.cs
+++ b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Userinfo.cs
@@ -545,6 +545,21 @@ public static partial class OpenIddictClientWebIntegrationHandlers
                     }
                 }
 
+                // Note: Etsy doesn't returns a standard "name" containing first + last Name claim formatted in the JSON object.
+                else if (context.Registration.ProviderType is ProviderTypes.Etsy)
+                {
+                    string? firstName = (string?) context.Response["first_name"];
+                    string? lastName = (string?) context.Response["last_name"];
+                    // user_id gets returned as integer but OpenIddict expects a string
+                    // TODO: Check if this is needed as for calling the getUser Endpoint we already require user_id as parameter
+                    context.Response[Claims.Subject] = context.Response["user_id"]; // Claims are not giving a user_id by default and client_Id is alredy used for x-api-key
+                    context.Response[Claims.Name] = $"{firstName} {lastName}";
+                    context.Response[Claims.FamilyName] = lastName;
+                    context.Response[Claims.GivenName] = firstName;
+                    // Mapping Email and Picture claims
+                    context.Response[Claims.Email] = context.Response["primary_email"];
+                    context.Response[Claims.Picture] = context.Response["image_url_75x75"];
+                }
                 return ValueTask.CompletedTask;
             }
         }
diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml
index db056ac9..056d2a65 100644
--- a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml
+++ b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationProviders.xml
@@ -772,7 +772,7 @@
                                                       ██ ▀▀▀██▄██▄▄▄█▀▀▀▄
                                                       ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
   -->
-  <Provider Name="Etsy"
+  <Provider Name="Etsy" Id="d9f3c1a2-4b7e-4c9d-8a2f-3b7e5c1d9a6f"
             Documentation="https://developers.etsy.com/documentation/essentials/authentication">
     <Environment Issuer="https://www.etsy.com/">
       
@@ -782,20 +782,18 @@
         <!--
         The getMe Endpoint does only provide the 'user_id' and 'shop_id' parameters, which can only be 1 user_id + 1 shop_id!
         -->
-        
+
+        <CodeChallengeMethod Value="S256" />
+
         <!--Etsy API requires Authorization Code flow + Refresh Token to work!-->
         <GrantType Value="authorization_code" />
         <GrantType Value="refresh_token" />
-        
-        <CodeChallengeMethod Value="S256" />
-        
 
       </Configuration>
       <!--Required for getMe UserInfoEndpoint-->
       <Scope Name="shops_r"       Default="true" Required="true" />
       <!--Email scope is required if we want call getUser Endpoint and not only the getMe endpoint as mentioned above-->
       <Scope Name="email_r"       Default="true" Required="false" />
-      
       <!--Optional scopes-->
       <Scope Name="address_r"     Default="false" Required="false" />
       <Scope Name="address_w"     Default="false" Required="false" />
@@ -819,6 +817,7 @@
     
     <!--TODO: Add shop_id UserInfo Claim-->
     <!--TODO: Add the getUser Endpoint Call, to get complete expected UserInfo. required additional scope: 'email_r', json response parameters: 'user_id' 'primary_email' 'first_name' 'last_name' 'image_url_75x75', Path Parameters: 'user_id' <int64>, Uri: https://openapi.etsy.com/v3/application/users/{user_id}, See API Reference: https://developers.etsy.com/documentation/reference#operation/getUser-->
+    
   </Provider>