Merge pull request #2205 from asmacdo/dandi-admin-email-setting

Move admin email into Django setting

Author: jjnesbitt

.github/workflows/backend-ci.yml

@@ -59,4 +59,5 @@ jobs:
           DJANGO_DANDI_API_URL: http://localhost:8000
           DJANGO_DANDI_JUPYTERHUB_URL: https://hub.dandiarchive.org/
           DJANGO_DANDI_DEV_EMAIL: test@example.com
+          DJANGO_DANDI_ADMIN_EMAIL: test-admin@example.com
           DANDI_ALLOW_LOCALHOST_URLS: 1

.github/workflows/frontend-ci.yml

@@ -67,6 +67,7 @@ jobs:
       DJANGO_DANDI_API_URL: http://localhost:8000
       DJANGO_DANDI_JUPYTERHUB_URL: https://hub.dandiarchive.org/
       DJANGO_DANDI_DEV_EMAIL: test@example.com
+      DJANGO_DANDI_ADMIN_EMAIL: test-admin@example.com
       DANDI_ALLOW_LOCALHOST_URLS: 1
 
       # Web client env vars
@@ -179,6 +180,7 @@ jobs:
       DJANGO_DANDI_API_URL: http://localhost:8000
       DJANGO_DANDI_JUPYTERHUB_URL: https://hub.dandiarchive.org/
       DJANGO_DANDI_DEV_EMAIL: test@example.com
+      DJANGO_DANDI_ADMIN_EMAIL: test-admin@example.com
       DANDI_ALLOW_LOCALHOST_URLS: 1
 
       # Web client env vars

dandiapi/api/mail.py

@@ -25,9 +25,6 @@
     'dandi_web_app_url': settings.DANDI_WEB_APP_URL,
 }
 
-# TODO: turn this into a Django setting
-ADMIN_EMAIL = 'info@dandiarchive.org'
-
 
 def user_greeting_name(user: User, socialaccount: SocialAccount = None) -> str:
     """Return a suitable name to greet the user with in an email."""
@@ -105,7 +102,7 @@ def build_registered_message(user: User, socialaccount: SocialAccount):
             'api/mail/registered_message.txt',
             {'greeting_name': user_greeting_name(user, socialaccount)},
         ),
-        to=[ADMIN_EMAIL, user.email],
+        to=[settings.DANDI_ADMIN_EMAIL, user.email],
     )
 
 
@@ -125,7 +122,7 @@ def build_new_user_messsage(user: User, socialaccount: SocialAccount = None):
     return build_message(
         subject=f'DANDI: Review new user: {user.username}',
         message=render_to_string('api/mail/new_user_message.txt', render_context),
-        to=[ADMIN_EMAIL],
+        to=[settings.DANDI_ADMIN_EMAIL],
     )
 
 
@@ -146,7 +143,7 @@ def build_approved_user_message(user: User, socialaccount: SocialAccount = None)
                 'greeting_name': user_greeting_name(user, socialaccount),
             },
         ),
-        to=[ADMIN_EMAIL, user.email],
+        to=[settings.DANDI_ADMIN_EMAIL, user.email],
     )
 
 
@@ -167,7 +164,7 @@ def build_rejected_user_message(user: User, socialaccount: SocialAccount = None)
                 'rejection_reason': user.metadata.rejection_reason,
             },
         ),
-        to=[ADMIN_EMAIL, user.email],
+        to=[settings.DANDI_ADMIN_EMAIL, user.email],
     )
 
 
@@ -183,12 +180,12 @@ def build_pending_users_message(users: Iterable[User]):
     return build_message(
         subject='DANDI: new user registrations to review',
         message=render_to_string('api/mail/pending_users_message.txt', render_context),
-        to=[ADMIN_EMAIL],
+        to=[settings.DANDI_ADMIN_EMAIL],
     )
 
 
 def send_pending_users_message(users: Iterable[User]):
-    logger.info('Sending pending users message to admins at %s', ADMIN_EMAIL)
+    logger.info('Sending pending users message to admins at %s', settings.DANDI_ADMIN_EMAIL)
     messages = [build_pending_users_message(users)]
     with mail.get_connection() as connection:
         connection.send_messages(messages)
@@ -233,7 +230,7 @@ def build_dandiset_unembargo_failed_message(dandiset: Dandiset):
         html_message=html_message,
         to=[owner.email for owner in get_dandiset_owners(dandiset)],
         bcc=[settings.DANDI_DEV_EMAIL],
