update email integration settings

docs/source/settings.rst

@@ -30,6 +30,10 @@ These values can be set in the shell environment of the server program.
 
   **Example:** ``mysql://kegbot@localhost/kegbot``
 
+.. data:: KEGBOT_EMAIL_FROM_ADDRESS
+
+  The "From:" address to use in emails from the system. No default.
+
 .. data:: KEGBOT_REDIS_URL
 
   URL to the Kegbot Redis instance, in the format ``redis://:PASSWORD@HOST:PORT/DATABASE``. ``PASSWORD`` and ``PORT`` are optional.

pykeg/config.py

@@ -97,6 +97,7 @@ def is_setup():
 
 
 Setting('KEGBOT_ENV', 'test' if IS_RUNNING_PYTEST else ENV_DEBUG)
+Setting('KEGBOT_EMAIL_FROM_ADDRESS', '')
 Setting('KEGBOT_DATA_DIR', '/kegbot-data')
 Setting('KEGBOT_IN_DOCKER', False, typefn=boolstr)
 Setting('KEGBOT_SECRET_KEY', 'not-configured')

pykeg/notification/backends/email_test.py

@@ -29,7 +29,7 @@
 
 @override_settings(KEGBOT_BACKEND='pykeg.core.testutils.TestBackend')
 @override_settings(EMAIL_BACKEND='django.core.mail.backends.locmem.EmailBackend')
-@override_settings(EMAIL_FROM_ADDRESS='test-from@example')
+@override_settings(DEFAULT_FROM_EMAIL='test-from@example')
 class EmailNotificationBackendTestCase(TestCase):
     def setUp(self):
         self.backend = get_kegbot_backend()

pykeg/settings.py

@@ -276,7 +276,7 @@
 
 # E-mail
 EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
-EMAIL_FROM_ADDRESS = ''
+DEFAULT_FROM_EMAIL = KEGBOT['KEGBOT_EMAIL_FROM_ADDRESS']
 EMAIL_SUBJECT_PREFIX = ''
 
 # Imagekit
@@ -311,6 +311,3 @@
 # Override any user-specified timezone: As of Kegbot 0.9.12, this is
 # specified in site settings.
 TIME_ZONE = 'UTC'
-
-# Update email addresses.
-DEFAULT_FROM_EMAIL = EMAIL_FROM_ADDRESS

pykeg/util/email.py

@@ -31,9 +31,9 @@
 
 
 def build_message(to_address, template_name, context):
-    from_address = getattr(settings, 'EMAIL_FROM_ADDRESS', None)
+    from_address = getattr(settings, 'DEFAULT_FROM_EMAIL', None)
     if not from_address:
-        logger.error('EMAIL_FROM_ADDRESS is not available; aborting!')
+        logger.error('DEFAULT_FROM_EMAIL is not available; aborting!')
         return None
 
     template = get_template(template_name)

pykeg/web/api/api_test.py

@@ -227,7 +227,7 @@ def test_record_drink_usernames(self):
         self.assertEqual(data.meta.result, 'ok')
 
     @override_settings(EMAIL_BACKEND='django.core.mail.backends.locmem.EmailBackend')
-    @override_settings(EMAIL_FROM_ADDRESS='test-from@example')
+    @override_settings(DEFAULT_FROM_EMAIL='test-from@example')
     def test_registration(self):
         response, data = self.post(
             'new-user/', data={'username': 'newuser', 'email': '[email protected]'})

pykeg/web/kbregistration/forms.py

