From e2b99f3f5cbc5969ae96f07f57a0181003ea291f Mon Sep 17 00:00:00 2001
From: Thisara-Welmilla <thisara@wso2.com>
Date: Mon, 18 Sep 2023 12:02:01 +0530
Subject: [PATCH] Enable tenanted qualified urls configs

---
 .../src/repository/resources/conf/deployment.toml             | 4 ++++
 .../artifacts/IS/analytics/config/analytics_enabled.toml      | 4 ++++
 .../IS/analytics/config/identity_event_analytics_enabled.toml | 4 ++++
 .../IS/application/mgt/role_validation_disabled.toml          | 4 ++++
 .../artifacts/IS/application/mgt/role_validation_enabled.toml | 4 ++++
 .../test/resources/artifacts/IS/email/email_otp_config.toml   | 4 ++++
 .../artifacts/IS/identityMgt/case_insensitive_user_false.toml | 4 ++++
 .../artifacts/IS/identityMgt/user_mgt_regex_changed.toml      | 4 ++++
 .../resources/artifacts/IS/identity_encryption_enabled.toml   | 4 ++++
 .../test/resources/artifacts/IS/identity_hash_enabled.toml    | 4 ++++
 .../test/resources/artifacts/IS/identity_new_resource.toml    | 4 ++++
 .../resources/artifacts/IS/oauth/add_scope_deployment.toml    | 4 ++++
 .../artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml    | 4 ++++
 .../oauth/jwt_token_issuer_add_remaining_user_attribute.toml  | 4 ++++
 .../artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml  | 4 ++++
 .../artifacts/IS/oauth/jwt_token_issuer_enabled.toml          | 4 ++++
 .../resources/artifacts/IS/oauth/skip_consent_enabled.toml    | 4 ++++
 .../artifacts/IS/oauth/token_renewal_per_request_enabled.toml | 4 ++++
 .../artifacts/IS/provisioning/db_separation_config.toml       | 4 ++++
 .../artifacts/IS/provisioning/default_configs_with_h2_db.toml | 4 ++++
 .../IS/saml/application_authentication_changed_acs.toml       | 4 ++++
 .../IS/saml/saml-assertion-query-enabled-deployment.toml      | 4 ++++
 .../artifacts/IS/saml/saml-sso-for-admin-console.toml         | 4 ++++
 .../IS/saml/saml_ecp_consent_management_disabled.toml         | 4 ++++
 .../IS/scim/IDENTITY4776/catalina_server_config.toml          | 4 ++++
 .../resources/artifacts/IS/scim2/me_unsecured_identity.toml   | 4 ++++
 .../artifacts/IS/user/enable_email_username_deployment.toml   | 4 ++++
 .../artifacts/IS/user/enable_federated_association.toml       | 4 ++++
 .../artifacts/IS/userMgt/carbon15051/email_login_config.toml  | 4 ++++
 .../resources/artifacts/IS/userMgt/jdbc_user_mgt_config.toml  | 4 ++++
 .../resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml  | 4 ++++
 .../artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml  | 4 ++++
 32 files changed, 128 insertions(+)

diff --git a/modules/distribution/src/repository/resources/conf/deployment.toml b/modules/distribution/src/repository/resources/conf/deployment.toml
index 4d16278ad4f..d3e53d8db81 100644
--- a/modules/distribution/src/repository/resources/conf/deployment.toml
+++ b/modules/distribution/src/repository/resources/conf/deployment.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml
index f6b3ad134b5..bbeab44b1f3 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml
index 013fdbda27c..e63705aabea 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml
index 85ef7af3bc1..229c523d043 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml
index 85b8bd3ef43..c8a598e7df3 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml
index 77d325f5126..b7ed6b335c2 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml
@@ -4,6 +4,10 @@ node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 disable_addressing = true
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml
index 95d6f563413..f072993a4fc 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml
index 5e721775096..287618bae27 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml
@@ -4,6 +4,10 @@ node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 offset = "410"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml
index 5beb46bf566..0fa0fdb3e56 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml
index 62f1a79b668..3b154788273 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml
index 04d0aad2a75..b75b328d816 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml
index a7a3c8337d0..63b9d786251 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml
index 4e7a8eee2a0..a38cb137a6e 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml
index cc92fc48874..69a84406b0f 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml
index 4260c454dfb..a17f0a3b1e6 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml
index 5e32413e0be..e63b264b2a6 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml
index e289772eb65..39fc435417b 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml
index 45d89179c3e..8423ab01ff5 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml
index 282f9b60f22..1be46f257af 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml
index 8f1c1394259..fe03bf051b4 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml
index ab7cf7b682f..77a10b0bf70 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml
index 0aea90dcc5e..ad060afd047 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-sso-for-admin-console.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-sso-for-admin-console.toml
index 14faad863d3..f053d6bff62 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-sso-for-admin-console.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-sso-for-admin-console.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml
index 845fd25aa80..8fa2357f1fe 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml
index 1bdebb7f357..a2776654e8a 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml
index 7a33ab8fa53..a9b79315063 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml
index 001f3b1e880..97be4fe10bd 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml
index e4fd0c3a499..394763abc18 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml
index f695d98af85..508ee29c739 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/jdbc_user_mgt_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/jdbc_user_mgt_config.toml
index b4c36cde0d8..94876121388 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/jdbc_user_mgt_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/jdbc_user_mgt_config.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml
index 67c09884b6e..0b704f610d7 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml
index 961caacb042..d2fb5ef50bd 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml
@@ -3,6 +3,10 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
+[tenant_context]
+enable_tenant_qualified_urls = "true"
+enable_tenanted_sessions = "true"
+
 [super_admin]
 username = "admin"
 password = "admin"