Improve tenant resolving with tenant qualified URL enabled.

wso2-extensions · Oct 16, 2023 · 359b5ce · 359b5ce
1 parent 36b8d06
commit 359b5ce
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/....identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/SAMLLogoutHandler.java b/....identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/SAMLLogoutHandler.java
@@ -137,7 +137,7 @@ private String getLoggedInTenantDomainFromEvent(Event event) {
  }
 
  if (StringUtils.isBlank(loggedInTenantDomain)) {
- loggedInTenantDomain = IdentityTenantUtil.getTenantDomainFromContext();
+ loggedInTenantDomain = IdentityTenantUtil.resolveTenantDomain();
  }
  return loggedInTenantDomain;
  }

diff --git a/...bon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/SAMLSSOService.java b/...bon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/SAMLSSOService.java
@@ -276,7 +276,7 @@ public SAMLSSOReqValidationResponseDTO invalidateSession(String sessionId) throw
 
  String loginTenantDomain = MultitenantConstants.SUPER_TENANT_DOMAIN_NAME;
  if (IdentityTenantUtil.isTenantedSessionsEnabled()) {
- loginTenantDomain = IdentityTenantUtil.getTenantDomainFromContext();
+ loginTenantDomain = IdentityTenantUtil.resolveTenantDomain();
  }
  SPInitLogoutRequestProcessor logoutReqProcessor = SAMLSSOUtil.getSPInitLogoutRequestProcessor();
  return logoutReqProcessor.process(null, sessionId, null, loginTenantDomain);

diff --git a/...ty.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/admin/SAMLSSOConfigAdmin.java b/...ty.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/admin/SAMLSSOConfigAdmin.java
@@ -211,7 +211,7 @@ private String getLoggedInTenantDomain() {
  if (!IdentityTenantUtil.isTenantedSessionsEnabled()) {
  return getTenantDomain();
  }
- return IdentityTenantUtil.getTenantDomainFromContext();
+ return IdentityTenantUtil.resolveTenantDomain();
  }
 
  private Optional<AuthenticatedUser> getLoggedInUser(String tenantDomain) {

diff --git a/....saml/src/main/java/org/wso2/carbon/identity/sso/saml/servlet/SAMLSSOProviderServlet.java b/....saml/src/main/java/org/wso2/carbon/identity/sso/saml/servlet/SAMLSSOProviderServlet.java
@@ -241,7 +241,7 @@ private void handleRequest(HttpServletRequest req, HttpServletResponse resp, boo
 
  String tenantDomain = null;
  if (IdentityTenantUtil.isTenantQualifiedUrlsEnabled()) {
- tenantDomain = IdentityTenantUtil.getTenantDomainFromContext();
+ tenantDomain = IdentityTenantUtil.resolveTenantDomain();
  if (log.isDebugEnabled()) {
  log.debug("Tenant domain from context: " + tenantDomain);
  }
@@ -2243,7 +2243,7 @@ private String getLoggedInTenantDomain(HttpServletRequest req) {
 
  String loggedInTenantDomain = req.getParameter(FrameworkConstants.RequestParams.LOGIN_TENANT_DOMAIN);
  if (StringUtils.isBlank(loggedInTenantDomain)) {
- return IdentityTenantUtil.getTenantDomainFromContext();
+ return IdentityTenantUtil.resolveTenantDomain();
  }
  return loggedInTenantDomain;
  }

diff --git a/pom.xml b/pom.xml
@@ -457,7 +457,7 @@
  <properties>
  <carbon.kernel.version>4.9.10</carbon.kernel.version>
  <carbon.kernel.feature.version>4.9.0</carbon.kernel.feature.version>
- <carbon.identity.framework.version>5.25.305</carbon.identity.framework.version>
+ <carbon.identity.framework.version>5.25.380</carbon.identity.framework.version>
  <carbon.identity.framework.imp.pkg.version.range>[5.25.260, 7.0.0)
  </carbon.identity.framework.imp.pkg.version.range>
  <carbon.identity.organization.management.core.version>1.0.0</carbon.identity.organization.management.core.version>