From d48e464c16b6efb5ef9fbde7b3f3ae287355ec89 Mon Sep 17 00:00:00 2001 From: nswain Date: Wed, 26 Aug 2020 10:39:01 -0600 Subject: [PATCH] Use DEFAULT_FROM_EMAIL instead of EMAIL_HOST_USER for the from email address if EMAIL_HOST_USER does not have an "@" sign in it. Some email relay services require a username that is not an email address for the EMAIL_HOST_USER (e.g.: https://sendgrid.com/docs/API_Reference/SMTP_API/integrating_with_the_smtp_api.html) --- mfa/Common.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mfa/Common.py b/mfa/Common.py index c2f36f7..340c82b 100644 --- a/mfa/Common.py +++ b/mfa/Common.py @@ -2,7 +2,10 @@ from django.conf import settings from django.core.mail import EmailMessage def send(to,subject,body): - From = "%s <%s>" % (settings.EMAIL_FROM, settings.EMAIL_HOST_USER) + from_email_address = settings.EMAIL_HOST_USER + if '@' not in from_email_address: + from_email_address = settings.DEFAULT_FROM_EMAIL + From = "%s <%s>" % (settings.EMAIL_FROM, from_email_address) email = EmailMessage(subject,body,From,to) email.content_subtype = "html" return email.send(False) \ No newline at end of file