cfl-common 8.9.8__py3-none-any.whl → 8.9.10__py3-none-any.whl

{cfl_common-8.9.8.dist-info → cfl_common-8.9.10.dist-info}/METADATA

@@ -1,28 +1,28 @@
 Metadata-Version: 2.4
 Name: cfl-common
-Version: 8.9.8
+Version: 8.9.10
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Dist: asgiref==3.10.0; python_version >= "3.9"
-Requires-Dist: certifi==2025.10.5; python_version >= "3.7"
+Requires-Dist: asgiref==3.11.0; python_version >= "3.9"
+Requires-Dist: certifi==2025.11.12; python_version >= "3.7"
 Requires-Dist: cffi==2.0.0; platform_python_implementation != "PyPy"
 Requires-Dist: charset-normalizer==3.4.4; python_version >= "3.7"
 Requires-Dist: cryptography==44.0.1; python_version >= "3.7" and python_full_version not in "3.9.0, 3.9.1"
 Requires-Dist: diff-match-patch==20241021; python_version >= "3.7"
-Requires-Dist: django==5.1.14; python_version >= "3.10"
+Requires-Dist: django==5.1.15; python_version >= "3.10"
 Requires-Dist: django-countries==7.6.1
 Requires-Dist: django-csp==3.8
 Requires-Dist: django-formtools==2.5.1; python_version >= "3.8"
 Requires-Dist: django-import-export==4.2.0; python_version >= "3.9"
 Requires-Dist: django-otp==1.6.3; python_version >= "3.7"
-Requires-Dist: django-phonenumber-field==8.3.0; python_version >= "3.9"
+Requires-Dist: django-phonenumber-field==8.4.0; python_version >= "3.10"
 Requires-Dist: django-pipeline==4.0.0; python_version >= "3.9"
 Requires-Dist: django-two-factor-auth==1.17.0; python_version >= "3.8"
 Requires-Dist: djangorestframework==3.16.0; python_version >= "3.9"
 Requires-Dist: idna==3.11; python_version >= "3.8"
 Requires-Dist: libsass==0.23.0; python_version >= "3.8"
 Requires-Dist: more-itertools==8.7.0; python_version >= "3.5"
-Requires-Dist: numpy==2.3.4; python_version >= "3.11"
+Requires-Dist: numpy==2.3.5; python_version >= "3.11"
 Requires-Dist: pandas==2.3.3; python_version >= "3.9"
 Requires-Dist: pgeocode==0.4.0; python_version >= "3.8"
 Requires-Dist: pycparser==2.23; implementation_name != "PyPy"
@@ -34,7 +34,7 @@ Requires-Dist: qrcode==7.4.2; python_version >= "3.7"
 Requires-Dist: requests==2.32.5; python_version >= "3.9"
 Requires-Dist: setuptools==80.9.0; python_version >= "3.9"
 Requires-Dist: six==1.17.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
-Requires-Dist: sqlparse==0.5.3; python_version >= "3.8"
+Requires-Dist: sqlparse==0.5.4; python_version >= "3.8"
 Requires-Dist: tablib==3.7.0; python_version >= "3.9"
 Requires-Dist: typing-extensions==4.15.0; python_version >= "3.9"
 Requires-Dist: tzdata==2025.2; python_version >= "2"

{cfl_common-8.9.8.dist-info → cfl_common-8.9.10.dist-info}/RECORD

@@ -1,5 +1,5 @@
 common/__init__.py,sha256=XlncBOpKp_gekbKH7Y_i6yu1qy5tJc3Y8sn8cDy-Vgk,48
-common/app_settings.py,sha256=TCUlvuVH4Y3d8EITuWyvY4sjxnA7gJnAZyTd8yfV3zE,2592
+common/app_settings.py,sha256=br31aXMTs48oyxkvGmCSoGb94Ir8imONuD2uNO3k7-k,2763
 common/apps.py,sha256=49UXZ3bSkFKvIEOL4zM7y1sAhccQJyRtsoOg5XVd_8Y,129
 common/context_processors.py,sha256=X0iuX5qu9kMWa7q8osE9CJ2LgM7pPOYQFGdjm8X3rk0,236
 common/csp_config.py,sha256=saeg9LbRr5xw7NDJPlt6fqi8Zz0vI8Rpc4VCS6oJNe8,2976
@@ -12,7 +12,7 @@ common/fixtures/aimmo_characters2.json,sha256=R-23mbjLrvpH4G9khXKcu7PTDK86xf9eHf
 common/fixtures/aimmo_characters3.json,sha256=7Pv_6DFastPzmM86sPx6D60Y8Biq84GLL5pWz5NGSUA,1392
 common/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 common/helpers/data_migration_loader.py,sha256=_BhS5lPmhcuVUbryBmJytlWdHyT02KYyxPkHar32mOE,1748
-common/helpers/emails.py,sha256=KyXIudPRgetggOnlNUohArF7cPBuazQI2V6dtMfKnrM,12368
+common/helpers/emails.py,sha256=wBgwTsOQSDIEFGZ3SS4N5XZO9nlwuCVzsjvgH4NNUkc,12060
 common/helpers/generators.py,sha256=kTL5e91I8wgmjJ-mu4jr9vIacjccUZ5pZSAz5cUNhdM,1505
 common/helpers/organisation.py,sha256=e-JKumKoXrkMTzZPv0H4ViWL8vtCt7oXJjn_zZ1ec00,427
 common/migrations/0001_initial.py,sha256=Y2kt2xmdCbrmDXCgqmhXeacicNg26Zj7L7SANSsgAAI,9664
@@ -93,7 +93,7 @@ common/tests/utils/organisation.py,sha256=vNgKFtU3VPcWRnZfh82yCS90PLAK1XTYJNIxGw
 common/tests/utils/student.py,sha256=GYOyd2VH6QXjjLzjCh4hpT86U5si2URlJJWZwlCVLrU,3846
 common/tests/utils/teacher.py,sha256=KQ_NAl4yQqiX_zwcULQjkovc29JPhnkLR5Nk3Ljzbpg,2661
 common/tests/utils/user.py,sha256=NvLzZLVP4jy5Hn1iztOYF_BTQ9WsbSmuWMEzGzhAsRU,919
-cfl_common-8.9.8.dist-info/METADATA,sha256=0vM_ct55d3zgUDoraTlNIBzhUde1O8lgz5tVAPDvA1s,2495
-cfl_common-8.9.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cfl_common-8.9.8.dist-info/top_level.txt,sha256=LOtYx8KZTmnxM_zLK4rwrcI3PRc40Ihwp5rgaQ-ceaI,7
-cfl_common-8.9.8.dist-info/RECORD,,
+cfl_common-8.9.10.dist-info/METADATA,sha256=Q7HrgpK92rSQMX7wClCd_9qBtraYJiWsmSWvTJ-bYZ0,2498
+cfl_common-8.9.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cfl_common-8.9.10.dist-info/top_level.txt,sha256=LOtYx8KZTmnxM_zLK4rwrcI3PRc40Ihwp5rgaQ-ceaI,7
+cfl_common-8.9.10.dist-info/RECORD,,

common/app_settings.py

@@ -54,12 +54,15 @@ MODULE_NAME = getattr(settings, "MODULE_NAME", "local")
 COOKIE_MANAGEMENT_ENABLED = getattr(settings, "COOKIE_MANAGEMENT_ENABLED", True)
 
 
-def domain():
+def domain(request=None):
     """Returns the full domain depending on whether it's local, dev, staging or prod."""
+    if hasattr(settings, "SERVICE_BASE_URL"):
+        return getattr(settings, "SERVICE_BASE_URL")
+
     domain = "https://www.codeforlife.education"
 
     if MODULE_NAME == "local":
