codeforlife-portal 5.33.5__py2.py3-none-any.whl → 8.9.9__py2.py3-none-any.whl

portal/views/home.py

@@ -1,44 +1,39 @@
-from common import email_messages
+import math
+
 from common.helpers.emails import (
     send_verification_email,
-    send_email,
-    NOTIFICATION_EMAIL,
-    add_to_dotmailer,
 )
-from common.models import Teacher, Student
+from common.mail import campaign_ids, send_dotdigital_email
+from common.models import DynamicElement, Student, Teacher, TotalActivity
 from common.permissions import logged_in_as_student, logged_in_as_teacher
 from common.utils import _using_two_factor
 from django.contrib import messages as messages
 from django.contrib.auth import logout
 from django.contrib.auth.models import User
-from django.http import HttpResponseRedirect
+from django.core.exceptions import ObjectDoesNotExist
+from django.db.models import F
+from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse, reverse_lazy
+from django.utils import timezone
+from django.utils.html import format_html
 from django.views.decorators.cache import cache_control
 
 from deploy import captcha
 from portal.forms.play import IndependentStudentSignupForm
 from portal.forms.teach import TeacherSignupForm
 from portal.helpers.captcha import remove_captcha_from_forms
+from portal.helpers.ratelimit import (
+    RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP,
+    RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_RATE,
+    is_ratelimited,
+)
+from portal.strings.coding_club import CODING_CLUB_BANNER
 from portal.strings.home_learning import HOME_LEARNING_BANNER
-
-
-def teach_email_labeller(request):
-    if request.method == "POST" and "teacher_login" in request.POST:
-        return request.POST["login-teacher_email"]
-
-    return ""
-
-
-def play_name_labeller(request):
-    if request.method == "POST":
-        if "school_login" in request.POST:
-            return request.POST["login-name"] + ":" + request.POST["login-access_code"]
-
-        if "independent_student_login" in request.POST:
-            return request.POST["independent_student-username"]
-
-    return ""
+from portal.strings.ten_year_map import (
+    TEN_YEAR_MAP_BANNER,
+    TEN_YEAR_MAP_HEADLINE,
+)
 
 
 def register_view(request):
@@ -113,13 +108,26 @@ def process_signup_form(request, data):
     email = data["teacher_email"]
 
     if email and User.objects.filter(email=email).exists():
