Merge pull request #2271 from codalab/default_from_email

EMAIL - reintroduced DEFAULT_FROM_EMAIL

Author: Didayolo

.env_sample

@@ -43,6 +43,7 @@ SELENIUM_HOSTNAME=selenium
 #EMAIL_HOST_PASSWORD=pass
 #EMAIL_PORT=587
 #EMAIL_USE_TLS=True
+#DEFAULT_FROM_EMAIL="Codabench <noreply@example.com>"
 #SERVER_EMAIL=noreply@example.com
 
 # Contact Email

src/apps/forums/helpers.py

@@ -15,7 +15,7 @@ def send_mail(context=None, from_email=None, html_file=None, text_file=None, sub
     :param subject: Email's subject.
     :param to_email: Recipient's email.
     """
-    from_email = from_email if from_email else settings.SERVER_EMAIL
+    from_email = from_email if from_email else settings.DEFAULT_FROM_EMAIL
 
     context["site"] = Site.objects.get_current()
 

src/apps/profiles/helpers.py

@@ -15,7 +15,7 @@ def send_mail(context=None, from_email=None, html_file=None, text_file=None, sub
     :param subject: Email's subject.
     :param to_email: Recipient's email.
     """
-    from_email = from_email if from_email else settings.SERVER_EMAIL
+    from_email = from_email if from_email else settings.DEFAULT_FROM_EMAIL
 
     context["site"] = Site.objects.get_current()
 

src/settings/base.py

@@ -563,6 +563,7 @@ def setup_celery_logging(**kwargs):
 EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD')
 EMAIL_PORT = os.environ.get('EMAIL_PORT', 587)
 EMAIL_USE_TLS = os.environ.get('EMAIL_USE_TLS', True)
+DEFAULT_FROM_EMAIL = os.environ.get('DEFAULT_FROM_EMAIL', 'Codabench <noreply@codabench.org>')
 SERVER_EMAIL = os.environ.get('SERVER_EMAIL', 'noreply@codabench.org')
 
 CONTACT_EMAIL = os.environ.get('CONTACT_EMAIL', 'info@codabench.org')

src/utils/email.py

@@ -7,7 +7,7 @@
 
 
 def codalab_send_mail(context_data, to_email, html_file, text_file, subject, from_email=None):
-    from_email = from_email if from_email else settings.SERVER_EMAIL
+    from_email = from_email if from_email else settings.DEFAULT_FROM_EMAIL
 
     context_data["site"] = Site.objects.get_current()
 
@@ -40,7 +40,7 @@ def sanitize(content):
 
 
 def codalab_send_markdown_email(subject, markdown_content, recipient_list, from_email=None):
-    from_email = from_email if from_email else settings.SERVER_EMAIL
+    from_email = from_email if from_email else settings.DEFAULT_FROM_EMAIL
     html_message = markdown.markdown(markdown_content)
     # message = sanitize(markdown_content)
     # html_message = sanitize(markdown.markdown(message))