aboutcode-org · tdruez · Apr 19, 2024 · Apr 19, 2024
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -37,6 +37,9 @@ Release notes
 - Add a vulnerability link to the VulnerableCode app in the Vulnerability tab.
   https://github.com/nexB/dejacode/issues/4
 
+- Add a DEJACODE_SUPPORT_EMAIL setting for support email address customization.
+  https://github.com/nexB/dejacode/issues/76
+
 ### Version 5.0.1
 
 - Improve the stability of the "Check for new Package versions" feature.

diff --git a/dejacode/settings.py b/dejacode/settings.py
@@ -370,6 +370,9 @@ def gettext_noop(s):
 DEFAULT_FROM_EMAIL = env.str("DEFAULT_FROM_EMAIL", default="")
 EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS", default=True)
 
+# An email address displayed in UI for users to reach the support team.
+DEJACODE_SUPPORT_EMAIL = env.str("DEJACODE_SUPPORT_EMAIL", default="")
+
 # Enable this setting to display a "Tools" section in the navbar including
 # links to the "Requests" and "Reporting" views.
 SHOW_TOOLS_IN_NAV = env.bool("SHOW_TOOLS_IN_NAV", default=True)

diff --git a/dje/context_processors.py b/dje/context_processors.py
@@ -15,6 +15,7 @@ def dejacode_context(request):
     """Return all the DejaCode specific context variables."""
     return {
         "DEJACODE_VERSION": DEJACODE_VERSION,
+        "DEJACODE_SUPPORT_EMAIL": settings.DEJACODE_SUPPORT_EMAIL,
         "FAVICON_HREF": settings.FAVICON_HREF,
         "SITE_TITLE": settings.SITE_TITLE,
         "HEADER_TEMPLATE": settings.HEADER_TEMPLATE,

diff --git a/dje/templates/axes_lockout.html b/dje/templates/axes_lockout.html
@@ -6,6 +6,8 @@
   {% include 'includes/header_title.html' with title="Account locked" %}
   <p>
     Your account is locked following too many failed login attempts.<br>
-    Contact the DejaCode support team at <a href="mailto:support@dejacode.com">support@dejacode.com</a> to unlock your account.
+    {% if DEJACODE_SUPPORT_EMAIL %}
+      Contact the DejaCode support team at <a href="mailto:{{ DEJACODE_SUPPORT_EMAIL }}">{{ DEJACODE_SUPPORT_EMAIL }}</a> to unlock your account.
+    {% endif %}
   </p>
 {% endblock %}
diff --git a/dje/templates/django_registration/activation_email_body.txt b/dje/templates/django_registration/activation_email_body.txt
@@ -9,7 +9,10 @@ https://{{ site }}{% url 'django_registration_activate' activation_key %}
 
 If you cannot click on the link, please copy it to your browser.
 
-Please note that you have {{ expiration_days }} days to activate your account. After this delay, please contact us at support@dejacode.com and we will send you a new activation link.
+Please note that you have {{ expiration_days }} days to activate your account.
+{% if DEJACODE_SUPPORT_EMAIL %}
+  After this delay, please contact us at {{ DEJACODE_SUPPORT_EMAIL }} and we will send you a new activation link.
+{% endif %}
 
 Thank You,
 

diff --git a/dje/templates/django_registration/activation_failed.html b/dje/templates/django_registration/activation_failed.html
@@ -10,7 +10,10 @@
   {% include 'includes/header_title.html' with pretitle='Account' title='Error during your account activation' %}
   <p>
     {{ activation_error.message }}
-    <br><br>
-    If the problem persists, send us an email at <a href="mailto:support@dejacode.com">support@dejacode.com</a>
   </p>
+  {% if DEJACODE_SUPPORT_EMAIL %}
+    <p>
+      If the problem persists, send us an email at <a href="mailto:{{ DEJACODE_SUPPORT_EMAIL }}">{{ DEJACODE_SUPPORT_EMAIL }}</a>
+    </p>
+  {% endif %}
 {% endblock %}
diff --git a/dje/templates/django_registration/registration_closed.html b/dje/templates/django_registration/registration_closed.html
@@ -7,7 +7,9 @@
 
 {% block content %}
   {% include 'includes/header_title.html' with pretitle='Account' title='The DejaCode registration is currently closed' %}
-  <p>
-    Send us an email at <a href="mailto:support@dejacode.com">support@dejacode.com</a> for any question.
-  </p>
+  {% if DEJACODE_SUPPORT_EMAIL %}
+    <p>
+      Send us an email at <a href="mailto:{{ DEJACODE_SUPPORT_EMAIL }}">{{ DEJACODE_SUPPORT_EMAIL }}</a> for any question.
+    </p>
+  {% endif %}
 {% endblock %}
diff --git a/dje/templates/registration/password_reset_form.html b/dje/templates/registration/password_reset_form.html
@@ -24,9 +24,11 @@
           {% endif %}
         </div>
         <button class="btn btn-outline-dark" type="submit">{% trans 'Change my password' %}</button>
-        <p class="mt-4">
-          Has your e-mail address changed? If you no longer use the e-mail address associated with your DejaCode account, you may contact our <a href="mailto:support@dejacode.com">customer service</a> for help restoring access to your account.
-        </p>
+        {% if DEJACODE_SUPPORT_EMAIL %}
+          <p class="mt-4">
+            Has your e-mail address changed? If you no longer use the e-mail address associated with your DejaCode account, you may contact our <a href="mailto:{{ DEJACODE_SUPPORT_EMAIL }}">customer service</a> for help restoring access to your account.
+          </p>
+        {% endif %}
       </div>
     </div>
   </form>

diff --git a/docs/application-settings.rst b/docs/application-settings.rst
@@ -98,6 +98,17 @@ notifications.
 
     SITE_URL=http://www.yourdomain.com/
 
+DEJACODE_SUPPORT_EMAIL
+----------------------
+
+An optional email address to reach the support team of this instance.
+When defined, it will be displayed in various views and emails related to account
+registration, activation, and password reset.
+
+.. code-block:: python
+
+    DEJACODE_SUPPORT_EMAIL=support@dejacode.com
+
 ANONYMOUS_USERS_DATASPACE
 -------------------------