codeforlife-portal 8.8.0__py2.py3-none-any.whl → 8.8.2__py2.py3-none-any.whl

cfl_common/common/migrations/0058_userprofile_google_refresh_token_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.10 on 2025-08-12 12:51
+
+import common.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("common", "0057_teacher_teacher__is_admin"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="userprofile",
+            name="google_refresh_token",
+            field=common.models.EncryptedCharField(blank=True, max_length=1004, null=True),
+        ),
+        migrations.AddField(
+            model_name="userprofile",
+            name="google_sub",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]

cfl_common/common/models.py

@@ -3,6 +3,8 @@ import typing as t
 from datetime import timedelta
 from uuid import uuid4
 
+from cryptography.fernet import Fernet
+from django.conf import settings
 from django.contrib.auth.models import User
 from django.db import models
 from django.utils import timezone
@@ -13,6 +15,64 @@ if t.TYPE_CHECKING:
     from game.models import Worksheet
 
 
+class EncryptedCharField(models.CharField):
+    """
+    A custom CharField that encrypts data before saving and decrypts it when
+    retrieved.
+    """
+
+    _fernet = Fernet(settings.ENCRYPTION_KEY)
+    _prefix = "ENC:"
+
+    # pylint: disable-next=unused-argument
+    def from_db_value(self, value: t.Optional[str], expression, connection):
+        """
+        Converts a value as returned by the database to a Python object. It is
+        the reverse of get_prep_value().
+
+        https://docs.djangoproject.com/en/5.1/howto/custom-model-fields/#converting-values-to-python-objects
+        """
+        if isinstance(value, str):
+            return self.decrypt_value(value)
+        return value
+
+    def to_python(self, value: t.Optional[str]):
+        """
+        Converts the value into the correct Python object. It acts as the
+        reverse of value_to_string(), and is also called in clean().
+
+        https://docs.djangoproject.com/en/5.1/howto/custom-model-fields/#converting-values-to-python-objects
+        """
+        if isinstance(value, str):
+            return self.decrypt_value(value)
+        return value
+
+    def get_prep_value(self, value: t.Optional[str]):
+        """
+        'value' is the current value of the model's attribute, and the method
+        should return data in a format that has been prepared for use as a
+        parameter in a query.
+
+        https://docs.djangoproject.com/en/5.1/howto/custom-model-fields/#converting-python-objects-to-query-values
+        """
+        if isinstance(value, str):
+            return self.encrypt_value(value)
+        return value
+
+    def encrypt_value(self, value: str):
+        """Encrypt the value if it's not encrypted."""
+        if not value.startswith(self._prefix):
+            return self._prefix + self._fernet.encrypt(value.encode()).decode()
+        return value
+
+    def decrypt_value(self, value: str):
+        """Decrpyt the value if it's encrypted.."""
+        if value.startswith(self._prefix):
+            value = value[len(self._prefix) :]
+            return self._fernet.decrypt(value).decode()
+        return value
+
+
 class UserProfile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE)
 
@@ -32,6 +92,12 @@ class UserProfile(models.Model):
     username = models.CharField(max_length=200, null=True, blank=True)
     _username = models.BinaryField(null=True, blank=True)
 
+    # Google.
+    google_refresh_token = EncryptedCharField(
+        max_length=1000 + len(EncryptedCharField._prefix), null=True, blank=True
+    )
+    google_sub = models.CharField(max_length=255, null=True, blank=True)
+
     def __str__(self):
         return f"{self.user.first_name} {self.user.last_name}"
 
@@ -48,7 +114,9 @@ class SchoolModelManager(models.Manager):
 
 class School(models.Model):
     name = models.CharField(max_length=200, unique=True)
-    country = CountryField(blank_label="(select country)", null=True, blank=True)
+    country = CountryField(
+        blank_label="(select country)", null=True, blank=True
+    )
     # TODO: Create an Address model to house address details
     county = models.CharField(max_length=50, blank=True, null=True)
     creation_time = models.DateTimeField(default=timezone.now, null=True)
