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

SU-470 : Mail Configuration - Remove authentification #1358

Merged
merged 4 commits into from
Dec 9, 2024
Merged

SU-470 : Mail Configuration - Remove authentification #1358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92396cd
SU-470 : Mail Configuration - Remove authentification
tabrez-fiter Dec 9, 2024
4492af3
Merge branch 'feature/SU-470' of github.com:fiterlatam/fineract-templ…
tabrez-fiter Dec 9, 2024
27ccf1d
Merge branch 'fiter/sumas/dev' of github.com:fiterlatam/fineract-temp…
tabrez-fiter Dec 9, 2024
683a6a1
SU-470 : Mail Configuration - Remove authentification
tabrez-fiter Dec 9, 2024
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
4 changes: 3 additions & 1 deletion buildSrc/src/main/groovy/org/apache/fineract/gradle/service/EmailService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@ class EmailService {
this.properties.put("mail.smtp.socketFactory.port", "465");
this.properties.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");

} else {
} else if (config.tls) {
this.properties.put("mail.smtp.port", "587")
} else {
this.properties.put("mail.smtp.port", "25")
}
}

Expand Down
7 changes: 1 addition & 6 deletions .../org/apache/fineract/custom/portfolio/ally/service/CompensationAlertEmailServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,10 @@ public void sendCompensationAlertEmail(String to, String subject, String body) {

private Properties getJavaMailProperties(SMTPCredentialsData smtpCredentialsData) {
Properties properties = new Properties();
properties.put("mail.smtp.starttls.enable", "true");
properties.put("mail.smtp.starttls.enable", "false");
properties.put("mail.transport.protocol", "smtp");
properties.put("mail.smtp.auth", "false");
properties.put("mail.smtp.ssl.trust", smtpCredentialsData.getHost());
if (smtpCredentialsData.isUseTLS()) {
if (smtpCredentialsData.getPort().equals("465")) {
properties.put("mail.smtp.starttls.enable", "false");
}
}
return properties;
}
}
2 changes: 1 addition & 1 deletion ...ache/fineract/infrastructure/campaigns/email/service/EmailMessageJobEmailServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public void sendEmailWithAttachment(EmailMessageWithAttachmentData emailMessageW
}

private Properties getJavaMailProperties(SMTPCredentialsData smtpCredentialsData, Properties properties) {
properties.put("mail.smtp.starttls.enable", "true");
properties.put("mail.smtp.starttls.enable", "false");
properties.put("mail.transport.protocol", "smtp");
properties.put("mail.smtp.auth", "false");
properties.put("mail.smtp.ssl.trust", smtpCredentialsData.getHost());
Expand Down
2 changes: 1 addition & 1 deletion ...he/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private Properties getJavaMailProperties(Collection<ReportMailingJobConfiguratio
Properties properties = new Properties();

properties.setProperty("mail.smtp.auth", "false");
properties.setProperty("mail.smtp.starttls.enable", "true");
properties.setProperty("mail.smtp.starttls.enable", "false");
properties.setProperty("mail.smtp.ssl.trust", this.getGmailSmtpServer(reportMailingJobConfigurationDataCollection));

return properties;
Expand Down
Loading