diff --git a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/DefaultServiceURLBuilder.java b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/DefaultServiceURLBuilder.java index ef4b80fa96c0..03e134cd129d 100644 --- a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/DefaultServiceURLBuilder.java +++ b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/DefaultServiceURLBuilder.java @@ -42,7 +42,7 @@ import java.util.StringJoiner; import static org.wso2.carbon.identity.core.util.IdentityCoreConstants.PROXY_CONTEXT_PATH; -import static org.wso2.carbon.identity.core.util.IdentityTenantUtil.isSuperTenantMandatoryInUrl; +import static org.wso2.carbon.identity.core.util.IdentityTenantUtil.isSuperTenantRequiredInUrl; /** * Implementation for {@link ServiceURLBuilder}. @@ -125,7 +125,7 @@ protected String getResolvedUrlPath(String tenantDomain) { if (IdentityTenantUtil.isTenantQualifiedUrlsEnabled() && !resolvedUrlContext.startsWith("t/") && !resolvedUrlContext.startsWith("o/")) { - if (mandateTenantedPath || isSuperTenantMandatoryInUrl() || isNotSuperTenant(tenantDomain)) { + if (mandateTenantedPath || isSuperTenantRequiredInUrl() || isNotSuperTenant(tenantDomain)) { String organizationId = StringUtils.isNotBlank(orgId) ? orgId : PrivilegedCarbonContext.getThreadLocalCarbonContext().getOrganizationId(); if (organizationId != null) { diff --git a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityCoreConstants.java b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityCoreConstants.java index be86bf289e5e..d4ef585062dd 100644 --- a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityCoreConstants.java +++ b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityCoreConstants.java @@ -35,9 +35,10 @@ public class IdentityCoreConstants { public static final String PORTS_OFFSET = "Ports.Offset"; public static final String TENANT_NAME_FROM_CONTEXT = "TenantNameFromContext"; - public static final String ENABLE_TENANT_QUALIFIED_URLS = "EnableTenantQualifiedUrls"; - public static final String ENABLE_TENANTED_SESSIONS = "EnableTenantedSessions"; - public static final String APPEND_SUPER_TENANT_IN_URL = "AppendSuperTenantInUrl"; + public static final String ENABLE_TENANT_QUALIFIED_URLS = "TenantContext.TenantQualifiedUrls.Enable"; + public static final String REQUIRED_SUPER_TENANT_IN_URL = + "TenantContext.TenantQualifiedUrls.TenantedSessions.Enable"; + public static final String ENABLE_TENANTED_SESSIONS = "TenantContext.TenantQualifiedUrls.RequireSuperTenantDomain"; public static final String PROXY_CONTEXT_PATH = "ProxyContextPath"; public static final int DEFAULT_HTTPS_PORT = 443; public static final String UTF_8 = "UTF-8"; diff --git a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityTenantUtil.java b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityTenantUtil.java index 9b19ff13560d..9a61a481ee01 100644 --- a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityTenantUtil.java +++ b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityTenantUtil.java @@ -429,7 +429,7 @@ public static boolean isTenantedSessionsEnabled() { */ public static boolean isSuperTenantRequiredInUrl() { - return Boolean.parseBoolean(IdentityUtil.getProperty(IdentityCoreConstants.APPEND_SUPER_TENANT_IN_URL)); + return Boolean.parseBoolean(IdentityUtil.getProperty(IdentityCoreConstants.REQUIRED_SUPER_TENANT_IN_URL)); } /** 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 a91363742724..5d29add19b84 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 @@ -3214,9 +3214,17 @@ --> {{user.association.enable_for_federated_users}} - {{tenant_context.enable_tenant_qualified_urls}} - {{tenant_context.enable_tenanted_sessions | default(false)}} - {{tenant_context.append_super_tenant_in_url | default(false)}} + + + {{tenant_context.enable_tenant_qualified_urls}} + {{tenant_context.require_super_tenant_in_url}} + + + + {{tenant_context.enable_tenanted_sessions}} + + +