@@ -71,7 +139,11 @@ class School(models.Model):
 
     def admins(self):
         teachers = self.teacher_school.all()
-        return [teacher for teacher in teachers if teacher.is_admin] if teachers else None
+        return (
+            [teacher for teacher in teachers if teacher.is_admin]
+            if teachers
+            else None
+        )
 
     def anonymise(self):
         self.name = uuid4().hex
@@ -140,7 +212,10 @@ class Teacher(models.Model):
     def teaches(self, userprofile):
         if hasattr(userprofile, "student"):
             student = userprofile.student
-            return not student.is_independent() and student.class_field.teacher == self
+            return (
+                not student.is_independent()
+                and student.class_field.teacher == self
+            )
 
     def has_school(self):
         return self.school is not (None or "")
@@ -172,10 +247,14 @@ class SchoolTeacherInvitation(models.Model):
         null=True,
         on_delete=models.SET_NULL,
     )
-    invited_teacher_first_name = models.CharField(max_length=150)  # Same as User model
+    invited_teacher_first_name = models.CharField(
+        max_length=150
+    )  # Same as User model
     # TODO: Make not nullable once data has been transferred
     _invited_teacher_first_name = models.BinaryField(null=True, blank=True)
-    invited_teacher_last_name = models.CharField(max_length=150)  # Same as User model
+    invited_teacher_last_name = models.CharField(
+        max_length=150
+    )  # Same as User model
     # TODO: Make not nullable once data has been transferred
     _invited_teacher_last_name = models.BinaryField(null=True, blank=True)
     # TODO: Switch to a CharField to be able to hold hashed value
@@ -228,7 +307,9 @@ class Class(models.Model):
     locked_worksheets: "ManyToManyField[Worksheet]"
 
     name = models.CharField(max_length=200)
-    teacher = models.ForeignKey(Teacher, related_name="class_teacher", on_delete=models.CASCADE)
+    teacher = models.ForeignKey(
+        Teacher, related_name="class_teacher", on_delete=models.CASCADE
+    )
     access_code = models.CharField(max_length=5, null=True)
     classmates_data_viewable = models.BooleanField(default=False)
     always_accept_requests = models.BooleanField(default=False)
@@ -252,7 +333,9 @@ class Class(models.Model):
     def active_game(self):
         games = self.game_set.filter(game_class=self, is_archived=False)
         if len(games) >= 1:
-            assert len(games) == 1  # there should NOT be more than one active game
+            assert (
+                len(games) == 1
+            )  # there should NOT be more than one active game
             return games[0]
         return None
 
@@ -262,8 +345,13 @@ class Class(models.Model):
 
     def get_requests_message(self):
         if self.always_accept_requests:
-            external_requests_message = "This class is currently set to always accept requests."
-        elif self.accept_requests_until is not None and (self.accept_requests_until - timezone.now()) >= timedelta():
+            external_requests_message = (
+                "This class is currently set to always accept requests."
+            )
+        elif (
+            self.accept_requests_until is not None
+            and (self.accept_requests_until - timezone.now()) >= timedelta()
+        ):
             external_requests_message = (
                 "This class is accepting external requests until "
                 + self.accept_requests_until.strftime("%d-%m-%Y %H:%M")
@@ -271,7 +359,9 @@ class Class(models.Model):
                 + timezone.get_current_timezone_name()
             )
         else:
-            external_requests_message = "This class is not currently accepting external requests."
+            external_requests_message = (
+                "This class is not currently accepting external requests."
+            )
 
         return external_requests_message
 
@@ -293,7 +383,9 @@ class UserSession(models.Model):
     login_time = models.DateTimeField(default=timezone.now)
     school = models.ForeignKey(School, null=True, on_delete=models.SET_NULL)
     class_field = models.ForeignKey(Class, null=True, on_delete=models.SET_NULL)
-    login_type = models.CharField(max_length=100, null=True)  # for student login
+    login_type = models.CharField(
+        max_length=100, null=True
+    )  # for student login
 
     def __str__(self):
         return f"{self.user} login: {self.login_time} type: {self.login_type}"
