codeforlife-portal 7.4.9__py2.py3-none-any.whl → 8.0.1__py2.py3-none-any.whl

portal/views/home.py

@@ -33,9 +33,12 @@ from portal.helpers.ratelimit import (
 )
 from portal.strings.coding_club import CODING_CLUB_BANNER
 from portal.strings.home_learning import HOME_LEARNING_BANNER
-from portal.strings.ten_year_map import TEN_YEAR_MAP_BANNER, TEN_YEAR_MAP_HEADLINE
+from portal.strings.ten_year_map import (
+    TEN_YEAR_MAP_BANNER,
+    TEN_YEAR_MAP_HEADLINE,
+)
 from portal.templatetags.app_tags import cloud_storage
-from portal.views.teacher.teach import DownloadType, count_student_pack_downloads_click
+from portal.views.teacher.teach import count_student_pack_downloads_click
 
 LOGGER = logging.getLogger(__name__)
 
@@ -65,11 +68,15 @@ def render_signup_form(request):
     invalid_form = False
 
     teacher_signup_form = TeacherSignupForm(prefix="teacher_signup")
-    independent_student_signup_form = IndependentStudentSignupForm(prefix="independent_student_signup")
+    independent_student_signup_form = IndependentStudentSignupForm(
+        prefix="independent_student_signup"
+    )
 
     if request.method == "POST":
         if "teacher_signup-teacher_email" in request.POST:
-            teacher_signup_form = TeacherSignupForm(request.POST, prefix="teacher_signup")
+            teacher_signup_form = TeacherSignupForm(
+                request.POST, prefix="teacher_signup"
+            )
 
             if not captcha.CAPTCHA_ENABLED:
                 remove_captcha_from_forms(teacher_signup_form)
@@ -123,11 +130,15 @@ def process_signup_form(request, data):
                 [email],
                 personalization_values={
                     "EMAIL": email,
-                    "LOGIN_URL": request.build_absolute_uri(reverse("teacher_login")),
+                    "LOGIN_URL": request.build_absolute_uri(
+                        reverse("teacher_login")
+                    ),
                 },
             )
         else:
