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

chore: Send test email error message to client (#11968)

Browse Source 
Passes error message from server to client when there is error in send test email
This commit is contained in:
Nayan 2022-03-24 14:52:51 +06:00 committed by GitHub
parent b357417f5b
commit 468ed8454f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
View File

@ -32,6 +32,7 @@ import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers; import reactor.core.scheduler.Schedulers;
import javax.mail.MessagingException;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
@ -333,6 +334,7 @@ public class EnvManagerCEImpl implements EnvManagerCE {
Properties props = mailSender.getJavaMailProperties(); Properties props = mailSender.getJavaMailProperties();
props.put("mail.transport.protocol", "smtp"); props.put("mail.transport.protocol", "smtp");
props.put("mail.smtp.starttls.enable", "true"); props.put("mail.smtp.starttls.enable", "true");
props.put("mail.smtp.timeout", 7000); // 7 seconds
if(!StringUtils.isEmpty(requestDTO.getUsername())) { if(!StringUtils.isEmpty(requestDTO.getUsername())) {
props.put("mail.smtp.auth", "true"); props.put("mail.smtp.auth", "true");
@ -348,11 +350,18 @@ public class EnvManagerCEImpl implements EnvManagerCE {
message.setTo(user.getEmail()); message.setTo(user.getEmail());
message.setSubject("Test email from Appsmith"); message.setSubject("Test email from Appsmith");
message.setText("This is a test email from Appsmith, initiated from Admin Settings page. If you are seeing this, your email configuration is working!\n"); message.setText("This is a test email from Appsmith, initiated from Admin Settings page. If you are seeing this, your email configuration is working!\n");
try {
mailSender.testConnection();
} catch (MessagingException e) {
throw new AppsmithException(AppsmithError.GENERIC_BAD_REQUEST, e.getMessage().trim());
}
try { try {
mailSender.send(message); mailSender.send(message);
} catch (MailException mailException) { } catch (MailException mailException) {
log.error("failed to send test email", mailException); log.error("failed to send test email", mailException);
throw new AppsmithException(AppsmithError.GENERIC_BAD_REQUEST, "check log for details"); throw new AppsmithException(AppsmithError.GENERIC_BAD_REQUEST, mailException.getMessage());
} }
return Mono.just(Boolean.TRUE); return Mono.just(Boolean.TRUE);
}); });