@@ -322,7 +414,9 @@ class StudentModelManager(models.Manager):
         )
 
     def independentStudentFactory(self, name, email, password):
-        user = User.objects.create_user(username=email, email=email, password=password, first_name=name)
+        user = User.objects.create_user(
+            username=email, email=email, password=password, first_name=name
+        )
 
         user_profile = UserProfile.objects.create(user=user)
 
@@ -381,7 +475,9 @@ class JoinReleaseStudent(models.Model):
     JOIN = "join"
     RELEASE = "release"
 
-    student = models.ForeignKey(Student, related_name="student", on_delete=models.CASCADE)
+    student = models.ForeignKey(
+        Student, related_name="student", on_delete=models.CASCADE
+    )
     # either "release" or "join"
     action_type = models.CharField(max_length=64)
     action_time = models.DateTimeField(default=timezone.now)

{codeforlife_portal-8.8.0.dist-info → codeforlife_portal-8.8.2.dist-info}/METADATA

@@ -1,24 +1,26 @@
 Metadata-Version: 2.4
 Name: codeforlife-portal
-Version: 8.8.0
+Version: 8.8.2
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: amqp==5.3.1; python_version >= "3.6"
-Requires-Dist: asgiref==3.8.1; python_version >= "3.8"
+Requires-Dist: asgiref==3.9.1; python_version >= "3.9"
 Requires-Dist: billiard==4.2.1; python_version >= "3.7"
 Requires-Dist: boto3==1.36.14; python_version >= "3.8"
 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.6.15; python_version >= "3.7"
-Requires-Dist: cfl-common==8.8.0
-Requires-Dist: charset-normalizer==3.4.2; python_version >= "3.7"
+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.8.2
+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"
 Requires-Dist: click-plugins==1.1.1.2
 Requires-Dist: click-repl==0.3.0; python_version >= "3.6"
+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.10; python_version >= "3.10"
 Requires-Dist: django-classy-tags==4.1.0; python_version >= "3.8"
@@ -26,7 +28,7 @@ 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.0; python_version >= "3.7"
+Requires-Dist: django-otp==1.6.1; python_version >= "3.7"
 Requires-Dist: django-phonenumber-field==8.1.0; python_version >= "3.9"
 Requires-Dist: django-pipeline==4.0.0; python_version >= "3.9"
 Requires-Dist: django-preventconcurrentlogins==0.8.2
@@ -44,18 +46,19 @@ Requires-Dist: jmespath==1.0.1; python_version >= "3.7"
 Requires-Dist: kombu[sqs]==5.5.4; 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.0; python_version >= "3.11"
+Requires-Dist: numpy==2.3.2; python_version >= "3.11"
 Requires-Dist: packaging==25.0; python_version >= "3.8"
-Requires-Dist: pandas==2.3.0; python_version >= "3.9"
+Requires-Dist: pandas==2.3.1; python_version >= "3.9"
 Requires-Dist: pgeocode==0.4.0; python_version >= "3.8"
 Requires-Dist: phonenumbers==8.12.12
 Requires-Dist: pillow==11.3.0; python_version >= "3.9"
 Requires-Dist: prompt-toolkit==3.0.51; python_version >= "3.8"
 Requires-Dist: psycopg2-binary==2.9.9; python_version >= "3.7"
+Requires-Dist: pycparser==2.22; python_version >= "3.8"
 Requires-Dist: pycurl==7.45.6
 Requires-Dist: pyjwt==2.6.0; python_version >= "3.7"
 Requires-Dist: pypng==0.20220715.0
-Requires-Dist: python-dateutil==2.9.0.post0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
+Requires-Dist: python-dateutil==2.9.0.post0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2"
 Requires-Dist: python-dotenv==1.0.1; python_version >= "3.8"
 Requires-Dist: pytz==2025.2
 Requires-Dist: pyyaml==6.0.2; python_version >= "3.8"
