From b3bf3c18ae3c4cbdd85fe3207a7d78e230b6caef Mon Sep 17 00:00:00 2001
From: hiranya <hiranyakavi@gmail.com>
Date: Fri, 1 Oct 2021 18:25:24 +0530
Subject: [PATCH 1/2] Adding missing config

---
 update-artifacts/repository/resources/conf/default.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/update-artifacts/repository/resources/conf/default.json b/update-artifacts/repository/resources/conf/default.json
index b14a66e04d..44b0fc4f76 100644
--- a/update-artifacts/repository/resources/conf/default.json
+++ b/update-artifacts/repository/resources/conf/default.json
@@ -492,6 +492,7 @@
   "apim.jwt.convert_dialect": false,
   "apim.jwt.signing_algorithm": "SHA256withRSA",
   "apim.jwt.claims_extractor_impl": "org.wso2.carbon.apimgt.impl.token.ExtendedDefaultClaimsRetriever",
+  "apim.jwt.binding_federated_user_claims": true,
   "apim.jwt.gateway_generator.impl": "org.wso2.carbon.apimgt.gateway.handlers.security.jwt.generator.APIMgtGatewayJWTGeneratorImpl",
   "apim.jwt.gateway_generator.enable_claim_retrieval":false,
   "apim.cache.gateway_token.enable": true,

From 68257047898fca8cd195a93c600e44932aacdb4c Mon Sep 17 00:00:00 2001
From: hiranya <hiranyakavi@gmail.com>
Date: Sat, 2 Oct 2021 14:58:20 +0530
Subject: [PATCH 2/2] Adding binding_federated_user_claims config

---
 .../conf/templates/repository/conf/api-manager.xml.j2         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/update-artifacts/repository/resources/conf/templates/repository/conf/api-manager.xml.j2 b/update-artifacts/repository/resources/conf/templates/repository/conf/api-manager.xml.j2
index 0f528eb182..c2dc612805 100644
--- a/update-artifacts/repository/resources/conf/templates/repository/conf/api-manager.xml.j2
+++ b/update-artifacts/repository/resources/conf/templates/repository/conf/api-manager.xml.j2
@@ -67,6 +67,10 @@
         <!--ClaimsRetrieverImplClass>org.wso2.carbon.apimgt.impl.token.DefaultClaimsRetriever</ClaimsRetrieverImplClass-->
         {% endif %}
 
+        {% if apim.jwt.binding_federated_user_claims %}
+        <EnableBindingFederatedUserClaims>{{apim.jwt.binding_federated_user_claims}}</EnableBindingFederatedUserClaims>
+        {% endif %}
+
         <!-- The dialectURI under which the claimURIs that need to be appended to the
              JWT are defined. Not used with custom ClaimsRetriever implementations. The
              same value is used in the keys for appending the default properties to the