Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: Refactor tenant email param (#20759)

Browse Source 
Refactoring to make the `updateTenantLogoInParams` function testable in
EE code.
This commit is contained in:
Shrikant Sharat Kandula 2023-02-20 19:08:33 +05:30 committed by GitHub
parent 8b32fb6e59
commit 5b0d701a27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCE.java
View File

@ -46,7 +46,7 @@ public interface UserServiceCE extends CrudService<User, String> {
Flux<User> getAllByEmails(Set<String> emails, AclPermission permission); 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); Mono<User> updateWithoutPermission(String id, User update);
} }

8
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
View File

@ -257,7 +257,7 @@ public class UserServiceCEImpl extends BaseService<UserRepository, User, String>
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
params.put("resetUrl", resetUrl); params.put("resetUrl", resetUrl);
return updateTenantLogoInParams(params) return updateTenantLogoInParams(params, resetUserPasswordDTO.getBaseUrl())
.flatMap(updatedParams -> .flatMap(updatedParams ->
emailSender.sendMail(email, "Appsmith Password Reset", FORGOT_PASSWORD_EMAIL_TEMPLATE, 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<>(); Map<String, String> params = new HashMap<>();
params.put("primaryLinkUrl", originHeader); params.put("primaryLinkUrl", originHeader);
return updateTenantLogoInParams(params) return updateTenantLogoInParams(params, originHeader)
.flatMap(updatedParams -> emailSender.sendMail( .flatMap(updatedParams -> emailSender.sendMail(
user.getEmail(), user.getEmail(),
"Welcome to Appsmith", "Welcome to Appsmith",
@ -645,7 +645,7 @@ public class UserServiceCEImpl extends BaseService<UserRepository, User, String>
Map<String, String> params = getEmailParams(workspace, inviter, inviteUrl, true); Map<String, String> params = getEmailParams(workspace, inviter, inviteUrl, true);
// We have sent out the emails. Just send back the saved user. // We have sent out the emails. Just send back the saved user.
return updateTenantLogoInParams(params) return updateTenantLogoInParams(params, originHeader)
.flatMap(updatedParams -> .flatMap(updatedParams ->
emailSender.sendMail(createdUser.getEmail(), "Invite for Appsmith", INVITE_USER_EMAIL_TEMPLATE, 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 @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); return Mono.just(params);
} }
} }