Merge pull request #976 from exadel-inc/EFRS-1342_link_is_not_a_link

EFRS-1342: Fixed the email message related problems

Author: VolodymyrBushko

java/admin/src/main/java/com/exadel/frs/helpers/EmailSender.java

@@ -45,7 +45,7 @@ public void sendMail(final String to, final String subject, final String message
         }
         helper.setTo(to);
         helper.setSubject(subject);
-        helper.setText(message);
+        helper.setText(message, true);
 
         try {
             javaMailSender.send(msg);

java/admin/src/main/java/com/exadel/frs/service/ResetPasswordTokenService.java

@@ -5,13 +5,16 @@
 import static java.time.LocalDateTime.now;
 import static java.time.ZoneOffset.UTC;
 import static java.time.temporal.ChronoUnit.MILLIS;
+import static liquibase.repackaged.org.apache.commons.text.StringSubstitutor.replace;
 import com.exadel.frs.commonservice.entity.ResetPasswordToken;
 import com.exadel.frs.commonservice.entity.User;
 import com.exadel.frs.exception.InvalidResetPasswordTokenException;
 import com.exadel.frs.exception.MailServerDisabledException;
 import com.exadel.frs.helpers.EmailSender;
 import com.exadel.frs.repository.ResetPasswordTokenRepository;
+import java.util.Map;
 import java.util.UUID;
+import liquibase.repackaged.org.apache.commons.text.StringSubstitutor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
@@ -29,12 +32,6 @@ public class ResetPasswordTokenService {
     @Value("${forgot-password.reset-password-token.expires}")
     private long tokenExpires;
 
-    @Value("${forgot-password.email.subject}")
-    private String emailSubject;
-
-    @Value("${forgot-password.email.message}")
-    private String emailMessage;
-
     private final ResetPasswordTokenRepository tokenRepository;
     private final UserService userService;
     private final EmailSender emailSender;
@@ -92,11 +89,22 @@ private UUID assignToken(final User user) {
     }
 
     private void sendToken(final String email, final UUID token) {
-        val hostRedirectTo = env.getProperty("host.frs");
+        val messageParams = Map.of(
+                "host", env.getProperty("host.frs"),
+                "token", token.toString()
+        );
+
+        val message = StringSubstitutor.replace("""
+                In order to reset a password click the link below:<br>
+                <a href="${host}/reset-password?token=${token}">
+                    ${host}/reset-password?token=${token}
+                </a>
+                """, messageParams, "${", "}");
+
         emailSender.sendMail(
                 email,
-                emailSubject,
-                format(emailMessage, hostRedirectTo, token.toString())
+                "CompreFace Reset Password",
+                message
         );
     }
 }

java/admin/src/main/java/com/exadel/frs/service/UserService.java

@@ -46,7 +46,9 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
+import liquibase.repackaged.org.apache.commons.text.StringSubstitutor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
@@ -125,14 +127,23 @@ public String generateRegistrationToken() {
     }
 
     private void sendRegistrationTokenToUser(final User user) {
-        val message = "Please, confirm your registration clicking the link below:\n"
-                + env.getProperty("host.frs")
-                + "/admin/user/registration/confirm?token="
-                + user.getRegistrationToken();
-
-        val subject = "CompreFace Registration";
-
-        emailSender.sendMail(user.getEmail(), subject, message);
+        val messageParams = Map.of(
+                "host", env.getProperty("host.frs"),
+                "token", user.getRegistrationToken()
+        );
+
+        val message = StringSubstitutor.replace("""
+                Please, confirm your registration clicking the link below:<br>
+                <a href="${host}/admin/user/registration/confirm?token=${token}">
+                    ${host}/admin/user/registration/confirm?token=${token}
+                </a>
+                """, messageParams, "${", "}");
+
+        emailSender.sendMail(
+                user.getEmail(),
+                "CompreFace Registration",
+                message
+        );
     }
 
     private void validateUserCreateDto(final UserCreateDto userCreateDto) {

java/admin/src/main/resources/application.yml

@@ -128,9 +128,6 @@ forgot-password:
   cleaner:
     scheduler:
       cron: '0 0 0 * * ?'
-  email:
-    subject: 'CompreFace Reset Password'
-    message: 'In order to reset a password click the following link: %s/reset-password?token=%s'
 
 # "environment" and "image" blocks should be same in those files:
 #    * api/src/main/resources/application.properties

java/admin/src/test/java/com/exadel/frs/service/UserServiceTest.java

@@ -115,6 +115,7 @@ void failGetUser() {
     @Test
     void successCreateUserWhenMailServerEnabled() {
         when(env.getProperty("spring.mail.enable")).thenReturn("true");
+        when(env.getProperty("host.frs")).thenReturn("http://localhost");
         when(userRepositoryMock.save(any())).thenAnswer(returnsFirstArg());
         val userCreateDto = UserCreateDto.builder()
                                          .email("[email protected]")
@@ -272,6 +273,7 @@ void confirmRegistrationReturns403WhenTokenIsExpired() {
     void confirmRegistrationEnablesUserAndRemovesTokenWhenSuccess() {
         when(userRepositoryMock.save(any())).thenAnswer(returnsFirstArg());
         when(env.getProperty("spring.mail.enable")).thenReturn("true");
+        when(env.getProperty("host.frs")).thenReturn("http://localhost");
         val userCreateDto = UserCreateDto.builder()
                                          .email("[email protected]")
                                          .password("password")

java/admin/src/test/resources/application.yml

@@ -95,9 +95,6 @@ forgot-password:
   cleaner:
     scheduler:
       cron: '0 0 0 * * ?'
-  email:
-    subject: 'CompreFace Reset Password'
-    message: 'In order to reset a password click the following link: %s/admin/reset-password?token=%s'
 
 environment:
   servers: