From d7a2011580972bbfe05ba4b3d5a1d3cdd55b8d2d Mon Sep 17 00:00:00 2001
From: Maduranga Siriwardena <maduranga.siriwardena@gmail.com>
Date: Mon, 23 Oct 2023 15:17:21 +0530
Subject: [PATCH 1/5] Update url placeholder

---
 .../resources/email-admin-config.xml          | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/features/org.wso2.carbon.email.mgt.server.feature/resources/email-admin-config.xml b/features/org.wso2.carbon.email.mgt.server.feature/resources/email-admin-config.xml
index 230c9b85..72c1571d 100644
--- a/features/org.wso2.carbon.email.mgt.server.feature/resources/email-admin-config.xml
+++ b/features/org.wso2.carbon.email.mgt.server.feature/resources/email-admin-config.xml
@@ -410,7 +410,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -874,7 +874,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -1342,7 +1342,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -2257,7 +2257,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -2725,7 +2725,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -4531,7 +4531,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;type=invite"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;type=invite"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -4999,7 +4999,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;type=invite"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;type=invite"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -5465,7 +5465,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 10px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -5937,7 +5937,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 10px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -12198,7 +12198,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -13987,7 +13987,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{carbon.product-url}}/console"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{product-url-with-user-tenant}}/console"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -14455,7 +14455,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/accountrecoveryendpoint/confirmliteuserregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmliteuserregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -14924,7 +14924,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/accountrecoveryendpoint/confirmliteuserregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmliteuserregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -15392,7 +15392,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -16922,7 +16922,7 @@
                                                                                                 >
                                                                                                     <a
                                                                                                         class="ctaorange"
-                                                                                                        href="{{carbon.product-url}}/commonauth?mlt={{magicToken}}"
+                                                                                                        href="{{product-url-with-user-tenant}}/commonauth?mlt={{magicToken}}"
                                                                                                         style="
                                                                                                             box-sizing: border-box;
                                                                                                             display: inline-block;

From 7437108c145affdf391f1f0f5373e26e8ebd0e8f Mon Sep 17 00:00:00 2001
From: Maduranga Siriwardena <maduranga.siriwardena@gmail.com>
Date: Wed, 25 Oct 2023 12:14:15 +0530
Subject: [PATCH 2/5] Use absolute URLs for portals

---
 .../event/handler/notification/util/NotificationUtil.java  | 7 ++++---
 pom.xml                                                    | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/event-handler-notification/org.wso2.carbon.identity.event.handler.notification/src/main/java/org/wso2/carbon/identity/event/handler/notification/util/NotificationUtil.java b/components/event-handler-notification/org.wso2.carbon.identity.event.handler.notification/src/main/java/org/wso2/carbon/identity/event/handler/notification/util/NotificationUtil.java