@@ -79,7 +79,7 @@ def save(self, domain_override=None,
             # a password marked as unusable
             if not user.has_usable_password():
                 continue
-            from_email = getattr(settings, 'EMAIL_FROM_ADDRESS', from_email)
+            from_email = settings.DEFAULT_FROM_EMAIL or from_email
 
             be = get_kegbot_backend()
             base_url = be.get_base_url()

pykeg/web/kbregistration/registration_test.py

@@ -39,7 +39,7 @@ def setUp(self):
         self.user.save()
 
     @override_settings(EMAIL_BACKEND='django.core.mail.backends.locmem.EmailBackend')
-    @override_settings(EMAIL_FROM_ADDRESS='test-from@example')
+    @override_settings(DEFAULT_FROM_EMAIL='test-from@example')
     def test_notifications(self):
         response = self.client.get('/accounts/password/reset/')
         self.assertContains(response, "Reset Password", status_code=200)
@@ -52,6 +52,7 @@ def test_notifications(self):
 
         msg = mail.outbox[0]
 
-        self.assertEqual('Password reset on My Kegbot', msg.subject)
+        # TODO(mikey): Customize subject with `kbsite.title`
+        self.assertEqual('Password reset', msg.subject)
         self.assertEqual(['[email protected]'], msg.to)
         self.assertEqual('test-from@example', msg.from_email)

pykeg/web/kegadmin/templates/kegadmin/dashboard.html

@@ -38,8 +38,7 @@ <h4>Warning: Debug Mode</h4>
   <h4>Warning: E-Mail Configuration Problem</h4>
    E-mail is not properly configured; no mails will be sent.  Please
    <a href="https://kegbot.org/docs/server/extras/">read the docs</a>
-   for more information (hint: set <code>EMAIL_BACKEND</code> and
-   <code>EMAIL_FROM_ADDRESS</code> in <code>local_settings.py</code>).
+   for more information.
 </div>
 {% endif %}
 

pykeg/web/kegadmin/templates/kegadmin/email.html

@@ -11,8 +11,7 @@
   <h4>Warning!</h4>
    E-mail is not properly configured; no mails will be sent.  Please
    <a href="https://kegbot.org/docs/server/extras/">read the docs</a>
-   for more information (hint: set <code>EMAIL_BACKEND</code> and
-   <code>EMAIL_FROM_ADDRESS</code> in <code>local_settings.py</code>).
+   for more information.
 </div>
 {% else %}
   <h2>Test E-mail Configuration</h2>

pykeg/web/kegadmin/views.py

@@ -68,7 +68,7 @@ def dashboard(request):
 
     email_backend = getattr(settings, 'EMAIL_BACKEND', None)
     email_configured = email_backend and email_backend != 'django.core.mail.backends.dummy.EmailBackend'
-    email_configured = email_configured and bool(getattr(settings, 'EMAIL_FROM_ADDRESS', None))
+    email_configured = email_configured and settings.DEFAULT_FROM_EMAIL
 
     context['email_configured'] = email_configured
 
@@ -168,7 +168,7 @@ def email(request):
 
     email_backend = getattr(settings, 'EMAIL_BACKEND', None)
     email_configured = email_backend and email_backend != 'django.core.mail.backends.dummy.EmailBackend'
-    email_configured = email_configured and bool(getattr(settings, 'EMAIL_FROM_ADDRESS', None))
+    email_configured = email_configured and settings.DEFAULT_FROM_EMAIL
 
     if request.method == 'POST':
         if 'send_test_email' in request.POST:

pykeg/web/kegweb/kegweb_test.py

@@ -178,7 +178,7 @@ def test_activation(self):
         self.assertIsNone(user.activation_key)
 
     @override_settings(EMAIL_BACKEND='django.core.mail.backends.locmem.EmailBackend')
-    @override_settings(EMAIL_FROM_ADDRESS='test-from@example')
+    @override_settings(DEFAULT_FROM_EMAIL='test-from@example')
     def test_registration(self):
         kbsite = models.KegbotSite.get()
         self.assertEqual('public', kbsite.privacy)
@@ -234,7 +234,7 @@ def test_registration(self):
                             status_code=200)
 
     @override_settings(EMAIL_BACKEND='django.core.mail.backends.locmem.EmailBackend')
-    @override_settings(EMAIL_FROM_ADDRESS='test-from@example')
+    @override_settings(DEFAULT_FROM_EMAIL='test-from@example')
     def test_registration_with_invite(self):
         kbsite = models.KegbotSite.get()
         kbsite.registration_mode = 'staff-invite-online'

pykeg/web/templates/registration/password_reset_subject.txt

@@ -0,0 +1,3 @@
+{% load i18n %}{% autoescape off %}
+{% blocktrans %}Password reset{% endblocktrans %}
+{% endautoescape %}