From 5b0d701a27da161e36bc8aa8fdf77036fcb7387e Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Mon, 20 Feb 2023 19:08:33 +0530
Subject: [PATCH] chore: Refactor tenant email param (#20759)

Refactoring to make the `updateTenantLogoInParams` function testable in
EE code.
---
 .../com/appsmith/server/services/ce/UserServiceCE.java    | 2 +-
 .../appsmith/server/services/ce/UserServiceCEImpl.java    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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<User, String> {
 
     Flux<User> getAllByEmails(Set<String> emails, AclPermission permission);
 
-    Mono<Map<String, String>> updateTenantLogoInParams(Map<String, String> params);
+    Mono<Map<String, String>> updateTenantLogoInParams(Map<String, String> params, String origin);
 
     Mono<User> 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<UserRepository, User, String>
                     Map<String, String> 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<UserRepository, User, String>
         Map<String, String> 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<UserRepository, User, String>
                     Map<String, String> 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<UserRepository, User, String>
     }
 
     @Override
-    public Mono<Map<String, String>> updateTenantLogoInParams(Map<String, String> params) {
+    public Mono<Map<String, String>> updateTenantLogoInParams(Map<String, String> params, String origin) {
         return Mono.just(params);
     }
 }