feature: Added emailTemplate in common-settings.

irfan-ikhwa · irfan-ikhwa · commit d5c63ea1c953 · 2024-02-22T20:59:03.000+05:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java
@@ -1,6 +1,7 @@
 package org.lowcoder.domain.organization.service;
 
 import static org.lowcoder.domain.authentication.AuthenticationService.DEFAULT_AUTH_CONFIG;
+import static org.lowcoder.domain.organization.model.Organization.OrganizationCommonSettings.PASSWORD_RESET_EMAIL_TEMPLATE;
 import static org.lowcoder.domain.organization.model.OrganizationState.ACTIVE;
 import static org.lowcoder.domain.organization.model.OrganizationState.DELETED;
 import static org.lowcoder.domain.util.QueryDslUtils.fieldName;
@@ -56,6 +57,12 @@ public class OrganizationServiceImpl implements OrganizationService {
 
     private final Conf<Integer> logoMaxSizeInKb;
 
+    private static final String PASSWORD_RESET_EMAIL_TEMPLATE_DEFAULT = "<p>Hi, %s<br/>" +
+            "Here is the link to reset your password: %s<br/>" +
+            "Please note that the link will expire after 12 hours.<br/><br/>" +
+            "Regards,<br/>" +
+            "The Lowcoder Team</p>";
+
     @Autowired
     private AssetRepository assetRepository;
 
@@ -151,6 +158,8 @@ public Mono<Organization> create(Organization organization, String creatorId) {
                     if (organization == null || StringUtils.isNotBlank(organization.getId())) {
                         return Mono.error(new BizException(BizError.INVALID_PARAMETER, "INVALID_PARAMETER", FieldName.ORGANIZATION));
                     }
+                    organization.getCommonSettings().put(PASSWORD_RESET_EMAIL_TEMPLATE,
+                            PASSWORD_RESET_EMAIL_TEMPLATE_DEFAULT);
                     organization.setState(ACTIVE);
                     return Mono.just(organization);
                 })
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/EmailCommunicationService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/EmailCommunicationService.java
@@ -18,7 +18,10 @@ public class EmailCommunicationService {
     @Value("${spring.mail.username}")
     private String fromEmail;
 
-    public boolean sendMail(String to, String token, String message) {
+    @Value("${common.lowcoder_public_url}")
+    private String lowcoderPublicUrl;
+
+    public boolean sendPasswordResetEmail(String to, String token, String message) {
         try {
             String subject = "Reset Your Password";
             MimeMessage mimeMessage = javaMailSender.createMimeMessage();
@@ -31,8 +34,8 @@ public boolean sendMail(String to, String token, String message) {
 
             // Construct the message with the token link
             String resetLink = lowcoderPublicUrl + "/api/users/lost-password/" + token;
-            String messageWithLink = message + "\n\nReset your password here: " + resetLink;
-            mimeMessageHelper.setText(messageWithLink, true); // Set HTML to true to allow links
+            String formattedMessage = String.format(message, to, resetLink);
+            mimeMessageHelper.setText(formattedMessage, true); // Set HTML to true to allow links
 
             javaMailSender.send(mimeMessage);
 
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
@@ -42,9 +42,7 @@
 
 import javax.annotation.Nonnull;
 import java.security.SecureRandom;
-import java.time.Duration;
 import java.time.Instant;
-import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.function.Function;
@@ -283,8 +281,7 @@ public Mono<Boolean> lostPassword(String userEmail) {
 
                     String token = generateNewRandomPwd();
                     Instant tokenExpiry = Instant.now().plus(12, ChronoUnit.HOURS);
-
-                    if (!emailCommunicationService.sendMail(userEmail, token, emailTemplate)) {
+                    if (!emailCommunicationService.sendPasswordResetEmail(userEmail, token, emailTemplate)) {
                         return ofError(BizError.AUTH_ERROR, "SENDING_EMAIL_FAILED");
                     }
                     user.setPasswordResetToken(HashUtils.hash(token.getBytes()));