-        domain = "localhost:8000"
+        domain = f"http://{request.get_host()}" if request is not None else "localhost:8000"
     elif MODULE_NAME == "staging" or MODULE_NAME == "dev":
         domain = f"https://{MODULE_NAME}-dot-decent-digit-629.appspot.com"
 

common/helpers/emails.py

@@ -20,15 +20,9 @@ from django.utils import timezone
 from requests import delete, get, post, put
 from requests.exceptions import RequestException
 
-NOTIFICATION_EMAIL = (
-    "Code For Life Notification <" + app_settings.EMAIL_ADDRESS + ">"
-)
-VERIFICATION_EMAIL = (
-    "Code For Life Verification <" + app_settings.EMAIL_ADDRESS + ">"
-)
-PASSWORD_RESET_EMAIL = (
-    "Code For Life Password Reset <" + app_settings.EMAIL_ADDRESS + ">"
-)
+NOTIFICATION_EMAIL = "Code For Life Notification <" + app_settings.EMAIL_ADDRESS + ">"
+VERIFICATION_EMAIL = "Code For Life Verification <" + app_settings.EMAIL_ADDRESS + ">"
+PASSWORD_RESET_EMAIL = "Code For Life Password Reset <" + app_settings.EMAIL_ADDRESS + ">"
 INVITE_FROM = "Code For Life Invitation <" + app_settings.EMAIL_ADDRESS + ">"
 
 
@@ -52,9 +46,7 @@ def generate_token_for_email(email: str, new_email: str = ""):
             "email": email,
             "new_email": new_email,
             "email_verification_token": uuid4().hex[:30],
-            "expires": (
-                timezone.now() + datetime.timedelta(hours=1)
-            ).timestamp(),
+            "expires": (timezone.now() + datetime.timedelta(hours=1)).timestamp(),
         },
         settings.SECRET_KEY,
         algorithm="HS256",
@@ -87,9 +79,7 @@ def send_email(
     )
 
 
