Merge pull request wso2#6462 from Yasasr1/yasas-custom-domain

Skip custom domains for console and my account
savindi7 · Jun 19, 2024 · 60bc74e · 60bc74e
2 parents 6be5815 + 70048af
commit 60bc74e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.changeset/silly-gorillas-unite.md b/.changeset/silly-gorillas-unite.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/identity-apps-core": patch
+---
+
+Skip custom domains for console and my account.
diff --git a/identity-apps-core/apps/authentication-portal/src/main/webapp/includes/init-url.jsp b/identity-apps-core/apps/authentication-portal/src/main/webapp/includes/init-url.jsp
@@ -147,7 +147,13 @@
     if (Boolean.parseBoolean(application.getInitParameter("IsHostedExternally"))) {
         identityServerEndpointContextParam = application.getInitParameter("IdentityServerEndpointContextURL");
     } else {
-        identityServerEndpointContextParam = ServiceURLBuilder.create().setTenant(tenantDomain).build().getAbsolutePublicURL();
+        spAppName = request.getParameter(SERVICE_PROVIDER_NAME_SHORT);
+        ServiceURLBuilder serviceUrlBuilder = ServiceURLBuilder.create().setTenant(tenantDomain);
+        if ("My Account".equals(spAppName) || "Console".equals(spAppName)) {
+            serviceUrlBuilder.setSkipDomainBranding(true);
+        } 
+    
+        identityServerEndpointContextParam = serviceUrlBuilder.build().getAbsolutePublicURL();
     }
 
     if (StringUtils.isNotBlank(identityServerEndpointContextParam)) {