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.

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

add installation brand name to subject of verify email message #3941 #3945

Merged
merged 2 commits into from
Jun 21, 2017

Conversation

pdurbin
Copy link
Member

@pdurbin pdurbin commented Jun 21, 2017

New Contributors

Welcome! New contributors should at least glance at CONTRIBUTING.md, especially the section on pull requests where we encourage you to reach out to other developers before you start coding. Also, please note that we measure code coverage and prefer you write unit tests. Pull requests can still be reviewed without tests or completion of the checklist outlined below. Thanks!

Related Issues

Pull Request Checklist

Copy link
Contributor

@bsilverstein95 bsilverstein95 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes broken email branding issue for verification emails sent by the app upon user email change 👍 also consolidates another piece of mail into MailUtil.java

mailService.sendSystemEmail(toAddress, subject, messageBody);
}
} catch (Exception e) {
logger.info("The root dataverse is not present. Don't send a notification to dataverseAdmin.");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this warrant more than info? I'd at least put this at warn

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Meh, as we discussed in person, anything higher than "fine" is shown. I think "info" is high enough.

@coveralls
Copy link

Coverage Status

Coverage decreased (-5.0e-05%) to 10.276% when pulling 8ee962e on 3941-verify-email-branding into 9708f57 on develop.

Dataverse rootDataverse = dataverseService.findRootDataverse();
if (rootDataverse != null) {
String rootDataverseName = rootDataverse.getName();
// FIXME: consider refactoring this into MailServiceBean.sendNotificationEmail. Then we might need
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might need what?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might need what?

Sorry, the developer died while writing that comment. 😉

I just finished off the comment in 5b75860. Thanks for noticing, @oscardssmith !

@coveralls
Copy link

Coverage Status

Coverage decreased (-5.0e-05%) to 10.276% when pulling 5b75860 on 3941-verify-email-branding into 9708f57 on develop.

@@ -64,6 +64,8 @@ public static String getSubjectTextBasedOnNotification(UserNotification userNoti
return BundleUtil.getStringFromBundle("notification.email.import.filesystem.subject", rootDvNameAsList);
case CHECKSUMIMPORT:
return BundleUtil.getStringFromBundle("notification.email.import.checksum.subject", rootDvNameAsList);
case CONFIRMEMAIL:
return BundleUtil.getStringFromBundle("notification.email.verifyEmail.subject", rootDvNameAsList);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I just mentioned to @sekmiller some day it might be nice to associate these bundle keys with the UserNotification object. Maybe you just call userNotification.getEmailSubject() or something. Out of scope for now but something to consider for the future.

@sekmiller
Copy link
Contributor

Looks good. Passing to QA. As Phil noted there are some things worth thinking about when we do a more comprehensive rewrite of notifications.

@kcondon kcondon merged commit 70a41b4 into develop Jun 21, 2017
@kcondon kcondon deleted the 3941-verify-email-branding branch June 21, 2017 21:56
@pdurbin pdurbin mentioned this pull request Jun 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants