Merge pull request #4603 from kobotoolbox/2-023-21-domain-transfer

Add support for old KoBoCAT domain name

kobo/settings/base.py

@@ -649,6 +649,12 @@ def __init__(self, *args, **kwargs):
 
 # replace this with the pointer to the kobocat server, if it exists
 KOBOCAT_URL = os.environ.get('KOBOCAT_URL', 'http://kobocat')
+
+# In case server must serve two KoBoCAT domain names (e.g. during a
+# domain name transfer), `settings.KOBOCAT_OLD_URL` adds support for
+# the domain name.
+KOBOCAT_OLD_URL = os.environ.get('KOBOCAT_OLD_URL')
+
 KOBOCAT_INTERNAL_URL = os.environ.get('KOBOCAT_INTERNAL_URL',
                                       'http://kobocat')
 

kpi/deployment_backends/kc_access/utils.py

@@ -12,7 +12,6 @@
 from django.db.models import Model
 from kobo_service_account.utils import get_request_headers
 from rest_framework.authtoken.models import Token
-from rest_framework import status
 
 from kpi.exceptions import KobocatProfileException
 from kpi.utils.log import logging

kpi/deployment_backends/kobocat_backend.py

@@ -609,8 +609,13 @@ def external_to_internal_url(url):
         `settings.KOBOCAT_INTERNAL_URL` when it appears at the beginning of
         `url`
         """
+        kobocat_url = settings.KOBOCAT_URL
+        # If old domain name is detected, use it for search&replace below
+        if settings.KOBOCAT_OLD_URL and settings.KOBOCAT_OLD_URL in url:
+            kobocat_url = settings.KOBOCAT_OLD_URL
+
         return re.sub(
-            pattern='^{}'.format(re.escape(settings.KOBOCAT_URL)),
+            pattern='^{}'.format(re.escape(kobocat_url)),
             repl=settings.KOBOCAT_INTERNAL_URL,
             string=url
         )