New method to get tenant when tenant qualified url enabled.

Thisara-Welmilla · Oct 10, 2023 · e70b7ea · e70b7ea
1 parent eeec4d0
commit e70b7ea
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/...on.identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityTenantUtil.java b/...on.identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityTenantUtil.java
@@ -362,6 +362,26 @@ public static String getTenantDomainFromContext() {
         return (String) IdentityUtil.threadLocalProperties.get().get(IdentityCoreConstants.TENANT_NAME_FROM_CONTEXT);
     }
 
+    /**
+     * Get the tenant name from the thread local properties if available, otherwise get from the
+     * privileged carbon context.
+     *
+     * @return Tenant domain name.
+     */
+    public static String resolveTenantDomain() {
+
+        String tenantDomain = IdentityTenantUtil.getTenantDomainFromContext();
+        if (StringUtils.isBlank(tenantDomain)) {
+            if (log.isDebugEnabled()) {
+                log.debug("The tenant domain is not set to the thread local. Hence using the tenant domain from the " +
+                        "privileged carbon context.");
+            }
+            return PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
+        }
+
+        return tenantDomain;
+    }
+
     /**
      * Get the login tenant id.
      * First it gets the tenant domain from the thread local properties. If empty, retrieve it from thread local