Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update URL placeholders #206

Merged
merged 5 commits into from
Oct 26, 2023
Merged

Update URL placeholders #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7a2011
Update url placeholder
madurangasiriwardena Oct 23, 2023
7437108
Use absolute URLs for portals
madurangasiriwardena Oct 25, 2023
15ea181
Update URL placeholders
madurangasiriwardena Oct 25, 2023
5df7b80
Update the framework version
madurangasiriwardena Oct 26, 2023
6c2e82e
Add conditions to append super tenant domain
madurangasiriwardena Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...ts/event-handler-notification/org.wso2.carbon.identity.event.handler.notification/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
15 changes: 11 additions & 4 deletions .../main/java/org/wso2/carbon/identity/event/handler/notification/util/NotificationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down Expand Up @@ -274,12 +276,17 @@ 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() &&
(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);
}
Expand Down Expand Up @@ -660,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();
Expand Down
Loading
Loading