change domain_url setting to default to SITE_DOMAIN

coldfront/config/core.py

@@ -12,6 +12,7 @@
 CENTER_HELP_URL = ENV.str('CENTER_HELP_URL', default='{% url help-page %}')
 CENTER_PROJECT_RENEWAL_HELP_URL = ENV.str('CENTER_PROJECT_RENEWAL_HELP_URL', default='')
 CENTER_BASE_URL = ENV.str('CENTER_BASE_URL', default='')
+SITE_DOMAIN = ENV.str('SITE_DOMAIN', default='')
 
 #------------------------------------------------------------------------------
 # Enable Project Review

coldfront/core/allocation/views.py

@@ -68,7 +68,7 @@
 from coldfront.core.project.models import (Project, ProjectPermission,
                                            ProjectUserStatusChoice)
 from coldfront.core.resource.models import Resource
-from coldfront.core.utils.common import get_domain_url, import_from_settings
+from coldfront.core.utils.common import import_from_settings
 from coldfront.core.utils.mail import send_allocation_admin_email, send_allocation_customer_email
 
 
@@ -393,8 +393,7 @@ def post(self, request, *args, **kwargs):
                 )
 
             send_allocation_customer_email(
-                allocation_obj, 'Allocation Activated',
-                'email/allocation_activated.txt', domain_url=get_domain_url(self.request)
+                allocation_obj, 'Allocation Activated', 'email/allocation_activated.txt'
             )
             if action == 'approve':
                 messages.success(request, 'Allocation Activated!')
@@ -425,7 +424,6 @@ def post(self, request, *args, **kwargs):
                     allocation_obj,
                     f'Allocation {allocation_obj.status.name}',
                     f'email/allocation_{allocation_obj.status.name.lower()}.txt',
-                    domain_url=get_domain_url(self.request),
                 )
                 messages.success(request, f'Allocation {allocation_obj.status.name}!')
             else:
@@ -748,7 +746,6 @@ def form_valid(self, form):
             allocation_obj,
             'New Allocation Request',
             'email/new_allocation_request.txt',
-            domain_url=get_domain_url(self.request),
             url_path=reverse('allocation-detail', kwargs={'pk': allocation_obj.pk}),
             other_vars=other_vars,
         )
@@ -1420,7 +1417,6 @@ def post(self, request, *args, **kwargs):
                 allocation_obj,
                 'Allocation Renewed',
                 'email/allocation_renewed.txt',
-                domain_url=get_domain_url(self.request),
             )
 
             messages.success(request, 'Allocation renewed successfully')
@@ -1946,7 +1942,6 @@ def post(self, request, *args, **kwargs):
                 alloc_change_obj.allocation,
                 'Allocation Change Denied',
                 'email/allocation_change_denied.txt',
-                domain_url=get_domain_url(self.request),
             )
             save_and_redirect = True
 
@@ -2056,7 +2051,6 @@ def post(self, request, *args, **kwargs):
                 alloc_change_obj.allocation,
                 'Allocation Change Approved',
                 'email/allocation_change_approved.txt',
-                domain_url=get_domain_url(self.request),
             )
 
             message = make_allocation_change_message(alloc_change_obj, 'APPROVED')
@@ -2293,7 +2287,6 @@ def post(self, request, *args, **kwargs):
                 'allocation-change-detail',
                 kwargs={'pk': allocation_change_request_obj.pk},
             ),
-            domain_url=get_domain_url(self.request),
             other_vars=email_vars,
         )
         return HttpResponseRedirect(reverse('allocation-detail', kwargs={'pk': pk}))

coldfront/core/utils/mail.py

@@ -22,6 +22,7 @@
 EMAIL_SIGNATURE = import_from_settings('EMAIL_SIGNATURE')
 EMAIL_CENTER_NAME = import_from_settings('CENTER_NAME')
 CENTER_BASE_URL = import_from_settings('CENTER_BASE_URL')
+SITE_DOMAIN = import_from_settings('SITE_DOMAIN')
 
 
 def send_email(subject, body, sender, receiver_list, cc=[]):
@@ -80,7 +81,7 @@ def email_template_context(extra_context=None):
 
 
 def build_link(url_path, domain_url=''):
-    domain_url = domain_url or CENTER_BASE_URL
+    domain_url = domain_url or SITE_DOMAIN
     return f'{domain_url}{url_path}'
 
 

coldfront/core/utils/tests.py

@@ -10,7 +10,6 @@
     email_template_context,
     send_allocation_admin_email,
     send_allocation_customer_email,
-    CENTER_BASE_URL,
     build_link,
     logger
 )
@@ -21,6 +20,7 @@
 @patch('coldfront.core.utils.mail.EMAIL_SENDER', '[email protected]')
 @patch('coldfront.core.utils.mail.EMAIL_TICKET_SYSTEM_ADDRESS', '[email protected]')
 @patch('coldfront.core.utils.mail.EMAIL_CENTER_NAME', 'HPC Center')
+@patch('coldfront.core.utils.mail.SITE_DOMAIN', 'sitedomain.org')
 @patch('coldfront.core.utils.mail.EMAIL_SIGNATURE', 'HPC Center Team')
 # @patch('coldfront.config.base.INSTALLED_APPS', 'coldfront.plugins')
 class EmailFunctionsTestCase(TestCase):
@@ -109,7 +109,7 @@ def test_build_link(self):
         domain_url = 'https://example.com'
         expected_url = f'{domain_url}{url_path}'
         self.assertEqual(build_link(url_path, domain_url), expected_url)
-        self.assertEqual(build_link(url_path), f'{CENTER_BASE_URL}{url_path}')
+        self.assertEqual(build_link(url_path), f'sitedomain.org{url_path}')
 
     def test_allocation_reaching_capacity_operations(self):
         allocation_obj = MagicMock()