-            LOGGER.warn(f"Ratelimit teacher {RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP}: {email}")
+            LOGGER.warn(
+                f"Ratelimit teacher {RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP}: {email}"
+            )
     else:
         teacher = Teacher.objects.factory(
             first_name=data["teacher_first_name"],
@@ -138,7 +149,9 @@ def process_signup_form(request, data):
 
         send_verification_email(request, teacher.user.user, data)
 
-        TotalActivity.objects.update(teacher_registrations=F("teacher_registrations") + 1)
+        TotalActivity.objects.update(
+            teacher_registrations=F("teacher_registrations") + 1
+        )
 
     return render(
         request,
@@ -166,11 +179,15 @@ def process_independent_student_signup_form(request, data):
                 [email],
                 personalization_values={
                     "EMAIL": email,
-                    "LOGIN_URL": request.build_absolute_uri(reverse("independent_student_login")),
+                    "LOGIN_URL": request.build_absolute_uri(
+                        reverse("independent_student_login")
+                    ),
                 },
             )
         else:
-            LOGGER.warning(f"Ratelimit independent {RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP}: {email}")
+            LOGGER.warning(
+                f"Ratelimit independent {RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP}: {email}"
+            )
         return render(
             request,
             "portal/email_verification_needed.html",
@@ -188,7 +205,9 @@ def process_independent_student_signup_form(request, data):
 
     send_verification_email(request, student.new_user, data, age=age)
 
-    TotalActivity.objects.update(independent_registrations=F("independent_registrations") + 1)
+    TotalActivity.objects.update(
+        independent_registrations=F("independent_registrations") + 1
+    )
 
     return render(
         request,
@@ -199,7 +218,10 @@ def process_independent_student_signup_form(request, data):
 
 
 def is_developer(request):
-    return hasattr(request.user, "userprofile") and request.user.userprofile.developer
+    return (
+        hasattr(request.user, "userprofile")
+        and request.user.userprofile.developer
+    )
 
 
 def redirect_teacher_to_correct_page(request, teacher):
@@ -229,10 +251,14 @@ def home(request):
     # tests where the first Selenium test passes, but any following test
     # fails because it cannot find the Maintenance banner instance.
     try:
-        maintenance_banner = DynamicElement.objects.get(name="Maintenance banner")
+        maintenance_banner = DynamicElement.objects.get(
+            name="Maintenance banner"
+        )
 
         if maintenance_banner.active:
-            messages.info(request, format_html(maintenance_banner.text), extra_tags="safe")
+            messages.info(
+                request, format_html(maintenance_banner.text), extra_tags="safe"
+            )
     except ObjectDoesNotExist:
         pass
 
@@ -250,7 +276,9 @@ def home(request):
 
 
 def coding_club(request):
-    return render(request, "portal/coding_club.html", {"BANNER": CODING_CLUB_BANNER})
+    return render(
+        request, "portal/coding_club.html", {"BANNER": CODING_CLUB_BANNER}
+    )
 
 
 def download_student_pack(request, student_pack_type):
@@ -269,7 +297,9 @@ def home_learning(request):
 
 
 def ten_year_map_page(request):
-    messages.info(request, "This page is currently under construction.", extra_tags="safe")
+    messages.info(
+        request, "This page is currently under construction.", extra_tags="safe"
+    )
     return render(
         request,
         "portal/ten_year_map.html",

portal/views/registration.py

@@ -21,9 +21,9 @@ from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from django.template.response import TemplateResponse
 from django.urls import reverse_lazy
-from django.utils.encoding import force_text
+from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_decode
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.decorators.cache import never_cache
 from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.debug import sensitive_post_parameters
@@ -202,7 +202,7 @@ def password_reset_confirm(
     check_uidb64(uidb64, token)
 
     try:
-        uid = force_text(urlsafe_base64_decode(uidb64))
+        uid = force_bytes(urlsafe_base64_decode(uidb64))
         user = UserModel._default_manager.get(pk=uid)
     except (TypeError, ValueError, OverflowError, UserModel.DoesNotExist):
         user = None

portal/views/two_factor/core.py

@@ -1,25 +1,28 @@
-from two_factor.forms import (
-    TOTPDeviceForm,
-    MethodForm,
-    DeviceValidationForm,
-    YubiKeyDeviceForm,
-)
+import common.permissions as permissions
+from django.contrib.auth.decorators import user_passes_test
+from django.urls import reverse_lazy
+from django.utils.decorators import method_decorator
+from django.views.decorators.cache import never_cache
+from two_factor.forms import MethodForm
 from two_factor.views.core import SetupView
 
 
+def login_required(function=None):
+    """
+    Decorator for views that checks that the user is logged in, redirecting
+    to the log-in page if necessary.
+    """
+    actual_decorator = user_passes_test(
+        permissions.logged_in_as_teacher,
+        login_url=reverse_lazy("teacher_login"),
+    )
+    if function:
+        return actual_decorator(function)
+    return actual_decorator
+
+
 # This custom class gets rid of the 'welcome' step of 2FA
 # which the new design not needs any more
+@method_decorator([never_cache, login_required], name="dispatch")
 class CustomSetupView(SetupView):
-    form_list = (
-        ("generator", TOTPDeviceForm),
-        ("method", MethodForm),
-        ("validation", DeviceValidationForm),
-        ("yubikey", YubiKeyDeviceForm),
-    )
-
-    condition_dict = {
-        "call": lambda self: self.get_method() == "call",
-        "sms": lambda self: self.get_method() == "sms",
-        "validation": lambda self: self.get_method() in ("sms", "call"),
-        "yubikey": lambda self: self.get_method() == "yubikey",
-    }
+    form_list = (("method", MethodForm),)

portal/views/two_factor/profile.py

@@ -1,11 +1,11 @@
+from django.utils.decorators import method_decorator
 from django.views.decorators.cache import never_cache
 from two_factor.views.profile import DisableView
-from two_factor.views.utils import class_view_decorator
 
 from .form import DisableForm
 
 
 # This is not changed but imports the from form.py so it overwrites the disable 2FA form
-@class_view_decorator(never_cache)
+@method_decorator(never_cache, name='dispatch')
 class CustomDisableView(DisableView):
     form_class = DisableForm