Skip to content

Commit f2967f2

Browse files
amontenegroamontenegro
authored
Merge pull request #6847 from ORCID/AddDoNotReplyToEmails
notify.orcid.org and verify.orcid.org should be not reply addresses
2 parents 116a2a7 + 5f19f41 commit f2967f2

4 files changed

Lines changed: 19 additions & 28 deletions

File tree

‎orcid-core/src/main/java/org/orcid/core/constants/EmailConstants.java‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,7 @@ public class EmailConstants {
1414

1515
public static final String LAST_RESORT_ORCID_USER_EMAIL_NAME = "ORCID Registry User";
1616

17-
public static final String SUPPORT_VERIFY_ORCID_ORG = "ORCID <support@verify.orcid.org>";
18-
19-
public static final String RESET_NOTIFY_ORCID_ORG = "ORCID <reset@notify.orcid.org>";
20-
21-
public static final String CLAIM_NOTIFY_ORCID_ORG = "ORCID <claim@notify.orcid.org>";
22-
23-
public static final String DEACTIVATE_NOTIFY_ORCID_ORG = "ORCID <deactivate@notify.orcid.org>";
24-
25-
public static final String LOCKED_NOTIFY_ORCID_ORG = "ORCID <locked@notify.orcid.org>";
26-
27-
public static final String EMAIL_CHANGED_NOTIFY_ORCID_ORG = "ORCID <email-changed@notify.orcid.org>";
17+
public static final String DO_NOT_REPLY_NOTIFY_ORCID_ORG = "ORCID - Do not reply <DoNotReply@notify.orcid.org>";
18+
19+
public static final String DO_NOT_REPLY_VERIFY_ORCID_ORG = "ORCID - Do not reply <DoNotReply@verify.orcid.org>";
2820
}

‎orcid-scheduler-web/src/main/java/org/orcid/scheduler/autospam/AutospamEmailSender.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void sendOrcidLockedEmail(String orcidToLock) {
7979
// Generate html from template
8080
String html = templateManager.processTemplate("locked_orcid_email_html.ftl", templateParams);
8181

82-
mailgunManager.sendEmail(EmailConstants.LOCKED_NOTIFY_ORCID_ORG, email, subject, body, html);
82+
mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_NOTIFY_ORCID_ORG, email, subject, body, html);
8383
}
8484