@@ -68,7 +71,7 @@ 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: tablib==3.7.0; python_version >= "3.9"
-Requires-Dist: typing-extensions==4.14.0; python_version >= "3.9"
+Requires-Dist: typing-extensions==4.14.1; python_version >= "3.9"
 Requires-Dist: tzdata==2025.2; python_version >= "2"
 Requires-Dist: urllib3==2.5.0
 Requires-Dist: uvicorn==0.35.0; python_version >= "3.9"
@@ -79,62 +82,32 @@ Requires-Dist: wheel==0.45.1; python_version >= "3.8"
 Requires-Dist: whitenoise==6.9.0; python_version >= "3.9"
 Requires-Dist: zipp==3.23.0; python_version >= "3.9"
 Provides-Extra: dev
-Requires-Dist: asgiref==3.8.1; python_version >= "3.8" and extra == "dev"
-Requires-Dist: asttokens==3.0.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: asgiref==3.9.1; python_version >= "3.9" and extra == "dev"
 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.6.15; python_version >= "3.7" and extra == "dev"
-Requires-Dist: cfl-common==8.8.0; extra == "dev"
-Requires-Dist: charset-normalizer==3.4.2; python_version >= "3.7" and extra == "dev"
+Requires-Dist: certifi==2025.8.3; python_version >= "3.7" and 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.9.2; python_version >= "3.9" and extra == "dev"
-Requires-Dist: decorator==5.2.1; python_version >= "3.8" and extra == "dev"
-Requires-Dist: diff-match-patch==20241021; python_version >= "3.7" and extra == "dev"
+Requires-Dist: coverage[toml]==7.10.3; python_version >= "3.9" and extra == "dev"
 Requires-Dist: django==5.1.10; python_version >= "3.10" and extra == "dev"
-Requires-Dist: django-countries==7.6.1; extra == "dev"
-Requires-Dist: django-csp==3.8; extra == "dev"
-Requires-Dist: django-formtools==2.5.1; python_version >= "3.8" and extra == "dev"
-Requires-Dist: django-import-export==4.2.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: django-otp==1.6.0; python_version >= "3.7" and extra == "dev"
-Requires-Dist: django-phonenumber-field==8.1.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: django-pipeline==4.0.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: django-reverse-js==0.1.8; python_version >= "3.10" and extra == "dev"
+Requires-Dist: django-reverse-js==0.1.7; python_version >= "3.10" and extra == "dev"
 Requires-Dist: django-selenium-clean==1.0.1; extra == "dev"
 Requires-Dist: django-test-migrations==1.4.0; (python_version >= "3.9" and python_version < "4.0") and extra == "dev"
-Requires-Dist: django-two-factor-auth==1.17.0; python_version >= "3.8" and extra == "dev"
-Requires-Dist: djangorestframework==3.16.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: execnet==2.1.1; python_version >= "3.8" and extra == "dev"
-Requires-Dist: executing==2.2.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: fastdiff==0.3.0; extra == "dev"
 Requires-Dist: h11==0.16.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: idna==3.10; python_version >= "3.6" and extra == "dev"
 Requires-Dist: iniconfig==2.1.0; python_version >= "3.8" and extra == "dev"
-Requires-Dist: ipython==9.3.0; python_version >= "3.11" and extra == "dev"
-Requires-Dist: ipython-pygments-lexers==1.1.1; python_version >= "3.8" and extra == "dev"
 Requires-Dist: isort==6.0.1; python_full_version >= "3.9.0" and extra == "dev"
-Requires-Dist: jedi==0.19.2; python_version >= "3.6" and extra == "dev"
-Requires-Dist: libsass==0.23.0; python_version >= "3.8" and extra == "dev"
-Requires-Dist: matplotlib-inline==0.1.7; python_version >= "3.8" and extra == "dev"
-Requires-Dist: more-itertools==8.7.0; python_version >= "3.5" and extra == "dev"
 Requires-Dist: mypy-extensions==1.1.0; python_version >= "3.8" and extra == "dev"
-Requires-Dist: numpy==2.3.0; python_version >= "3.11" and extra == "dev"
 Requires-Dist: outcome==1.3.0.post0; python_version >= "3.7" and extra == "dev"
 Requires-Dist: packaging==25.0; python_version >= "3.8" and extra == "dev"
