Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates the SendEmailConfirmation action to use modified MailgunEmailClient send method #167

Merged
merged 1 commit into from
Jun 28, 2023
Merged

Updates the SendEmailConfirmation action to use modified MailgunEmailClient send method #167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/main/java/org/formflowstartertemplate/app/submission/actions/SendEmailConfirmation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
Expand Down Expand Up @@ -45,7 +46,7 @@ public void run(Submission submission) {
if (recipientEmail == null || recipientEmail.isBlank()) {
return;
}
Boolean requireTls = Boolean.TRUE;
Optional<Boolean> requireTls = Optional.empty();

String emailSubject = messageSource.getMessage("email.subject", null, null);
Object[] args = new Object[]{submission.getId().toString()};
Expand All @@ -62,8 +63,7 @@ public void run(Submission submission) {
Collections.emptyList(),
Collections.emptyList(),
nextStepsBody,
pdfs,
requireTls
pdfs
);
Boolean confirmationWasQueued = nextStepsResponse.getMessage().contains("Queued. Thank you.");
log.info("Mailgun MessageResponse confirms message was queued (true/false): " + confirmationWasQueued);
Expand All @@ -78,7 +78,7 @@ public MessageResponse generateApplicationAndAttachToEmail(
List<String> emailToBcc,
String emailBody,
List<File>pdfs,
Boolean requireTls,
Optional requireTls,
Submission submission){
try {
String generateStringPrefixName = pdfService.generatePdfName(submission);
Expand All @@ -89,14 +89,16 @@ public MessageResponse generateApplicationAndAttachToEmail(
fos.flush();
pdfs.add(pdf);
MessageResponse response;
if(requireTls.isPresent() && requireTls.get().equals(false)){
mailgunEmailClient.setRequireTls(false);
}
response = mailgunEmailClient.sendEmail(
emailSubject,
recipientEmail,
emailToCc,
emailToBcc,
emailBody,
pdfs,
requireTls
pdfs
);
pdf.delete();
return response;
Expand Down