Merge pull request #6901 from Yoshani/master

Get cookie domain from proxy hostname if custom domain configured
wso2 · Sep 19, 2024 · 61d0b50 · 61d0b50
2 parents 70ce904 + 27597ab
commit 61d0b50
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.changeset/honest-zoos-behave.md b/.changeset/honest-zoos-behave.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/identity-apps-core": patch
+---
+
+set proxy hostname as cookie domain when branded
diff --git a/identity-apps-core/apps/recovery-portal/src/main/webapp/self-registration-process.jsp b/identity-apps-core/apps/recovery-portal/src/main/webapp/self-registration-process.jsp
@@ -23,6 +23,7 @@
 <%@ page import="org.owasp.encoder.Encode" %>
 <%@ page import="org.wso2.carbon.core.SameSiteCookie" %>
 <%@ page import="org.wso2.carbon.core.util.SignatureUtil" %>
+<%@ page import="org.wso2.carbon.identity.core.ServiceURLBuilder" %>
 <%@ page import="org.wso2.carbon.identity.mgt.constants.SelfRegistrationStatusCodes" %>
 <%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.IdentityManagementEndpointConstants" %>
 <%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.IdentityManagementServiceUtil" %>
@@ -358,7 +359,10 @@
             } else {
                 tenantAwareUsername = username + "@" + user.getTenantDomain();
             }
-            String cookieDomain = application.getInitParameter(AUTO_LOGIN_COOKIE_DOMAIN);
+            String domainName = application.getInitParameter(AUTO_LOGIN_COOKIE_DOMAIN);
+            String hostName = ServiceURLBuilder.create().build().getProxyHostName();
+            String cookieDomain = IdentityUtil.isSubdomain(domainName, hostName) ? domainName : hostName;
+
             JSONObject contentValueInJson = new JSONObject();
             contentValueInJson.put("username", tenantAwareUsername);
             contentValueInJson.put("createdTime", System.currentTimeMillis());