From 0d21f252e967b5a453ba4fec1cc345595d8a06e2 Mon Sep 17 00:00:00 2001
From: Chamila Adhikarinayake <cka.adhi@gmail.com>
Date: Thu, 29 Feb 2024 10:33:18 +0530
Subject: [PATCH 1/2] Add flag to enable adding tenant domain to JWT

---
 .../resources/identity.xml.j2                                 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2
index 6b2c33274f80..8c8393273d8c 100644
--- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2
+++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2
@@ -921,6 +921,10 @@
 
         <!-- Configuration for allowing users to introspect tokens from other tenants. -->
         <AllowCrossTenantTokenIntrospection>{{oauth.introspect.allow_cross_tenant}}</AllowCrossTenantTokenIntrospection>
+
+        {% if oauth.add_tenant_domain_to_token is defined %}
+        <AddTenantDomainToToken>{{oauth.add_tenant_domain_to_token}}</AddTenantDomainToToken>
+        {% endif %}
     </OAuth>
 
     <RestApiAuthentication>

From 15a198cd81e9aac9ad59f597fee34451392dfe31 Mon Sep 17 00:00:00 2001
From: Chamila Adhikarinayake <cka.adhi@gmail.com>
Date: Mon, 4 Mar 2024 11:16:00 +0530
Subject: [PATCH 2/2] Address review comments

---
 .../resources/identity.xml.j2                                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2
index 8c8393273d8c..0bf825b55670 100644
--- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2
+++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2
@@ -922,8 +922,8 @@
         <!-- Configuration for allowing users to introspect tokens from other tenants. -->
         <AllowCrossTenantTokenIntrospection>{{oauth.introspect.allow_cross_tenant}}</AllowCrossTenantTokenIntrospection>
 
-        {% if oauth.add_tenant_domain_to_token is defined %}
-        <AddTenantDomainToToken>{{oauth.add_tenant_domain_to_token}}</AddTenantDomainToToken>
+        {% if oauth.add_tenant_domain_to_access_token is defined %}
+        <AddTenantDomainToAccessToken>{{oauth.add_tenant_domain_to_access_token}}</AddTenantDomainToAccessToken>
         {% endif %}
     </OAuth>