-Requires-Dist: pandas==2.3.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: parso==0.8.4; python_version >= "3.6" and extra == "dev"
 Requires-Dist: pathspec==0.12.1; python_version >= "3.8" and extra == "dev"
-Requires-Dist: pexpect==4.9.0; (sys_platform != "win32" and sys_platform != "emscripten") and extra == "dev"
-Requires-Dist: pgeocode==0.4.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: platformdirs==4.3.8; python_version >= "3.9" and extra == "dev"
 Requires-Dist: pluggy==1.6.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: prompt-toolkit==3.0.51; python_version >= "3.8" and extra == "dev"
-Requires-Dist: ptyprocess==0.7.0; extra == "dev"
-Requires-Dist: pure-eval==0.2.3; extra == "dev"
-Requires-Dist: pygments==2.19.1; python_version >= "3.8" and extra == "dev"
+Requires-Dist: pygments==2.19.2; python_version >= "3.8" and extra == "dev"
 Requires-Dist: pyhamcrest==2.0.2; python_version >= "3.5" and extra == "dev"
-Requires-Dist: pyjwt==2.6.0; python_version >= "3.7" and extra == "dev"
 Requires-Dist: pypdf==5.1.0; python_version >= "3.8" and extra == "dev"
-Requires-Dist: pypng==0.20220715.0; extra == "dev"
 Requires-Dist: pysocks==1.7.1; extra == "dev"
 Requires-Dist: pytest==8.4.1; python_version >= "3.9" and extra == "dev"
 Requires-Dist: pytest-cov==6.2.1; python_version >= "3.9" and extra == "dev"