8585
private Locale getUserLocaleFromProfileEntity(ProfileEntity profile) {

‎orcid-scheduler-web/src/main/java/org/orcid/scheduler/email/cli/manager/EmailMessageSenderImpl.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
*/
7777
public class EmailMessageSenderImpl implements EmailMessageSender {
7878

79-
private static final String DIGEST_FROM_ADDRESS = "update@notify.orcid.org";
8079
private static final Logger LOGGER = LoggerFactory.getLogger(EmailMessageSenderImpl.class);
8180

8281
private final Integer MAX_RETRY_COUNT;
@@ -299,7 +298,7 @@ public void sendEmailMessages() {
299298
if(!notifications.isEmpty()) {
300299
LOGGER.info("Found {} messages to send for orcid: {}", notifications.size(), orcid);
301300
EmailMessage digestMessage = createDigest(orcid, notifications);
302-
digestMessage.setFrom(DIGEST_FROM_ADDRESS);
301+
digestMessage.setFrom(EmailConstants.DO_NOT_REPLY_NOTIFY_ORCID_ORG);
303302
digestMessage.setTo(primaryEmail.getEmail());
304303
boolean successfullySent = mailGunManager.sendEmail(digestMessage.getFrom(), digestMessage.getTo(), digestMessage.getSubject(),
305304
digestMessage.getBodyText(), digestMessage.getBodyHtml());
@@ -395,7 +394,7 @@ private void processServiceAnnouncementOrTipNotification(NotificationEntity n, S
395394
}
396395
try {
397396
boolean successfullySent = false;
398-
String fromAddressParam = DIGEST_FROM_ADDRESS;
397+
String fromAddressParam = EmailConstants.DO_NOT_REPLY_NOTIFY_ORCID_ORG;
399398
if(!PojoUtil.isEmpty(fromAddress)) {
400399
fromAddressParam = fromAddress;
401400
}
@@ -624,6 +623,6 @@ private void sendVerificationReminderEmail(String userOrcid, String email) {
624623
// Generate body from template
625624
String body = templateManager.processTemplate("verification_email_v2.ftl", templateParams);
626625
String htmlBody = templateManager.processTemplate("verification_email_html_v2.ftl", templateParams);
627-
mailGunManager.sendEmail(EmailConstants.SUPPORT_VERIFY_ORCID_ORG, email, subject, body, htmlBody);
626+
mailGunManager.sendEmail(EmailConstants.DO_NOT_REPLY_VERIFY_ORCID_ORG, email, subject, body, htmlBody);
628627
}
629628
}

‎orcid-web/src/main/java/org/orcid/frontend/email/RecordEmailSender.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public void sendWelcomeEmail(String userOrcid, String email) {
128128
// Generate html from template
129129
String html = templateManager.processTemplate("welcome_email_html_v2.ftl", templateParams);
130130

131-
mailgunManager.sendEmail(EmailConstants.SUPPORT_VERIFY_ORCID_ORG, email, subject, body, html);
131+
mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_VERIFY_ORCID_ORG, email, subject, body, html);
132132
}
133133

134134
public void sendOrcidDeactivateEmail(String userOrcid) {
@@ -159,7 +159,7 @@ public void sendOrcidDeactivateEmail(String userOrcid) {
159159
// Generate html from template
160160
String html = templateManager.processTemplate("deactivate_orcid_email_html.ftl", templateParams);
161161

162-
mailgunManager.sendEmail(EmailConstants.DEACTIVATE_NOTIFY_ORCID_ORG, email, subject, body, html);
162+
mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_NOTIFY_ORCID_ORG, email, subject, body, html);
163163
}
164164

165165
public void sendOrcidLockedEmail(String orcidToLock) {
@@ -184,7 +184,7 @@ public void sendOrcidLockedEmail(String orcidToLock) {
184184
// Generate html from template
185185
String html = templateManager.processTemplate("locked_orcid_email_html.ftl", templateParams);
186186

187-
mailgunManager.sendEmail(EmailConstants.LOCKED_NOTIFY_ORCID_ORG, email, subject, body, html);
187+
mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_NOTIFY_ORCID_ORG, email, subject, body, html);
188188
}
189189

190190
public void sendPasswordResetEmail(String submittedEmail, String userOrcid) {
@@ -208,7 +208,7 @@ public void sendPasswordResetEmail(String submittedEmail, String userOrcid) {
208208
// Generate body from template
209209
String body = templateManager.processTemplate("reset_password_email.ftl", templateParams);
210210
String htmlBody = templateManager.processTemplate("reset_password_email_html.ftl", templateParams);
211-
mailgunManager.sendEmail(EmailConstants.RESET_NOTIFY_ORCID_ORG, submittedEmail, verifyEmailUtils.getSubject("email.subject.reset", locale), body, htmlBody);
211+
mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_NOTIFY_ORCID_ORG, submittedEmail, verifyEmailUtils.getSubject("email.subject.reset", locale), body, htmlBody);
212212
}
213213

214214
public void sendPasswordResetNotFoundEmail(String submittedEmail, Locale locale) {
@@ -222,7 +222,7 @@ public void sendPasswordResetNotFoundEmail(String submittedEmail, Locale locale)
222222
// Generate body from template
223223
String body = templateManager.processTemplate("reset_password_not_found_email.ftl", templateParams);
224224
String htmlBody = templateManager.processTemplate("reset_password_not_found_email_html.ftl", templateParams);
225-
mailgunManager.sendEmail(EmailConstants.RESET_NOTIFY_ORCID_ORG, submittedEmail, verifyEmailUtils.getSubject("email.subject.reset_not_found", locale), body, htmlBody);
225+
mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_NOTIFY_ORCID_ORG, submittedEmail, verifyEmailUtils.getSubject("email.subject.reset_not_found", locale), body, htmlBody);
226226
}
227227

228228
public void sendReactivationEmail(String submittedEmail, String userOrcid) {
@@ -245,7 +245,7 @@ public void sendReactivationEmail(String submittedEmail, String userOrcid) {
245245
// Generate body from template
246246
String body = templateManager.processTemplate("reactivation_email.ftl", templateParams);
247247
String htmlBody = templateManager.processTemplate("reactivation_email_html.ftl", templateParams);
248-
mailgunManager.sendEmail(EmailConstants.RESET_NOTIFY_ORCID_ORG, submittedEmail, verifyEmailUtils.getSubject("email.subject.reactivation", locale), body, htmlBody);
248+
mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_NOTIFY_ORCID_ORG, submittedEmail, verifyEmailUtils.getSubject("email.subject.reactivation", locale), body, htmlBody);
249249
}
250250

251251
public void sendEmailAddressChangedNotification(String currentUserOrcid, String newEmail, String oldEmail) {
@@ -274,7 +274,7 @@ public void sendEmailAddressChangedNotification(String currentUserOrcid, String
274274
// Generate html from template
275275
String html = templateManager.processTemplate("email_removed_html.ftl", templateParams);
276276

277-
mailgunManager.sendEmail(EmailConstants.EMAIL_CHANGED_NOTIFY_ORCID_ORG, oldEmail, subject, body, html);
277+
mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_NOTIFY_ORCID_ORG, oldEmail, subject, body, html);
278278
}
279279

280280
public void sendClaimReminderEmail(String userOrcid, int daysUntilActivation, String email) {
@@ -334,7 +334,7 @@ public void sendClaimReminderEmail(String userOrcid, int daysUntilActivation, St
334334

335335
// Send message
336336
if (apiRecordCreationEmailEnabled) {
337-
mailgunManager.sendEmail(EmailConstants.CLAIM_NOTIFY_ORCID_ORG, email, verifyEmailUtils.getSubject("email.subject.claim_reminder", locale), body, htmlBody);
337+
mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_NOTIFY_ORCID_ORG, email, verifyEmailUtils.getSubject("email.subject.claim_reminder", locale), body, htmlBody);
338338
profileEventDao.persist(new ProfileEventEntity(userOrcid, ProfileEventType.CLAIM_REMINDER_SENT));
339339
} else {
340340
LOGGER.debug("Not sending claim reminder email, because API record creation email option is disabled. Message would have been: {}", body);
@@ -364,7 +364,7 @@ public void send2FADisabledEmail(String userOrcid) {
364364
String html = templateManager.processTemplate("email_2fa_disabled_html.ftl", templateParams);
365365

366366
for (Email email : emails.getEmails()) {
367-
mailgunManager.sendEmail(EmailConstants.RESET_NOTIFY_ORCID_ORG, email.getEmail(), subject, body, html);
367+
mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_NOTIFY_ORCID_ORG, email.getEmail(), subject, body, html);
368368
}
369369
}
370370

@@ -382,7 +382,7 @@ public void sendForgottenIdEmail(String email, String orcid) {
382382

383383
String body = templateManager.processTemplate("forgot_id_email.ftl", templateParams);
384384
String htmlBody = templateManager.processTemplate("forgot_id_email_html.ftl", templateParams);
385-
mailgunManager.sendEmail(EmailConstants.RESET_NOTIFY_ORCID_ORG, email, verifyEmailUtils.getSubject("email.subject.forgotten_id", locale), body, htmlBody);
385+
mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_NOTIFY_ORCID_ORG, email, verifyEmailUtils.getSubject("email.subject.forgotten_id", locale), body, htmlBody);
386386
}
387387

388388
public void sendForgottenIdEmailNotFoundEmail(String email, Locale locale) {
@@ -395,7 +395,7 @@ public void sendForgottenIdEmailNotFoundEmail(String email, Locale locale) {
395395

396396
String body = templateManager.processTemplate("forgot_id_email_not_found_email.ftl", templateParams);
397397
String htmlBody = templateManager.processTemplate("forgot_id_email_not_found_email_html.ftl", templateParams);
398-
mailgunManager.sendEmail(EmailConstants.RESET_NOTIFY_ORCID_ORG, email, verifyEmailUtils.getSubject("email.subject.forgotten_id", locale), body, htmlBody);
398+
mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_NOTIFY_ORCID_ORG, email, verifyEmailUtils.getSubject("email.subject.forgotten_id", locale), body, htmlBody);
399399
}
400400

401401
public void sendVerificationEmailToNonPrimaryEmails(String userOrcid) {
@@ -420,7 +420,7 @@ private void processVerificationEmail(String userOrcid, String email, boolean is
420420
// Generate body from template
421421
String body = templateManager.processTemplate("verification_email_v2.ftl", templateParams);
422422
String htmlBody = templateManager.processTemplate("verification_email_html_v2.ftl", templateParams);
423-
mailgunManager.sendEmail(EmailConstants.SUPPORT_VERIFY_ORCID_ORG, email, subject, body, htmlBody);
423+
mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_VERIFY_ORCID_ORG, email, subject, body, htmlBody);
424424
}
425425

426426
private Locale getUserLocaleFromProfileEntity(ProfileEntity profile) {

0 commit comments

Comments
 (0)