index d24eb8f2..4a9fd2e5 100644
--- a/components/event-handler-notification/org.wso2.carbon.identity.event.handler.notification/src/main/java/org/wso2/carbon/identity/event/handler/notification/util/NotificationUtil.java
+++ b/components/event-handler-notification/org.wso2.carbon.identity.event.handler.notification/src/main/java/org/wso2/carbon/identity/event/handler/notification/util/NotificationUtil.java
@@ -274,12 +274,13 @@ public static Map<String, String> getPlaceholderValues(EmailTemplate emailTempla
         // Building the server url.
         String serverURL;
         String carbonUrlWithUserTenant;
-        String accountRecoveryEndpointURL = ConfigurationFacade.getInstance().getAccountRecoveryEndpointPath();
-        String authenticationEndpointURL = ConfigurationFacade.getInstance().getAuthenticationEndpointURL();
+        String accountRecoveryEndpointURL = ConfigurationFacade.getInstance().getAccountRecoveryEndpointAbsolutePath();
+        String authenticationEndpointURL = ConfigurationFacade.getInstance().getAuthenticationEndpointAbsoluteURL();
         try {
             serverURL = ServiceURLBuilder.create().build().getAbsolutePublicURL();
             carbonUrlWithUserTenant = ServiceURLBuilder.create().build().getAbsolutePublicUrlWithoutPath();
-            if (IdentityTenantUtil.isTenantQualifiedUrlsEnabled()) {
+            if (IdentityTenantUtil.isTenantQualifiedUrlsEnabled() && !MultitenantConstants.SUPER_TENANT_DOMAIN_NAME
+                    .equalsIgnoreCase(placeHolderData.get(TENANT_DOMAIN))) {
                 carbonUrlWithUserTenant = ServiceURLBuilder.create().build().getAbsolutePublicUrlWithoutPath() + "/t" +
                         "/" + placeHolderData.get(TENANT_DOMAIN);
             }
diff --git a/pom.xml b/pom.xml
index e4f7427d..adf53dce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -423,7 +423,7 @@
         <carbon.commons.imp.pkg.version>[4.7.11, 5.0.0)</carbon.commons.imp.pkg.version>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>5.25.328</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.25.437-SNAPSHOT</carbon.identity.framework.version>
         <carbon.identity.framework.imp.pkg.version.range>[5.14.67, 7.0.0)</carbon.identity.framework.imp.pkg.version.range>
 
         <!-- Organization management Version -->

From 15ea181733b7d088fe5ef753345d47ad78358489 Mon Sep 17 00:00:00 2001
From: Maduranga Siriwardena <maduranga.siriwardena@gmail.com>
Date: Wed, 25 Oct 2023 13:58:31 +0530
Subject: [PATCH 3/5] Update URL placeholders

---
 .../resources/email-admin-config.xml          | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/features/org.wso2.carbon.email.mgt.server.feature/resources/email-admin-config.xml b/features/org.wso2.carbon.email.mgt.server.feature/resources/email-admin-config.xml
index 72c1571d..23c07fdf 100644
--- a/features/org.wso2.carbon.email.mgt.server.feature/resources/email-admin-config.xml
+++ b/features/org.wso2.carbon.email.mgt.server.feature/resources/email-admin-config.xml
@@ -410,7 +410,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -874,7 +874,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -1342,7 +1342,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -2257,7 +2257,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -2725,7 +2725,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -4531,7 +4531,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;type=invite"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;type=invite"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -4999,7 +4999,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;type=invite"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;type=invite"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -5465,7 +5465,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 10px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -5937,7 +5937,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 10px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -12198,7 +12198,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -13987,7 +13987,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{product-url-with-user-tenant}}/console"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{carbon.product-url}}/console"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -14455,7 +14455,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmliteuserregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmliteuserregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -14924,7 +14924,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmliteuserregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmliteuserregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -15392,7 +15392,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/accountrecoveryendpoint/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -16922,7 +16922,7 @@
                                                                                                 >
                                                                                                     <a
                                                                                                         class="ctaorange"
-                                                                                                        href="{{product-url-with-user-tenant}}/commonauth?mlt={{magicToken}}"
+                                                                                                        href="{{carbon.product-url}}/commonauth?mlt={{magicToken}}"
                                                                                                         style="
                                                                                                             box-sizing: border-box;
                                                                                                             display: inline-block;

From 5df7b80e6efe38b64c8a3039243adeddc321cfa3 Mon Sep 17 00:00:00 2001
From: Maduranga Siriwardena <maduranga.siriwardena@gmail.com>
Date: Thu, 26 Oct 2023 10:56:58 +0530
Subject: [PATCH 4/5] Update the framework version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index adf53dce..86f0b357 100644
--- a/pom.xml
+++ b/pom.xml
@@ -423,7 +423,7 @@
         <carbon.commons.imp.pkg.version>[4.7.11, 5.0.0)</carbon.commons.imp.pkg.version>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>5.25.437-SNAPSHOT</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.25.446</carbon.identity.framework.version>
         <carbon.identity.framework.imp.pkg.version.range>[5.14.67, 7.0.0)</carbon.identity.framework.imp.pkg.version.range>
 
         <!-- Organization management Version -->

From 6c2e82eb7e05c5f72a5af3e7e73fc80dc1ca8e1b Mon Sep 17 00:00:00 2001
From: Maduranga Siriwardena <maduranga.siriwardena@gmail.com>
Date: Thu, 26 Oct 2023 12:14:49 +0530
Subject: [PATCH 5/5] Add conditions to append super tenant domain

---
 .../pom.xml                                          |  4 ++++
 .../handler/notification/util/NotificationUtil.java  | 12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/components/event-handler-notification/org.wso2.carbon.identity.event.handler.notification/pom.xml b/components/event-handler-notification/org.wso2.carbon.identity.event.handler.notification/pom.xml
index 6159dfa8..d49a44cc 100644
--- a/components/event-handler-notification/org.wso2.carbon.identity.event.handler.notification/pom.xml
+++ b/components/event-handler-notification/org.wso2.carbon.identity.event.handler.notification/pom.xml
@@ -69,6 +69,10 @@
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.event</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <artifactId>org.wso2.carbon.identity.core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
diff --git a/components/event-handler-notification/org.wso2.carbon.identity.event.handler.notification/src/main/java/org/wso2/carbon/identity/event/handler/notification/util/NotificationUtil.java b/components/event-handler-notification/org.wso2.carbon.identity.event.handler.notification/src/main/java/org/wso2/carbon/identity/event/handler/notification/util/NotificationUtil.java
index 4a9fd2e5..e46b2d4c 100644
--- a/components/event-handler-notification/org.wso2.carbon.identity.event.handler.notification/src/main/java/org/wso2/carbon/identity/event/handler/notification/util/NotificationUtil.java
+++ b/components/event-handler-notification/org.wso2.carbon.identity.event.handler.notification/src/main/java/org/wso2/carbon/identity/event/handler/notification/util/NotificationUtil.java
@@ -78,6 +78,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static org.wso2.carbon.identity.core.util.IdentityTenantUtil.isSuperTenantRequiredInUrl;
 import static org.wso2.carbon.identity.event.handler.notification.NotificationConstants.EmailNotification.ACCOUNT_RECOVERY_ENDPOINT_PLACEHOLDER;
 import static org.wso2.carbon.identity.event.handler.notification.NotificationConstants.EmailNotification.AUTHENTICATION_ENDPOINT_PLACEHOLDER;
 import static org.wso2.carbon.identity.event.handler.notification.NotificationConstants.EmailNotification.BRANDING_PREFERENCES_COPYRIGHT_TEXT_PATH;
@@ -94,6 +95,7 @@
 import static org.wso2.carbon.identity.event.handler.notification.NotificationConstants.EmailNotification.ORGANIZATION_NAME_PLACEHOLDER;
 import static org.wso2.carbon.identity.event.handler.notification.NotificationConstants.TENANT_DOMAIN;
 import static org.wso2.carbon.identity.organization.management.service.constant.OrganizationManagementConstants.ErrorMessages.ERROR_CODE_ORGANIZATION_NOT_FOUND_FOR_TENANT;
+import static org.wso2.carbon.utils.multitenancy.MultitenantConstants.SUPER_TENANT_DOMAIN_NAME;
 
 public class NotificationUtil {
 
@@ -279,8 +281,12 @@ public static Map<String, String> getPlaceholderValues(EmailTemplate emailTempla
         try {
             serverURL = ServiceURLBuilder.create().build().getAbsolutePublicURL();
             carbonUrlWithUserTenant = ServiceURLBuilder.create().build().getAbsolutePublicUrlWithoutPath();
-            if (IdentityTenantUtil.isTenantQualifiedUrlsEnabled() && !MultitenantConstants.SUPER_TENANT_DOMAIN_NAME
-                    .equalsIgnoreCase(placeHolderData.get(TENANT_DOMAIN))) {
+
+            if (IdentityTenantUtil.isTenantQualifiedUrlsEnabled() &&
+                    (isSuperTenantRequiredInUrl()
+                            || !SUPER_TENANT_DOMAIN_NAME.equalsIgnoreCase(placeHolderData.get(TENANT_DOMAIN)))) {
+                // If tenant domain is carbon.super, and super tenant is not required in the URL,
+                // then the tenant domain should not be appended.
                 carbonUrlWithUserTenant = ServiceURLBuilder.create().build().getAbsolutePublicUrlWithoutPath() + "/t" +
                         "/" + placeHolderData.get(TENANT_DOMAIN);
             }
@@ -661,7 +667,7 @@ private static String resolveHumanReadableOrganizationName(String tenantDomain)
 
         String organizationName = tenantDomain;
         try {
-            if (MultitenantConstants.SUPER_TENANT_DOMAIN_NAME.equals(tenantDomain)) {
+            if (SUPER_TENANT_DOMAIN_NAME.equals(tenantDomain)) {
                 return organizationName;
             }
             RealmService realmService = NotificationHandlerDataHolder.getInstance().getRealmService();