-        email_message = email_messages.userAlreadyRegisteredEmail(request, email)
-        send_email(
-            NOTIFICATION_EMAIL,
-            [email],
-            email_message["subject"],
-            email_message["message"],
+
+        is_email_ratelimited = is_ratelimited(
+            request=request,
+            group=RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP,
+            key=lambda *_: email,
+            rate=RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_RATE,
+            increment=True,
         )
+
+        if not is_email_ratelimited:
+            send_dotdigital_email(
+                campaign_ids["user_already_registered"],
+                [email],
+                personalization_values={
+                    "EMAIL": email,
+                    "LOGIN_URL": request.build_absolute_uri(
+                        reverse("teacher_login")
+                    ),
+                },
+            )
     else:
         teacher = Teacher.objects.factory(
             first_name=data["teacher_first_name"],
@@ -128,11 +136,11 @@ def process_signup_form(request, data):
             password=data["teacher_password"],
         )
 
-        if _newsletter_ticked(data):
-            user = teacher.user.user
-            add_to_dotmailer(user.first_name, user.last_name, user.email)
+        send_verification_email(request, teacher.user.user, data)
 
-        send_verification_email(request, teacher.user.user)
+        TotalActivity.objects.update(
+            teacher_registrations=F("teacher_registrations") + 1
+        )
 
     return render(
         request,
@@ -144,37 +152,28 @@ def process_signup_form(request, data):
 
 def process_independent_student_signup_form(request, data):
     email = data["email"]
-    username = data["username"]
-
-    independent_students = Student.objects.filter(class_field=None)
 
     if email and User.objects.filter(email=email).exists():
-        email_message = email_messages.userAlreadyRegisteredEmail(
-            request, email, is_independent_student=True
-        )
-        send_email(
-            NOTIFICATION_EMAIL,
-            [email],
-            email_message["subject"],
-            email_message["message"],
-        )
-        return render(
-            request,
-            "portal/email_verification_needed.html",
-            {"usertype": "INDEP_STUDENT"},
-            status=302,
+        is_email_ratelimited = is_ratelimited(
+            request=request,
+            group=RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP,
+            key=lambda *_: email,
+            rate=RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_RATE,
+            increment=True,
         )
 
-    if username and independent_students.filter(new_user__username=username).exists():
-        email_message = email_messages.indepStudentUsernameAlreadyExistsEmail(
-            request, username
-        )
-        send_email(
-            NOTIFICATION_EMAIL,
-            [email],
-            email_message["subject"],
-            email_message["message"],
-        )
+        if not is_email_ratelimited:
+            send_dotdigital_email(
+                campaign_ids["user_already_registered"],
+                [email],
+                personalization_values={
+                    "EMAIL": email,
+                    "LOGIN_URL": request.build_absolute_uri(
+                        reverse("independent_student_login")
+                    ),
+                },
+            )
+
         return render(
             request,
             "portal/email_verification_needed.html",
@@ -183,17 +182,18 @@ def process_independent_student_signup_form(request, data):
         )
 
     student = Student.objects.independentStudentFactory(
-        username=data["username"],
-        name=data["name"],
-        email=data["email"],
-        password=data["password"],
+        name=data["name"], email=data["email"], password=data["password"]
     )
 
-    if _newsletter_ticked(data):
-        user = student.new_user
-        add_to_dotmailer(user.first_name, user.last_name, user.email)
+    dob = data["date_of_birth"]
+    age_in_days = timezone.now().date() - dob
+    age = math.floor(age_in_days.days / 365.25)
 
-    send_verification_email(request, student.new_user)
+    send_verification_email(request, student.new_user, data, age=age)
+
+    TotalActivity.objects.update(
+        independent_registrations=F("independent_registrations") + 1
+    )
 
     return render(
         request,
@@ -204,44 +204,50 @@ 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):
     if teacher.has_school():
-        classes = teacher.class_teacher.all()
-        if classes:
-            classes_count = classes.count()
-            if classes_count > 1 or classes[0].has_students():
-                link = reverse("two_factor:profile")
-                if not _using_two_factor(request.user):
-                    messages.info(
-                        request,
-                        (
-                            "You are not currently set up with two-factor authentication. "
-                            + "Use your phone or tablet to enhance your account’s security.</br>"
-                            + "Click <a href='"
-                            + link
-                            + "'>here</a> to find out more and "
-                            + "set it up or go to your account page at any time."
-                        ),
-                        extra_tags="safe",
-                    )
-                return reverse_lazy("dashboard")
-            else:
-                return reverse_lazy(
-                    "onboarding-class",
-                    kwargs={"access_code": classes[0].access_code},
-                )
-
-        else:
-            return reverse_lazy("onboarding-classes")
+        link = reverse("two_factor:profile")
+        if not _using_two_factor(request.user):
+            messages.info(
+                request,
+                (
+                    "You are not currently set up with two-factor authentication. "
+                    + "Use your phone or tablet to enhance your account’s security.</br>"
+                    + "Click <a href='"
+                    + link
+                    + "'>here</a> to find out more and "
+                    + "set it up or go to your account page at any time."
+                ),
+                extra_tags="safe",
+            )
+        return reverse_lazy("dashboard")
     else:
         return reverse_lazy("onboarding-organisation")
 
 
 @cache_control(private=True)
 def home(request):
+    # Putting this in a try catch because it causes some weird issue in the
+    # 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"
+        )
+
+        if maintenance_banner.active:
+            messages.info(
+                request, format_html(maintenance_banner.text), extra_tags="safe"
+            )
+    except ObjectDoesNotExist:
+        pass
+
     """
     This view is where we can add any messages to be shown upon loading the home page.
     Following this format:
@@ -255,9 +261,32 @@ def home(request):
     return render(request, "portal/home.html")
 
 
+def coding_club(request):
+    return render(
+        request, "portal/coding_club.html", {"BANNER": CODING_CLUB_BANNER}
+    )
+
+
 def home_learning(request):
     return render(
         request,
         "portal/home_learning.html",
         {"HOME_LEARNING_BANNER": HOME_LEARNING_BANNER},
     )
+
+
+def ten_year_map_page(request):
+    messages.info(
+        request, "This page is currently under construction.", extra_tags="safe"
+    )
+    return render(
+        request,
+        "portal/ten_year_map.html",
+        {"BANNER": TEN_YEAR_MAP_BANNER, "HEADLINE": TEN_YEAR_MAP_HEADLINE},
+    )
+
+
+def reset_screentime_warning(request):
+    if request.user.is_authenticated:
+        request.session["last_screentime_warning"] = timezone.now().timestamp()
+    return HttpResponse(status=204)  # No content

portal/views/legal.py

@@ -0,0 +1,13 @@
+from django.shortcuts import render
+
+
+def privacy_notice(request):
+    return render(
+        request,
+        "portal/privacy_notice.html",
+        {"last_updated": "19th March 2025", "last_updated_children": "19th March 2025"},
+    )
+
+
+def terms(request):
+    return render(request, "portal/terms.html", {"last_updated": "11th July 2022"})

portal/views/login/independent_student.py

@@ -36,9 +36,9 @@ class IndependentStudentLoginView(LoginView):
         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")
-        if Student.objects.filter(new_user__username=username).exists():
-            student = Student.objects.get(new_user__username=username)
+        email = request.POST.get("username")
+        if Student.objects.filter(new_user__email=email).exists():
+            student = Student.objects.get(new_user__email=email)
 
             if student.blocked_time is not None:
                 if has_user_lockout_expired(student):
@@ -60,8 +60,8 @@ class IndependentStudentLoginView(LoginView):
         clear_ratelimit_cache_for_user(form.cleaned_data["username"])
 
         # Log the login time
-        username = self.request.POST.get("username")
-        user = User.objects.get(username=username)
+        email = self.request.POST.get("username")
+        user = User.objects.get(email=email)
         session = UserSession(user=user)
         session.save()
 

portal/views/login/student.py

@@ -3,14 +3,14 @@ from django.contrib import messages
 from django.contrib.auth import authenticate, login
 from django.contrib.auth.views import LoginView, FormView
 from django.http import HttpResponseRedirect
+from django.shortcuts import render
 from django.urls import reverse_lazy
 from django.utils.html import escape
 
 from portal.forms.play import StudentLoginForm, StudentClassCodeForm
-
-import logging
-
-LOGGER = logging.getLogger(__name__)
+from portal.helpers.ratelimit import clear_ratelimit_cache_for_user
+from portal.helpers.request_handlers import get_access_code_from_request
+from portal.views.login import has_user_lockout_expired
 
 
 class StudentClassCodeView(FormView):
@@ -47,7 +47,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",
         )
 
@@ -71,12 +72,7 @@ class StudentLoginView(LoginView):
         students = Student.objects.filter(
             new_user__first_name__iexact=name, class_field=klass
         )
-        try:
-            student = students[0]
-        except IndexError:
-            msg = f"Student {name} in class {class_code} is not found!"
-            LOGGER.error(msg)
-            raise Exception(msg)
+        student = students[0]
 
         # Log the login time, class, and login type
         session = UserSession(
@@ -84,16 +80,53 @@ class StudentLoginView(LoginView):
         )
         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["login_type"]
-        if not login_type:
-            login_type = "classlink"  # default 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.
+        """
+        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.blocked_time is not None:
+                if has_user_lockout_expired(student):
+                    student.blocked_time = None
+                    student.save()
+                else:
+                    return render(
+                        self.request,
+                        "portal/locked_out_school_student.html",
+                        {"is_teacher": False},
+                    )
+
+        return super(StudentLoginView, self).post(request, *args, **kwargs)
+
 
 def student_direct_login(request, user_id, login_id):
     """Direct login for student with unique url without username and password"""
@@ -108,5 +141,9 @@ def student_direct_login(request, user_id, login_id):
         session.save()
 
         login(request, user)
+
+        student.user.is_verified = True
+        student.user.save()
+
         return HttpResponseRedirect(reverse_lazy("student_details"))
     return HttpResponseRedirect(reverse_lazy("home"))

portal/views/login/teacher.py

@@ -1,7 +1,5 @@
 from common.models import Teacher
-from common.permissions import logged_in_as_teacher
-from django.shortcuts import redirect, render
-from django.urls import reverse_lazy
+from django.shortcuts import render
 from two_factor.views import LoginView
 from two_factor.forms import AuthenticationTokenForm, BackupTokenForm
 
@@ -23,9 +21,7 @@ class TeacherLoginView(LoginView):
 
     def get_success_url(self):
         url = self.get_redirect_url()
-        return url or redirect_teacher_to_correct_page(
-            self.request, self.request.user.userprofile.teacher
-        )
+        return url or redirect_teacher_to_correct_page(self.request, self.request.user.userprofile.teacher)
 
     def post(self, request, *args, **kwargs):
         """