diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCE.java index 5a6e39a680..68fc61c84c 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCE.java @@ -46,7 +46,7 @@ public interface UserServiceCE extends CrudService { Flux getAllByEmails(Set emails, AclPermission permission); - Mono> updateTenantLogoInParams(Map params); + Mono> updateTenantLogoInParams(Map params, String origin); Mono updateWithoutPermission(String id, User update); } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java index d9250f1d9c..830c2e6bf8 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java @@ -257,7 +257,7 @@ public class UserServiceCEImpl extends BaseService Map params = new HashMap<>(); params.put("resetUrl", resetUrl); - return updateTenantLogoInParams(params) + return updateTenantLogoInParams(params, resetUserPasswordDTO.getBaseUrl()) .flatMap(updatedParams -> emailSender.sendMail(email, "Appsmith Password Reset", FORGOT_PASSWORD_EMAIL_TEMPLATE, updatedParams) ); @@ -562,7 +562,7 @@ public class UserServiceCEImpl extends BaseService Map params = new HashMap<>(); params.put("primaryLinkUrl", originHeader); - return updateTenantLogoInParams(params) + return updateTenantLogoInParams(params, originHeader) .flatMap(updatedParams -> emailSender.sendMail( user.getEmail(), "Welcome to Appsmith", @@ -645,7 +645,7 @@ public class UserServiceCEImpl extends BaseService Map params = getEmailParams(workspace, inviter, inviteUrl, true); // We have sent out the emails. Just send back the saved user. - return updateTenantLogoInParams(params) + return updateTenantLogoInParams(params, originHeader) .flatMap(updatedParams -> emailSender.sendMail(createdUser.getEmail(), "Invite for Appsmith", INVITE_USER_EMAIL_TEMPLATE, updatedParams) ) @@ -790,7 +790,7 @@ public class UserServiceCEImpl extends BaseService } @Override - public Mono> updateTenantLogoInParams(Map params) { + public Mono> updateTenantLogoInParams(Map params, String origin) { return Mono.just(params); } }