-def send_verification_email(
-    request, user, data, new_email=None, age=None, school=None
-):
+def send_verification_email(request, user, data, new_email=None, age=None, school=None):
     """
     Sends emails relating to email address verification.
 
@@ -119,7 +109,7 @@ def send_verification_email(
         if age is None:
             # if the user is a released student
             if hasattr(user, "new_student") and school is not None:
-                url = f"{request.build_absolute_uri(reverse('verify_email', kwargs={'token': verification}))}"
+                url = f"{app_settings.domain(request)}{reverse('verify_email', kwargs={'token': verification})}"
 
                 send_dotdigital_email(
                     campaign_ids["verify_released_student"],
@@ -130,7 +120,7 @@ def send_verification_email(
                     },
                 )
             else:
-                url = f"{request.build_absolute_uri(reverse('verify_email', kwargs={'token': verification}))}"
+                url = f"{app_settings.domain(request)}{reverse('verify_email', kwargs={'token': verification})}"
 
                 send_dotdigital_email(
                     campaign_ids["verify_new_user"],
@@ -149,7 +139,7 @@ def send_verification_email(
         # if the user is an independent student
         else:
             if age < 13:
-                url = f"{request.build_absolute_uri(reverse('verify_email', kwargs={'token': verification}))}"
+                url = f"{app_settings.domain(request)}{reverse('verify_email', kwargs={'token': verification})}"
                 send_dotdigital_email(
                     campaign_ids["verify_new_user_via_parent"],
                     [user.email],
@@ -159,7 +149,7 @@ def send_verification_email(
                     },
                 )
             else:
-                url = f"{request.build_absolute_uri(reverse('verify_email', kwargs={'token': verification}))}"
+                url = f"{app_settings.domain(request)}{reverse('verify_email', kwargs={'token': verification})}"
                 send_dotdigital_email(
                     campaign_ids["verify_new_user"],
                     [user.email],
@@ -177,7 +167,7 @@ def send_verification_email(
     # verifying change of email address.
     else:
         verification = generate_token(user, new_email)
-        url = f"{request.build_absolute_uri(reverse('verify_email', kwargs={'token': verification}))}"
+        url = f"{app_settings.domain(request)}{reverse('verify_email', kwargs={'token': verification})}"
         send_dotdigital_email(
             campaign_ids["email_change_verification"],
             [new_email],
@@ -194,9 +184,7 @@ def add_to_dotmailer(
 ):
     try:
         create_contact(first_name, last_name, email)
-        add_contact_to_address_book(
-            first_name, last_name, email, address_book_id, user_type
-        )
+        add_contact_to_address_book(first_name, last_name, email, address_book_id, user_type)
     except RequestException:
         return HttpResponse(status=404)
 
@@ -261,18 +249,12 @@ def add_contact_to_address_book(
     )
 
     if user_type is not None:
-        specific_address_book_url = (
-            app_settings.DOTMAILER_NO_ACCOUNT_ADDRESS_BOOK_URL
-        )
+        specific_address_book_url = app_settings.DOTMAILER_NO_ACCOUNT_ADDRESS_BOOK_URL
 
         if user_type == DotmailerUserType.TEACHER:
-            specific_address_book_url = (
-                app_settings.DOTMAILER_TEACHER_ADDRESS_BOOK_URL
-            )
+            specific_address_book_url = app_settings.DOTMAILER_TEACHER_ADDRESS_BOOK_URL
         elif user_type == DotmailerUserType.STUDENT:
-            specific_address_book_url = (
-                app_settings.DOTMAILER_STUDENT_ADDRESS_BOOK_URL
-            )
+            specific_address_book_url = app_settings.DOTMAILER_STUDENT_ADDRESS_BOOK_URL
 
         post(
             specific_address_book_url,
@@ -286,9 +268,7 @@ def delete_contact(email: str):
         user = get_dotmailer_user_by_email(email)
         user_id = user.get("id")
         if user_id:
-            url = app_settings.DOTMAILER_DELETE_USER_BY_ID_URL.replace(
-                "ID", str(user_id)
-            )
+            url = app_settings.DOTMAILER_DELETE_USER_BY_ID_URL.replace("ID", str(user_id))
             delete(
                 url,
                 auth=(
@@ -303,9 +283,7 @@ def delete_contact(email: str):
 def get_dotmailer_user_by_email(email):
     url = app_settings.DOTMAILER_GET_USER_BY_EMAIL_URL.replace("EMAIL", email)
 
-    response = get(
-        url, auth=(app_settings.DOTMAILER_USER, app_settings.DOTMAILER_PASSWORD)
-    )
+    response = get(url, auth=(app_settings.DOTMAILER_USER, app_settings.DOTMAILER_PASSWORD))
 
     return json.loads(response.content)
 
@@ -313,9 +291,7 @@ def get_dotmailer_user_by_email(email):
 def add_consent_record_to_dotmailer_user(user):
     consent_date_time = datetime.datetime.now().__str__()
 
-    url = app_settings.DOTMAILER_PUT_CONSENT_DATA_URL.replace(
-        "USER_ID", str(user["id"])
-    )
+    url = app_settings.DOTMAILER_PUT_CONSENT_DATA_URL.replace("USER_ID", str(user["id"]))
     body = {
         "contact": {
             "email": user["email"],
@@ -323,13 +299,7 @@ def add_consent_record_to_dotmailer_user(user):
             "emailType": user["emailType"],
             "dataFields": user["dataFields"],
         },
-        "consentFields": [
-            {
-                "fields": [
-                    {"key": "DATETIMECONSENTED", "value": consent_date_time}
-                ]
-            }
-        ],
+        "consentFields": [{"fields": [{"key": "DATETIMECONSENTED", "value": consent_date_time}]}],
     }
 
     put(