Merge branch 'master' into improve-settting-paths-in-cookies

wso2-extensions · Oct 18, 2023 · 36245be · 36245be
2 parents 544b1c7 + 2670672
commit 36245be
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/components/org.wso2.carbon.identity.query.saml/pom.xml b/components/org.wso2.carbon.identity.query.saml/pom.xml
@@ -21,7 +21,7 @@
  <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
  <artifactId>identity-inbound-auth-saml</artifactId>
  <relativePath>../../pom.xml</relativePath>
- <version>5.11.24-SNAPSHOT</version>
+ <version>5.11.25-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>org.wso2.carbon.identity.query.saml</artifactId>

diff --git a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml
@@ -22,7 +22,7 @@
  <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
  <artifactId>identity-inbound-auth-saml</artifactId>
  <relativePath>../../pom.xml</relativePath>
- <version>5.11.24-SNAPSHOT</version>
+ <version>5.11.25-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml
@@ -22,7 +22,7 @@
  <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
  <artifactId>identity-inbound-auth-saml</artifactId>
  <relativePath>../../pom.xml</relativePath>
- <version>5.11.24-SNAPSHOT</version>
+ <version>5.11.25-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml
@@ -22,7 +22,7 @@
  <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
  <artifactId>identity-inbound-auth-saml</artifactId>
  <relativePath>../../pom.xml</relativePath>
- <version>5.11.24-SNAPSHOT</version>
+ <version>5.11.25-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.sso.saml/pom.xml b/components/org.wso2.carbon.identity.sso.saml/pom.xml
@@ -22,7 +22,7 @@
  <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
  <artifactId>identity-inbound-auth-saml</artifactId>
  <relativePath>../../pom.xml</relativePath>
- <version>5.11.24-SNAPSHOT</version>
+ <version>5.11.25-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

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);
  }
@@ -2259,7 +2259,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/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml
@@ -22,7 +22,7 @@
  <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
  <artifactId>identity-inbound-auth-saml</artifactId>
  <relativePath>../../pom.xml</relativePath>
- <version>5.11.24-SNAPSHOT</version>
+ <version>5.11.25-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml
@@ -22,7 +22,7 @@
  <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
  <artifactId>identity-inbound-auth-saml</artifactId>
  <relativePath>../../pom.xml</relativePath>
- <version>5.11.24-SNAPSHOT</version>
+ <version>5.11.25-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml
@@ -22,7 +22,7 @@
  <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
  <artifactId>identity-inbound-auth-saml</artifactId>
  <relativePath>../../pom.xml</relativePath>
- <version>5.11.24-SNAPSHOT</version>
+ <version>5.11.25-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml
@@ -22,7 +22,7 @@
  <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
  <artifactId>identity-inbound-auth-saml</artifactId>
  <relativePath>../../pom.xml</relativePath>
- <version>5.11.24-SNAPSHOT</version>
+ <version>5.11.25-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
  <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>identity-inbound-auth-saml</artifactId>
- <version>5.11.24-SNAPSHOT</version>
+ <version>5.11.25-SNAPSHOT</version>
  <packaging>pom</packaging>
  <name>WSO2 Carbon SAML SSO</name>
  <description>