-        reply_to=[ADMIN_EMAIL],
+        reply_to=[settings.DANDI_ADMIN_EMAIL],
     )
 
 

dandiapi/api/tests/test_users.py

@@ -3,12 +3,12 @@
 import json
 from typing import TYPE_CHECKING, Any
 
+from django.conf import settings
 from django.urls.base import reverse
 import pytest
 from pytest_django.asserts import assertContains
 from rest_framework.exceptions import ErrorDetail
 
-from dandiapi.api.mail import ADMIN_EMAIL
 from dandiapi.api.models import UserMetadata
 from dandiapi.api.views.auth import COLLECT_USER_NAME_QUESTIONS, NEW_USER_QUESTIONS, QUESTIONS
 from dandiapi.api.views.users import user_to_dict
@@ -49,13 +49,13 @@ def test_user_registration_email_content(
 
     email = mailoutbox[0]
     assert email.subject == f'DANDI: New user registered: {user.email}'
-    assert email.to == [ADMIN_EMAIL, user.email]
+    assert email.to == [settings.DANDI_ADMIN_EMAIL, user.email]
     assert '<p>' not in email.body
     assert all(len(_) < 100 for _ in email.body.splitlines())
 
     email = mailoutbox[1]
     assert email.subject == f'DANDI: Review new user: {user.username}'
-    assert email.to == [ADMIN_EMAIL]
+    assert email.to == [settings.DANDI_ADMIN_EMAIL]
     assert '<p>' not in email.body
     assert all(len(_) < 100 for _ in email.body.splitlines())
 

dandiapi/settings.py

@@ -109,6 +109,7 @@ def mutate_configuration(configuration: type[ComposedConfiguration]):
     DANDI_API_URL = values.URLValue(environ_required=True)
     DANDI_JUPYTERHUB_URL = values.URLValue(environ_required=True)
     DANDI_DEV_EMAIL = values.EmailValue(environ_required=True)
+    DANDI_ADMIN_EMAIL = values.EmailValue(environ_required=True)
 
     DANDI_VALIDATION_JOB_INTERVAL = values.IntegerValue(environ=True, default=60)
 

dev/.env.docker-compose

@@ -12,5 +12,6 @@ DJANGO_DANDI_DANDISETS_EMBARGO_LOG_BUCKET_NAME=dandiapi-embargo-dandisets-logs
 DJANGO_DANDI_WEB_APP_URL=http://localhost:8085
 DJANGO_DANDI_API_URL=http://localhost:8000
 DJANGO_DANDI_JUPYTERHUB_URL=https://hub.dandiarchive.org/
+DJANGO_DANDI_ADMIN_EMAIL="admin@test.mail"
 DJANGO_DANDI_DEV_EMAIL=test@example.com
 DANDI_ALLOW_LOCALHOST_URLS=1

dev/.env.docker-compose-native

@@ -12,5 +12,6 @@ DJANGO_DANDI_DANDISETS_EMBARGO_LOG_BUCKET_NAME=dandiapi-embargo-dandisets-logs
 DJANGO_DANDI_WEB_APP_URL=http://localhost:8085
 DJANGO_DANDI_API_URL=http://localhost:8000
 DJANGO_DANDI_JUPYTERHUB_URL=https://hub.dandiarchive.org/
+DJANGO_DANDI_ADMIN_EMAIL="admin@test.mail"
 DJANGO_DANDI_DEV_EMAIL=test@example.com
 DANDI_ALLOW_LOCALHOST_URLS=1

tox.ini

@@ -46,6 +46,7 @@ passenv =
     DJANGO_DANDI_JUPYTERHUB_URL
     DJANGO_DANDI_DEV_EMAIL
     DJANGO_DANDI_LOG_LEVEL
+    DJANGO_DANDI_ADMIN_EMAIL
     DANDI_ALLOW_LOCALHOST_URLS
 extras =
     dev
@@ -67,6 +68,7 @@ passenv =
     DJANGO_DANDI_API_URL
     DJANGO_DANDI_JUPYTERHUB_URL
     DJANGO_DANDI_DEV_EMAIL
+    DJANGO_DANDI_ADMIN_EMAIL
     DJANGO_DANDI_LOG_LEVEL
 extras =
     dev