codeforlife-portal 8.9.1__py2.py3-none-any.whl → 8.9.3__py2.py3-none-any.whl

{codeforlife_portal-8.9.1.dist-info → codeforlife_portal-8.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeforlife-portal
-Version: 8.9.1
+Version: 8.9.3
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
@@ -14,7 +14,7 @@ Requires-Dist: botocore==1.36.26; python_version >= "3.8"
 Requires-Dist: celery[sqs]==5.4.0; python_version >= "3.8"
 Requires-Dist: certifi==2025.8.3; python_version >= "3.7"
 Requires-Dist: cffi==1.17.1; platform_python_implementation != "PyPy"
-Requires-Dist: cfl-common==8.9.1
+Requires-Dist: cfl-common==8.9.3
 Requires-Dist: charset-normalizer==3.4.3; python_version >= "3.7"
 Requires-Dist: click==8.2.1; python_version >= "3.10"
 Requires-Dist: click-didyoumean==0.3.1; python_full_version >= "3.6.2"
@@ -88,7 +88,7 @@ Requires-Dist: attrs==25.3.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: black==25.1.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: certifi==2025.8.3; python_version >= "3.7" and extra == "dev"
 Requires-Dist: cffi==1.17.1; platform_python_implementation != "PyPy" and extra == "dev"
-Requires-Dist: cfl-common==8.9.1; extra == "dev"
+Requires-Dist: cfl-common==8.9.3; extra == "dev"
 Requires-Dist: charset-normalizer==3.4.3; python_version >= "3.7" and extra == "dev"
 Requires-Dist: click==8.2.1; python_version >= "3.10" and extra == "dev"
 Requires-Dist: coverage[toml]==7.10.3; python_version >= "3.9" and extra == "dev"

{codeforlife_portal-8.9.1.dist-info → codeforlife_portal-8.9.3.dist-info}/RECORD

@@ -88,7 +88,7 @@ cfl_common/common/tests/utils/organisation.py,sha256=vNgKFtU3VPcWRnZfh82yCS90PLA
 cfl_common/common/tests/utils/student.py,sha256=PLd980iSlxmMoB8J3C2pVjNC5xHdVxfAkJXzhv_dRhg,3814
 cfl_common/common/tests/utils/teacher.py,sha256=KQ_NAl4yQqiX_zwcULQjkovc29JPhnkLR5Nk3Ljzbpg,2661
 cfl_common/common/tests/utils/user.py,sha256=NvLzZLVP4jy5Hn1iztOYF_BTQ9WsbSmuWMEzGzhAsRU,919
-codeforlife_portal-8.9.1.dist-info/licenses/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-8.9.3.dist-info/licenses/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
 deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deploy/captcha.py,sha256=MbOBuGnbT_SOIltSjP1XMOLrfo1DldCilaVAEim0vM4,23
 deploy/views.py,sha256=7mY2zNPkaBFrlWGByJHp2zFqHIHSMc0YArjE_sFWMMU,131
@@ -100,7 +100,7 @@ deploy/middleware/maintenance.py,sha256=JhlQD7FowzxnRxk1_uGXYRQ2Aas6v3C9BRxYgN1H
 deploy/middleware/screentime_warning.py,sha256=-YmaOn9_RQwTU8C6VxDLWct_0G3Y5oHjAv9AvKZSvIw,1152
 deploy/middleware/security.py,sha256=LOZ-OUFo2dVhbRzI_KdSCMh4TItcJhhqzZg5zNAH-6Q,870
 deploy/middleware/session_timeout.py,sha256=Vfl6_9d8KwPsWRvCIcpBm7kWjgvHC8I7exJOejbyI4k,1023
-deploy/middleware/tmp_basic_auth.py,sha256=FmPw8XVovt7iS7iLxZAWSejWLHzzmjmA-SC8IESohEM,1435
+deploy/middleware/tmp_basic_auth.py,sha256=LbKar4nCrknaFBqu2YawNef080H7SGNtLFQNlb1T0v8,1478
 deploy/static/apple-touch-icon-120x120.png,sha256=7GwelKO6CNbvjJJ1nqMvDGkPoQWqYomMKKP5EB5gmfM,24583
 deploy/static/apple-touch-icon-152x152.png,sha256=V57OGP0VeeKHen_iYVa72sHe_rEaMAJzU1FAiHWWBwY,36276
 deploy/static/apple-touch-icon-180x180.png,sha256=OIm3wwx0aL8fh1EIlMCKp2vVNpsuY-NDxV1QR73bf1g,47948
@@ -110,10 +110,10 @@ deploy/static/robots.txt,sha256=5cS4RITuQhbpNzvpk4AyDCXdlIBfmfCoBYRvCHY2VT8,24
 deploy/templates/deploy/csrf_failure.html,sha256=-pBRPn4Y7nUdYHGpTHCokT9Boi-isuwuivF8V2K1SgM,412
 example_project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 example_project/portal_test_settings.py,sha256=_6EDMwnYH2yCukgiop0sobqShbB8tivO9hcjZUYReec,7909
-example_project/settings.py,sha256=IsicdosIyB_3K2sv60bQvhAm6qm5fYWYut7oWTDZ778,6214
+example_project/settings.py,sha256=DQkHGjS-NYIPTCOnCD7QBeV7rxTNdIGqdC-qfTuA5qU,6278
 example_project/urls.py,sha256=FUTzHPlUS1O5kqMHjL5V4L552N2ln7uTDXcw9wjKUto,422
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=qbri2C4n2eoGzq_GLHEbyjEIx6WIa1m6AniM3pGkLlo,22
+portal/__init__.py,sha256=9SXo2Dhr8Z7Wri7UenCTy16UqpFTNxM9RP1tJ5moiYk,22
 portal/admin.py,sha256=RKJizTF6dPJKmGPZw7nZUM0X8jkiTjgyKhLQxtvHJ0I,6148
 portal/app_settings.py,sha256=8P3r0ArkOzL_iVjoaLIHsNWG4uP1tT2z1kCUHPhAZ9s,714
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -636,7 +636,7 @@ portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 portal/views/two_factor/core.py,sha256=Lk32z2SN2Pg0rRkK-N-LXMvXC1kKKsH3l692kiSDQ4E,964
 portal/views/two_factor/form.py,sha256=lnHNKI-BMlpncTuW3zUzjPaJJNuEra2I_nOam0eOKFY,257
 portal/views/two_factor/profile.py,sha256=SHSg_xHccE5PtD-OfuOkYhREYz_er4bj5ro1RjJ88Yw,393
-codeforlife_portal-8.9.1.dist-info/METADATA,sha256=pgmwPhBOVCQu448cW8Xpzhjyz6AJGlHrQaLQpfFrgCg,14175
-codeforlife_portal-8.9.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-codeforlife_portal-8.9.1.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-8.9.1.dist-info/RECORD,,
+codeforlife_portal-8.9.3.dist-info/METADATA,sha256=OccJp43B1Rdp-0oApIRAYimwsUF0OAQJozE8N8-d94E,14175
+codeforlife_portal-8.9.3.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+codeforlife_portal-8.9.3.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-8.9.3.dist-info/RECORD,,

deploy/middleware/tmp_basic_auth.py

@@ -17,21 +17,21 @@ class TempBasicAuthMiddleware:
     def __call__(self, request):
         # Code to be executed on each request.
         url = request.build_absolute_uri()
-        temp_domain = "https://www.code4life.education"
+        token_in_url = f"/{TMP_AUTH_TOKEN}"
 
         # If the user inputs the token in the URL correctly, set a cookie to the token's value
-        if url == f"{temp_domain}/{TMP_AUTH_TOKEN}":
-            response = redirect(temp_domain)
+        if url.endswith(token_in_url):
+            response = redirect(url.replace(token_in_url, ""))
             response.set_cookie(
                 key="TMP_AUTH_TOKEN",
                 value=TMP_AUTH_TOKEN,
             )
             return response
-        # For any other request in the code4life domain, check that a cookie with the token's value exists.
-        # Redirect to the main site if it doesn't.
+        # For any other request in the domain (except the health check), check that a cookie with the token's value
+        # exists. Redirect to the main site if it doesn't.
         else:
             value = request.COOKIES.get("TMP_AUTH_TOKEN")
-            if value is not None and value == TMP_AUTH_TOKEN:
+            if (value is not None and value == TMP_AUTH_TOKEN) or url.endswith("/health-check"):
                 return self.get_response(request)
 
         return redirect("https://www.codeforlife.education")

example_project/settings.py

@@ -120,6 +120,7 @@ MIDDLEWARE = [
     "django.middleware.locale.LocaleMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
+    "deploy.middleware.tmp_basic_auth.TempBasicAuthMiddleware",
     "deploy.middleware.security.CustomSecurityMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",

portal/__init__.py

@@ -1 +1 @@
-__version__ = "8.9.1"
+__version__ = "8.9.3"