@@ -142,34 +115,23 @@ Requires-Dist: pytest-django==4.8.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: pytest-mock==3.14.1; python_version >= "3.8" and extra == "dev"
 Requires-Dist: pytest-order==1.3.0; python_version >= "3.7" and extra == "dev"
 Requires-Dist: pytest-xdist==3.8.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: python-dateutil==2.9.0.post0; (python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3") and extra == "dev"
-Requires-Dist: pytz==2025.2; extra == "dev"
 Requires-Dist: pyvirtualdisplay==3.0; extra == "dev"
-Requires-Dist: qrcode==7.4.2; python_version >= "3.7" and extra == "dev"
-Requires-Dist: rapid-router==7.5.16; extra == "dev"
+Requires-Dist: rapid-router==7.3.6; extra == "dev"
 Requires-Dist: requests==2.32.4; python_version >= "3.8" and extra == "dev"
 Requires-Dist: responses==0.18.0; python_version >= "3.7" and extra == "dev"
 Requires-Dist: selenium==4.29.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: setuptools==80.9.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: six==1.17.0; (python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3") and extra == "dev"
 Requires-Dist: snapshottest==1.0.0a1; extra == "dev"
 Requires-Dist: sniffio==1.3.1; python_version >= "3.7" and extra == "dev"
 Requires-Dist: sortedcontainers==2.4.0; extra == "dev"
 Requires-Dist: sqlparse==0.5.3; python_version >= "3.8" and extra == "dev"
-Requires-Dist: stack-data==0.6.3; extra == "dev"
-Requires-Dist: tablib==3.7.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: termcolor==3.1.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: traitlets==5.14.3; python_version >= "3.8" and extra == "dev"
 Requires-Dist: trio==0.30.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: trio-websocket==0.12.2; python_version >= "3.8" and extra == "dev"
-Requires-Dist: typing-extensions==4.14.0; python_version >= "3.9" and extra == "dev"
-Requires-Dist: tzdata==2025.2; python_version >= "2" and extra == "dev"
+Requires-Dist: typing-extensions==4.14.1; python_version >= "3.9" and extra == "dev"
 Requires-Dist: urllib3==2.5.0; extra == "dev"
 Requires-Dist: wasmer==1.1.0; extra == "dev"
 Requires-Dist: wasmer-compiler-cranelift==1.1.0; extra == "dev"
-Requires-Dist: wcwidth==0.2.13; extra == "dev"
 Requires-Dist: websocket-client==1.8.0; python_version >= "3.8" and extra == "dev"
-Requires-Dist: wheel==0.45.1; python_version >= "3.8" and extra == "dev"
 Requires-Dist: wsproto==1.2.0; python_full_version >= "3.7.0" and extra == "dev"
 Dynamic: classifier
 Dynamic: description

{codeforlife_portal-8.8.0.dist-info → codeforlife_portal-8.8.2.dist-info}/RECORD

@@ -6,7 +6,7 @@ cfl_common/common/apps.py,sha256=49UXZ3bSkFKvIEOL4zM7y1sAhccQJyRtsoOg5XVd_8Y,129
 cfl_common/common/context_processors.py,sha256=X0iuX5qu9kMWa7q8osE9CJ2LgM7pPOYQFGdjm8X3rk0,236
 cfl_common/common/csp_config.py,sha256=saeg9LbRr5xw7NDJPlt6fqi8Zz0vI8Rpc4VCS6oJNe8,2976
 cfl_common/common/mail.py,sha256=pIRfUMVoJWxdv74UqToj_0_pTVTC51z6QlFVLI3QBOw,6874
-cfl_common/common/models.py,sha256=_uD8pIO5fGVbOD8NydJVIzpiEDAaR2hIfpOhDT6jB34,16106
+cfl_common/common/models.py,sha256=JKPx3YeYTlmhuDteWBn6tfewajkK3z9ge95h8VGwh8M,18845
 cfl_common/common/permissions.py,sha256=gC6RQGZI2QDBbglx-xr_V4Hl2C2nf1V2_uPmEuoEcJo,2416
 cfl_common/common/utils.py,sha256=Nn2Npao9Uqad5Js_IdHwF-ow6wrPNpBLW4AO1LxoEBc,1727
 cfl_common/common/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -71,6 +71,7 @@ cfl_common/common/migrations/0054_delete_aimmo_models.py,sha256=fmn4mDdlHr5DhPbI
 cfl_common/common/migrations/0055_alter_schoolteacherinvitation_token.py,sha256=lzPAMaI3zU_q25RuIos_LV97NXOa3MIn_eWaEL71Y4I,403
 cfl_common/common/migrations/0056_set_non_school_teachers_as_non_admins.py,sha256=_BrC9yfSYpP-c7EGFZmz8a4Kx_SxnRhpLMxJ70RVFOY,603
 cfl_common/common/migrations/0057_teacher_teacher__is_admin.py,sha256=4pinm9T3JF3PRNLnbXI6mdFiNyxg1MnRs8lMKC4S5Bc,511
+cfl_common/common/migrations/0058_userprofile_google_refresh_token_and_more.py,sha256=xHBv29aWKGkISxhQd_ao5RcZPg5UkirsVf9sqajkk_8,656
 cfl_common/common/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cfl_common/common/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cfl_common/common/tests/test_migration_anonymise_orphan_schools.py,sha256=wJRyPgRvBsXLSCFdbBi2GXjgSgDbKUTRiM31CXIvpqs,1194
@@ -87,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.8.0.dist-info/licenses/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-8.8.2.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
@@ -99,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=tGTPDjy1jWD8DUqaSys3qYcAfnxzPiBpDxR2vf7er-A,1560
+deploy/middleware/tmp_basic_auth.py,sha256=FmPw8XVovt7iS7iLxZAWSejWLHzzmjmA-SC8IESohEM,1435
 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
@@ -108,11 +109,11 @@ deploy/static/apple-touch-icon.png,sha256=QjNQ8jDKI4BpfMMsrs2t3H0fXHa5KHV45fK_VS
 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=AaXwSSB2A6qu6My_7cBciQa_jONy084uqNuVmBvusjs,7668
-example_project/settings.py,sha256=RRSHhAgJVDn4uNZG395V6_Td7jwsSaBGNwQBZ_KJm0Y,5973
+example_project/portal_test_settings.py,sha256=_6EDMwnYH2yCukgiop0sobqShbB8tivO9hcjZUYReec,7909
+example_project/settings.py,sha256=IsicdosIyB_3K2sv60bQvhAm6qm5fYWYut7oWTDZ778,6214
 example_project/urls.py,sha256=FUTzHPlUS1O5kqMHjL5V4L552N2ln7uTDXcw9wjKUto,422
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=lyCx9SueHF5AFRlBGLEidJOtooEa78uAc6Lvwe0BHU0,22
+portal/__init__.py,sha256=zhwbOyu2u3qgNJQq355YyLGTwwFJxFmr9I6gkQzux6g,22
 portal/admin.py,sha256=RKJizTF6dPJKmGPZw7nZUM0X8jkiTjgyKhLQxtvHJ0I,6148
 portal/app_settings.py,sha256=8P3r0ArkOzL_iVjoaLIHsNWG4uP1tT2z1kCUHPhAZ9s,714
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -635,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.8.0.dist-info/METADATA,sha256=ZkuJQ5_mqldtSU8DXH8wr6r7lPXvvNieAPb657rmUWU,13661
-codeforlife_portal-8.8.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-codeforlife_portal-8.8.0.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-8.8.0.dist-info/RECORD,,
+codeforlife_portal-8.8.2.dist-info/METADATA,sha256=TPz2_m3zW1FeSQMQOVbFLPvYztek0tMJGgxgI7xtKZc,10801
+codeforlife_portal-8.8.2.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+codeforlife_portal-8.8.2.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-8.8.2.dist-info/RECORD,,

deploy/middleware/tmp_basic_auth.py

@@ -6,6 +6,7 @@ from portal.app_settings import TMP_AUTH_TOKEN
 class TempBasicAuthMiddleware:
     """
     Middleware used as a basic auth for the new OTP app until we switch to the main domain.
+    Only meant for use in OTP, so include this in MIDDLEWARES only in OTP settings, not GCP.
     Remove this middleware once the switch is done.
     """
 
@@ -18,24 +19,19 @@ class TempBasicAuthMiddleware:
         url = request.build_absolute_uri()
         temp_domain = "https://www.code4life.education"
 
-        # Only run this middleware on a request from the code4life domain
-        if url.startswith(temp_domain):
-
-            # 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)
-                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.
-            else:
-                value = request.COOKIES.get("TMP_AUTH_TOKEN")
-                if value is not None and value == TMP_AUTH_TOKEN:
-                    return self.get_response(request)
-
-            return redirect("https://www.codeforlife.education")
-
-        return self.get_response(request)
+        # 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)
+            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.
+        else:
+            value = request.COOKIES.get("TMP_AUTH_TOKEN")
+            if value is not None and value == TMP_AUTH_TOKEN:
+                return self.get_response(request)
+
+        return redirect("https://www.codeforlife.education")

example_project/portal_test_settings.py

@@ -229,3 +229,11 @@ AUTOCONFIG_INDEX_VIEW = "home"
 SITE_ID = 1
 
 from common.csp_config import *
+
+if MODULE_NAME == "local":
+    # NOTE: This is only used locally for testing purposes.
+    os.environ.setdefault(
+        "ENCRYPTION_KEY", "XTgWqMlZCMI_E5BvCArkif9nrJIIhe_6Ic6Q_UcWJDk="
+    )
+
+ENCRYPTION_KEY = os.environ["ENCRYPTION_KEY"]

example_project/settings.py

@@ -183,3 +183,11 @@ AUTOCONFIG_INDEX_VIEW = "home"
 SITE_ID = 1
 
 from common.csp_config import *
+
+if MODULE_NAME == "local":
+    # NOTE: This is only used locally for testing purposes.
+    os.environ.setdefault(
+        "ENCRYPTION_KEY", "XTgWqMlZCMI_E5BvCArkif9nrJIIhe_6Ic6Q_UcWJDk="
+    )
+
+ENCRYPTION_KEY = os.environ["ENCRYPTION_KEY"]

portal/__init__.py

@@ -1 +1 @@
-__version__ = "8.8.0"
+__version__ = "8.8.2"