Improve setting cookie path.

wso2-extensions · Nov 14, 2023 · 0202e74 · 0202e74
1 parent ea4441a
commit 0202e74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
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
@@ -1503,15 +1503,15 @@ private void storeTokenIdCookie(String sessionId, HttpServletRequest req, HttpSe
         if (IdentityTenantUtil.isTenantedSessionsEnabled() &&
                 sessionId.endsWith(SAMLSSOConstants.TENANT_QUALIFIED_TOKEN_ID_COOKIE_SUFFIX)) {
             if (loggedInTenantDomain != null) {
-                if (!IdentityTenantUtil.isSuperTenantRequiredInUrl() &&
+                if (!IdentityTenantUtil.isSuperTenantAppendInCookiePath() &&
                         MultitenantConstants.SUPER_TENANT_DOMAIN_NAME.equals(loggedInTenantDomain)) {
                     samlssoTokenIdCookie.setPath(SAMLSSOConstants.COOKIE_ROOT_PATH);
                 } else {
                     samlssoTokenIdCookie.setPath(FrameworkConstants.TENANT_CONTEXT_PREFIX + loggedInTenantDomain +
                             SAMLSSOConstants.COOKIE_ROOT_PATH);
                 }
             } else {
-                if (!IdentityTenantUtil.isSuperTenantRequiredInUrl() &&
+                if (!IdentityTenantUtil.isSuperTenantAppendInCookiePath() &&
                         MultitenantConstants.SUPER_TENANT_DOMAIN_NAME.equals(tenantDomain)) {
                     samlssoTokenIdCookie.setPath(SAMLSSOConstants.COOKIE_ROOT_PATH);
                 } else {
@@ -1571,7 +1571,7 @@ public void removeTokenIdCookie(HttpServletRequest req, HttpServletResponse resp
                     if (IdentityTenantUtil.isTenantedSessionsEnabled() && cookie.getValue() != null &&
                             cookie.getValue().endsWith(SAMLSSOConstants.TENANT_QUALIFIED_TOKEN_ID_COOKIE_SUFFIX)) {
 
-                        if (!IdentityTenantUtil.isSuperTenantRequiredInUrl() &&
+                        if (!IdentityTenantUtil.isSuperTenantAppendInCookiePath() &&
                                 MultitenantConstants.SUPER_TENANT_DOMAIN_NAME.equals(loggedInTenantDomain)) {
                             samlSsoTokenIdCookie.setPath(SAMLSSOConstants.COOKIE_ROOT_PATH);
                         } else {

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.406</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.25.503</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>