codeforlife-portal 6.42.0__tar.gz → 6.43.0__tar.gz

{codeforlife-portal-6.42.0/codeforlife_portal.egg-info → codeforlife-portal-6.43.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 6.42.0
+Version: 6.43.0
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Framework :: Django

{codeforlife-portal-6.42.0 → codeforlife-portal-6.43.0/codeforlife_portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 6.42.0
+Version: 6.43.0
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Framework :: Django

{codeforlife-portal-6.42.0 → codeforlife-portal-6.43.0}/codeforlife_portal.egg-info/requires.txt

@@ -17,7 +17,7 @@ django-classy-tags==2.0.0
 libsass==0.23.0
 phonenumbers==8.12.12
 more-itertools==8.7.0
-cfl-common==6.42.0
+cfl-common==6.43.0
 django-ratelimit==3.0.1
 django-preventconcurrentlogins==0.8.2
 django-csp==3.7

codeforlife-portal-6.43.0/portal/__init__.py

@@ -0,0 +1 @@
+__version__ = "6.43.0"

{codeforlife-portal-6.42.0 → codeforlife-portal-6.43.0}/portal/tests/test_api.py

@@ -5,7 +5,10 @@ from unittest.mock import patch
 import pytest
 from common.models import Class, School, Student, Teacher
 from common.tests.utils.classes import create_class_directly
-from common.tests.utils.organisation import create_organisation_directly, join_teacher_to_organisation
+from common.tests.utils.organisation import (
+    create_organisation_directly,
+    join_teacher_to_organisation,
+)
 from common.tests.utils.student import create_school_student_directly
 from common.tests.utils.teacher import signup_teacher_directly
 from common.tests.utils.user import create_user_directly, get_superuser
@@ -19,7 +22,10 @@ from rest_framework.test import APIClient, APITestCase
 
 class APITests(APITestCase):
     def test_valid_date_registered(self):
-        url = reverse("registered-users", kwargs={"year": "2016", "month": "04", "day": "01"})
+        url = reverse(
+            "registered-users",
+            kwargs={"year": "2016", "month": "04", "day": "01"},
+        )
         superuser = get_superuser()
         self.client.force_authenticate(user=superuser)
         response = self.client.get(url)
@@ -27,14 +33,20 @@ class APITests(APITestCase):
         assert_that(isinstance(response.data, int))
 
     def test_invalid_date_registered(self):
-        url = reverse("registered-users", kwargs={"year": "2016", "month": "05", "day": "35"})
+        url = reverse(
+            "registered-users",
+            kwargs={"year": "2016", "month": "05", "day": "35"},
+        )
         superuser = get_superuser()
         self.client.force_authenticate(user=superuser)
         response = self.client.get(url)
         assert_that(response, has_status_code(status.HTTP_404_NOT_FOUND))
 
     def test_valid_date_lastconnectedsince(self):
-        url = reverse("last-connected-since", kwargs={"year": "2016", "month": "04", "day": "01"})
+        url = reverse(
+            "last-connected-since",
+            kwargs={"year": "2016", "month": "04", "day": "01"},
+        )
         superuser = get_superuser()
         self.client.force_authenticate(user=superuser)
         response = self.client.get(url)
@@ -42,7 +54,10 @@ class APITests(APITestCase):
         assert_that(isinstance(response.data, int))
 
     def test_invalid_date_lastconnectedsince(self):
-        url = reverse("last-connected-since", kwargs={"year": "2016", "month": "05", "day": "35"})
+        url = reverse(
+            "last-connected-since",
+            kwargs={"year": "2016", "month": "05", "day": "35"},
+        )
         superuser = get_superuser()
         self.client.force_authenticate(user=superuser)
         response = self.client.get(url)
@@ -67,7 +82,9 @@ class APITests(APITestCase):
         assert len(response.data) == 1
 
     @patch("portal.views.api.IS_CLOUD_SCHEDULER_FUNCTION", return_value=True)
-    def test_get_inactive_users_if_appengine(self, mock_is_cloud_scheduler_function):
+    def test_get_inactive_users_if_appengine(
+        self, mock_is_cloud_scheduler_function
+    ):
         client = APIClient()
         create_user_directly(active=False)
         create_user_directly(active=True)
@@ -86,7 +103,9 @@ class APITests(APITestCase):
         assert response.status_code == status.HTTP_403_FORBIDDEN
 
     @patch("portal.views.api.IS_CLOUD_SCHEDULER_FUNCTION", return_value=True)
-    def test_delete_inactive_users_if_appengine(self, mock_is_cloud_scheduler_function):
+    def test_delete_inactive_users_if_appengine(
+        self, mock_is_cloud_scheduler_function
+    ):
         client = APIClient()
         create_user_directly(active=False)
         create_user_directly(active=False)
@@ -94,14 +113,25 @@ class APITests(APITestCase):
         response = client.get(url)
         users = response.data
         assert len(users) == 2
+
+        # NOTE: Migration 0049 causes user 34 (created via migration 0001) to
+        # be marked as inactive. Slightly tweaked this test so it still
+        # passes but takes into account this new anonymisation.
+        old_deleted_users = list(User.objects.filter(is_active=False))
+        assert len(old_deleted_users) == 1
+
         response = client.delete(url)
         assert mock_is_cloud_scheduler_function.called
         assert response.status_code == status.HTTP_204_NO_CONTENT
+
         for user in users:
             with pytest.raises(User.DoesNotExist):
                 User.objects.get(username=user["username"])
+
         deleted_users = list(User.objects.filter(is_active=False))
-        assert len(deleted_users) == 2
+        new_deleted_users_count = len(deleted_users) - len(old_deleted_users)
+        assert new_deleted_users_count == 2
+
         for user in deleted_users:
             assert user.first_name == "Deleted"
             assert user.last_name == "User"
@@ -112,27 +142,41 @@ class APITests(APITestCase):
         assert len(response.data) == 0
 
     @patch("portal.views.api.IS_CLOUD_SCHEDULER_FUNCTION", return_value=True)
-    def test_orphan_schools_and_classes_are_anonymised(self, mock_is_cloud_scheduler_function):
+    def test_orphan_schools_and_classes_are_anonymised(
+        self, mock_is_cloud_scheduler_function
+    ):
         client = APIClient()
         # Create a school with an active teacher
         school1_teacher1_email, _ = signup_teacher_directly()
         school1 = create_organisation_directly(school1_teacher1_email)
-        klass11, _, access_code11 = create_class_directly(school1_teacher1_email)
+        klass11, _, access_code11 = create_class_directly(
+            school1_teacher1_email
+        )
         _, _, student11 = create_school_student_directly(access_code11)
 
         # Create a school with one active non-admin teacher and one inactive admin teacher
         school2_teacher1_email, _ = signup_teacher_directly()
         school2_teacher2_email, _ = signup_teacher_directly()
         school2 = create_organisation_directly(school2_teacher1_email)
-        join_teacher_to_organisation(school2_teacher2_email, school2.name, is_admin=True)
-        klass21, _, access_code21 = create_class_directly(school2_teacher1_email)
+        join_teacher_to_organisation(
+            school2_teacher2_email, school2.name, is_admin=True
+        )
+        klass21, _, access_code21 = create_class_directly(
+            school2_teacher1_email
+        )
         _, _, student21 = create_school_student_directly(access_code21)
-        klass22, _, access_code22 = create_class_directly(school2_teacher2_email)
+        klass22, _, access_code22 = create_class_directly(
+            school2_teacher2_email
+        )
         _, _, student22 = create_school_student_directly(access_code22)
-        school2_teacher1 = Teacher.objects.get(new_user__email=school2_teacher1_email)
+        school2_teacher1 = Teacher.objects.get(
+            new_user__email=school2_teacher1_email
+        )
         school2_teacher1.is_admin = False
         school2_teacher1.save()
-        school2_teacher2 = Teacher.objects.get(new_user__email=school2_teacher2_email)
+        school2_teacher2 = Teacher.objects.get(
+            new_user__email=school2_teacher2_email
+        )
         school2_teacher2.new_user.is_active = False
         school2_teacher2.new_user.save()
 
@@ -141,28 +185,40 @@ class APITests(APITestCase):
         school3_teacher2_email, _ = signup_teacher_directly()
         school3 = create_organisation_directly(school3_teacher1_email)
         join_teacher_to_organisation(school3_teacher2_email, school3.name)
-        klass31, _, access_code31 = create_class_directly(school3_teacher1_email)
+        klass31, _, access_code31 = create_class_directly(
+            school3_teacher1_email
+        )
         _, _, student31 = create_school_student_directly(access_code31)
-        klass32, _, access_code32 = create_class_directly(school3_teacher2_email)
+        klass32, _, access_code32 = create_class_directly(
+            school3_teacher2_email
+        )
         _, _, student32 = create_school_student_directly(access_code32)
-        school3_teacher1 = Teacher.objects.get(new_user__email=school3_teacher1_email)
+        school3_teacher1 = Teacher.objects.get(
+            new_user__email=school3_teacher1_email
+        )
         school3_teacher1.new_user.is_active = False
         school3_teacher1.new_user.save()
-        school3_teacher2 = Teacher.objects.get(new_user__email=school3_teacher2_email)
+        school3_teacher2 = Teacher.objects.get(
+            new_user__email=school3_teacher2_email
+        )
         school3_teacher2.new_user.is_active = False
         school3_teacher2.new_user.save()
 
         # Create a school with no active teachers
         school4_teacher1_email, _ = signup_teacher_directly()
         school4 = create_organisation_directly(school4_teacher1_email)
-        school4_teacher1 = Teacher.objects.get(new_user__email=school4_teacher1_email)
+        school4_teacher1 = Teacher.objects.get(
+            new_user__email=school4_teacher1_email
+        )
         school4_teacher1.new_user.is_active = False
         school4_teacher1.new_user.save()
 
         # Create a school with no teachers
         school5_teacher1_email, _ = signup_teacher_directly()
         school5 = create_organisation_directly(school5_teacher1_email)
-        school5_teacher1 = Teacher.objects.get(new_user__email=school5_teacher1_email)
+        school5_teacher1 = Teacher.objects.get(
+            new_user__email=school5_teacher1_email
+        )
         school5_teacher1.delete()
 
         # Call the API
@@ -182,7 +238,9 @@ class APITests(APITestCase):
         assert Student.objects.filter(pk=student21.pk).exists()
         assert not Student.objects.get(pk=student22.pk).new_user.is_active
         # Also check the first teacher is now an admin
-        assert Teacher.objects.get(new_user__email=school2_teacher1_email).is_admin
+        assert Teacher.objects.get(
+            new_user__email=school2_teacher1_email
+        ).is_admin
 
         # Check the third school is anonymised together with its classes and students
         assert not School.objects.filter(name=school3.name).exists()
@@ -250,14 +308,19 @@ class APITests(APITestCase):
                 last_name=random_account["last_name"],
             )
 
-        assert len(User.objects.all()) == len(random_accounts) + initial_users_length
+        assert (
+            len(User.objects.all())
+            == len(random_accounts) + initial_users_length
+        )
 
         client.login(username=admin_username, password=admin_password)
         response = client.get(reverse("remove_fake_accounts"))
         assert response.status_code == 204
 
         # check if after deletion all the users are still there
-        assert len(User.objects.all()) == initial_users_length + 2  # mentioned in the fake_accounts description
+        assert (
+            len(User.objects.all()) == initial_users_length + 2
+        )  # mentioned in the fake_accounts description
 
 
 def has_status_code(status_code):
@@ -272,7 +335,11 @@ class HasStatusCode(BaseMatcher):
         return response.status_code == self.status_code
 
     def describe_to(self, description):
-        description.append_text("has status code ").append_text(self.status_code)
+        description.append_text("has status code ").append_text(
+            self.status_code
+        )
 
     def describe_mismatch(self, response, mismatch_description):
-        mismatch_description.append_text("had status code ").append_text(response.status_code)
+        mismatch_description.append_text("had status code ").append_text(
+            response.status_code
+        )

{codeforlife-portal-6.42.0 → codeforlife-portal-6.43.0}/portal/views/login/student.py

@@ -51,7 +51,8 @@ class StudentLoginView(LoginView):
         class_name = self.kwargs["access_code"].upper()
         messages.info(
             request,
-            f"<strong>You are logged in to class: " f"{escape(class_name)}</strong>",
+            f"<strong>You are logged in to class: "
+            f"{escape(class_name)}</strong>",
             extra_tags="safe message--student",
         )
 
@@ -72,7 +73,9 @@ class StudentLoginView(LoginView):
         klass = classes[0]
 
         name = form.cleaned_data.get("username")
-        students = Student.objects.filter(new_user__first_name__iexact=name, class_field=klass)
+        students = Student.objects.filter(
+            new_user__first_name__iexact=name, class_field=klass
+        )
         try:
             student = students[0]
         except IndexError:
@@ -81,32 +84,44 @@ class StudentLoginView(LoginView):
             raise Exception(msg)
 
         # Log the login time, class, and login type
-        session = UserSession(user=student.new_user, class_field=klass, login_type=login_type)
+        session = UserSession(
+            user=student.new_user, class_field=klass, login_type=login_type
+        )
         session.save()
 
+        student.user.is_verified = True
+        student.user.save()
+
     def form_valid(self, form):
         """Security check complete. Log the user in."""
-
         # Reset ratelimit cache upon successful login
         clear_ratelimit_cache_for_user(form.cleaned_data["username"])
 
-        login_type = self.kwargs.get("login_type", "classlink")  # default to "classlink" if not specified
+        login_type = self.kwargs.get(
+            "login_type", "classlink"
+        )  # default to "classlink" if not specified
 
         self._add_login_data(form, login_type)
         return super(StudentLoginView, self).form_valid(form)
 
     def post(self, request, *args, **kwargs):
         """
-        If the first name and access code found under the url inputted in the form corresponds to that of a blocked
-        account, this redirects the user to the locked out page. However, if the lockout
-        time is more than 24 hours before this is executed, the account is unlocked.
+        If the first name and access code found under the url inputted in the
+        form corresponds to that of a blocked account, this redirects the user
+        to the locked out page. However, if the lockout time is more than 24
+        hours before this is executed, the account is unlocked.
         """
         username = request.POST.get("username")
 
         # get access code from the current url
         access_code = get_access_code_from_request(request)
-        if Student.objects.filter(new_user__first_name=username, class_field__access_code=access_code).exists():
-            student = Student.objects.get(new_user__first_name=username, class_field__access_code=access_code)
+        if Student.objects.filter(
+            new_user__first_name=username, class_field__access_code=access_code
+        ).exists():
+            student = Student.objects.get(
+                new_user__first_name=username,
+                class_field__access_code=access_code,
+            )
 
             if student.blocked_time is not None:
                 if has_user_lockout_expired(student):
@@ -129,9 +144,15 @@ def student_direct_login(request, user_id, login_id):
     if user:
         # Log the login time and class
         student = Student.objects.get(new_user=user)
-        session = UserSession(user=user, class_field=student.class_field, login_type="direct")
+        session = UserSession(
+            user=user, class_field=student.class_field, login_type="direct"
+        )
         session.save()
 
         login(request, user)
+
+        student.user.is_verified = True
+        student.user.save()
+
         return HttpResponseRedirect(reverse_lazy("student_details"))
     return HttpResponseRedirect(reverse_lazy("home"))

codeforlife-portal-6.42.0/portal/__init__.py

@@ -1 +0,0 @@
-__version__ = "6.42.0"