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

portal/forms/play.py

@@ -1,8 +1,6 @@
 import re
-from datetime import timedelta
+from datetime import timedelta, date
 
-from captcha.fields import ReCaptchaField
-from captcha.widgets import ReCaptchaV2Invisible
 from common.helpers.emails import send_verification_email
 from common.models import Class, Student, stripStudentName
 from common.permissions import logged_in_as_independent_student
@@ -10,21 +8,17 @@ from django import forms
 from django.contrib.auth import authenticate
 from django.contrib.auth.forms import AuthenticationForm
 from django.utils import timezone
+from django_recaptcha.fields import ReCaptchaField
+from django_recaptcha.widgets import ReCaptchaV2Invisible
 
 from portal.forms.error_messages import INVALID_LOGIN_MESSAGE
 from portal.helpers.password import PasswordStrength, form_clean_password
 from portal.helpers.regexes import ACCESS_CODE_PATTERN
-from portal.templatetags.app_tags import is_verified
 
 
 class StudentClassCodeForm(forms.Form):
     access_code = forms.CharField(
-        widget=forms.TextInput(
-            attrs={
-                "autocomplete": "off",
-                "placeholder": "Class code",
-            }
-        ),
+        widget=forms.TextInput(attrs={"autocomplete": "off", "placeholder": "Class code"}),
         help_text="Enter your class code",
     )
 
@@ -33,30 +27,18 @@ class StudentClassCodeForm(forms.Form):
 
         if access_code:
             if re.fullmatch(ACCESS_CODE_PATTERN, access_code.upper()) is None:
-                raise forms.ValidationError(
-                    "Uh oh! You didn't input a valid class code."
-                )
+                raise forms.ValidationError("Uh oh! You didn't input a valid class code.")
 
         return self.cleaned_data
 
 
 class StudentLoginForm(AuthenticationForm):
     username = forms.CharField(
-        widget=forms.TextInput(
-            attrs={
-                "autocomplete": "off",
-                "placeholder": "Username",
-            }
-        ),
+        widget=forms.TextInput(attrs={"autocomplete": "off", "placeholder": "Username"}),
         help_text="Enter your username",
     )
     password = forms.CharField(
-        widget=forms.PasswordInput(
-            attrs={
-                "autocomplete": "off",
-                "placeholder": "Password",
-            }
-        ),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Password"}),
         help_text="Enter your password",
     )
 
@@ -69,7 +51,6 @@ class StudentLoginForm(AuthenticationForm):
         password = self.cleaned_data.get("password", None)
 
         if name and self.access_code and password:
-
             student, user = self.check_for_errors(name, self.access_code, password)
 
             self.student = student
@@ -84,16 +65,12 @@ class StudentLoginForm(AuthenticationForm):
 
         name = stripStudentName(name)
 
-        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)
         if len(students) != 1:
             raise forms.ValidationError("Invalid name, class access code or password")
 
         student = students[0]
-        user = authenticate(
-            username=student.new_user.username, password=password.lower()
-        )
+        user = authenticate(username=student.new_user.username, password=password.lower())
 
         # Try the case sensitive password too, for previous accounts that don't have the lowercase one stored
         if user is None:
@@ -110,16 +87,16 @@ class StudentLoginForm(AuthenticationForm):
 class StudentEditAccountForm(forms.Form):
     password = forms.CharField(
         required=True,
-        widget=forms.PasswordInput(attrs={"placeholder": "New password"}),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "New password"}),
         help_text="Enter new password",
     )
     confirm_password = forms.CharField(
         required=True,
-        widget=forms.PasswordInput(attrs={"placeholder": "Confirm new password"}),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Confirm new password"}),
         help_text="Confirm new password",
     )
     current_password = forms.CharField(
-        widget=forms.PasswordInput(attrs={"placeholder": "Current password"}),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Current password"}),
         help_text="Enter your current password",
     )
 
@@ -138,28 +115,28 @@ class IndependentStudentEditAccountForm(forms.Form):
     name = forms.CharField(
         max_length=100,
         required=False,
-        widget=forms.TextInput(attrs={"placeholder": "Name"}),
+        widget=forms.TextInput(attrs={"autocomplete": "off", "placeholder": "Name"}),
         help_text="Enter your name",
     )
     email = forms.EmailField(
         required=False,
-        widget=forms.EmailInput(attrs={"placeholder": "New email address (optional)"}),
+        widget=forms.EmailInput(attrs={"autocomplete": "off", "placeholder": "New email address (optional)"}),
         help_text="Enter new email address (optional)",
     )
     password = forms.CharField(
         required=False,
-        widget=forms.PasswordInput(attrs={"placeholder": "New password (optional)"}),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "New password (optional)"}),
         help_text="Enter new password (optional)",
     )
     confirm_password = forms.CharField(
         label="Confirm new password",
         required=False,
-        widget=forms.PasswordInput(attrs={"placeholder": "Confirm new password"}),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Confirm new password"}),
         help_text="Confirm new password",
     )
     current_password = forms.CharField(
         label="Current password",
-        widget=forms.PasswordInput(attrs={"placeholder": "Current password"}),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Current password"}),
         help_text="Enter your current password",
     )
 
@@ -174,9 +151,7 @@ class IndependentStudentEditAccountForm(forms.Form):
                 raise forms.ValidationError("This field is required")
 
             if re.match(re.compile("^[\w ]+$"), name) is None:
-                raise forms.ValidationError(
-                    "Names may only contain letters, numbers, dashes, underscores, and spaces."
-                )
+                raise forms.ValidationError("Names may only contain letters, numbers, dashes, underscores, and spaces.")
 
         return name
 
@@ -215,45 +190,36 @@ def are_password_and_confirm_password_different(password, confirm_password):
 
 
 class IndependentStudentSignupForm(forms.Form):
-    name = forms.CharField(
-        max_length=100,
-        help_text="Enter full name",
-        widget=forms.TextInput(
-            attrs={"autocomplete": "off", "placeholder": "Full name"}
+    date_of_birth = forms.DateField(
+        help_text="Please enter your date of birth (we do not store this information).",
+        widget=forms.SelectDateWidget(
+            years=range(date.today().year, date.today().year - 100, -1), empty_label=("Year", "Month", "Day")
         ),
+        required=False,
     )
 
-    username = forms.CharField(
+    name = forms.CharField(
         max_length=100,
-        help_text="Enter a username",
-        widget=forms.TextInput(
-            attrs={"autocomplete": "off", "placeholder": "Username"}
-        ),
+        help_text="Enter full name",
+        widget=forms.TextInput(attrs={"autocomplete": "off", "placeholder": "Full name"}),
     )
 
     email = forms.EmailField(
         help_text="Enter your email address",
-        widget=forms.EmailInput(
-            attrs={"autocomplete": "off", "placeholder": "Email address"}
-        ),
+        widget=forms.EmailInput(attrs={"autocomplete": "off", "placeholder": "Email address"}),
     )
 
-    newsletter_ticked = forms.BooleanField(initial=False, required=False)
-
-    is_over_required_age = forms.BooleanField(initial=False, required=True)
+    consent_ticked = forms.BooleanField(widget=forms.CheckboxInput(), initial=False, required=True)
+    newsletter_ticked = forms.BooleanField(widget=forms.CheckboxInput(), initial=False, required=False)
 
     password = forms.CharField(
         help_text="Enter a password",
-        widget=forms.PasswordInput(
-            attrs={"autocomplete": "off", "placeholder": "Password"}
-        ),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Password"}),
     )
 
     confirm_password = forms.CharField(
         help_text="Repeat password",
-        widget=forms.PasswordInput(
-            attrs={"autocomplete": "off", "placeholder": "Repeat password"}
-        ),
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Repeat password"}),
     )
 
     captcha = ReCaptchaField(widget=ReCaptchaV2Invisible)
@@ -261,22 +227,10 @@ class IndependentStudentSignupForm(forms.Form):
     def clean_name(self):
         name = self.cleaned_data.get("name", None)
         if re.match(re.compile("^[\w ]+$"), name) is None:
-            raise forms.ValidationError(
-                "Names may only contain letters, numbers, dashes, underscores, and spaces."
-            )
+            raise forms.ValidationError("Names may only contain letters, numbers, dashes, underscores, and spaces.")
 
         return name
 
-    def clean_username(self):
-        username = self.cleaned_data.get("username", None)
-
-        if re.match(re.compile("[\w]+"), username) is None:
-            raise forms.ValidationError(
-                "Usernames may only contain letters, numbers, dashes, and underscores."
-            )
-
-        return username
-
     def clean_password(self):
         return form_clean_password(self, "password", PasswordStrength.INDEPENDENT)
 
@@ -291,8 +245,14 @@ class IndependentStudentSignupForm(forms.Form):
 
 
 class IndependentStudentLoginForm(AuthenticationForm):
-    username = forms.CharField(label="Username", widget=forms.TextInput())
-    password = forms.CharField(label="Password", widget=forms.PasswordInput())
+    username = forms.EmailField(
+        widget=forms.EmailInput(attrs={"autocomplete": "off", "placeholder": "Email address"}),
+        help_text="Enter your email address",
+    )
+    password = forms.CharField(
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Password"}),
+        help_text="Enter your password",
+    )
 
     def clean(self):
         super().clean()
@@ -301,8 +261,8 @@ class IndependentStudentLoginForm(AuthenticationForm):
         if not logged_in_as_independent_student(user):
             self.show_invalid_login_message()
 
-        if not is_verified(user):
-            send_verification_email(self.request, user)
+        if not user.userprofile.is_verified:
+            send_verification_email(self.request, user, self.data)
             self.show_invalid_login_message()
 
     def get_invalid_login_error(self):
@@ -313,28 +273,23 @@ class IndependentStudentLoginForm(AuthenticationForm):
 
 
 class StudentJoinOrganisationForm(forms.Form):
-    access_code = forms.CharField(
-        label="Class Access Code",
-        widget=forms.TextInput(attrs={"placeholder": "AB123"}),
-    )
+    access_code = forms.CharField(label="Class Access Code", widget=forms.TextInput(attrs={"placeholder": "AB123"}))
 
     def clean(self):
         access_code = self.cleaned_data.get("access_code", None)
+        join_error_text = "The class code you entered either does not exist or is not currently accepting join requests. Please double check that you have entered the correct class code and contact the teacher of the class to ensure their class is currently accepting join requests."
 
         if access_code:
             classes = Class.objects.filter(access_code=access_code)
             if len(classes) != 1:
-                raise forms.ValidationError(
-                    "Cannot find the school or club and/or class"
-                )
+                raise forms.ValidationError(join_error_text)
+
             self.klass = classes[0]
-            if not self.klass.always_accept_requests:
-                if self.klass.accept_requests_until is None:
-                    raise forms.ValidationError(
-                        "Cannot find the school or club and/or class"
-                    )
-                elif (self.klass.accept_requests_until - timezone.now()) < timedelta():
-                    raise forms.ValidationError(
-                        "Cannot find the school or club and/or class"
-                    )
+
+            if not self.klass.always_accept_requests and (
+                self.klass.accept_requests_until is None
+                or self.klass.accept_requests_until - timezone.now()
+                < timedelta()
+            ):
+                raise forms.ValidationError(join_error_text)
         return self.cleaned_data

portal/forms/registration.py

@@ -1,16 +1,15 @@
-from captcha.fields import ReCaptchaField
-from captcha.widgets import ReCaptchaV2Invisible
+from common.mail import campaign_ids, send_dotdigital_email
 from common.models import Student, Teacher
 from django import forms
 from django.contrib.auth import forms as django_auth_forms
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import User
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.sites.shortcuts import get_current_site
-from django.core.mail import EmailMultiAlternatives
-from django.template import loader
+from django.urls import reverse_lazy
 from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_encode
+from django_recaptcha.fields import ReCaptchaField
+from django_recaptcha.widgets import ReCaptchaV2Invisible
 
 from portal.helpers.password import PasswordStrength, form_clean_password
 
@@ -20,8 +19,10 @@ class TeacherPasswordResetSetPasswordForm(django_auth_forms.SetPasswordForm):
         super(TeacherPasswordResetSetPasswordForm, self).__init__(user, *args, **kwargs)
         self.fields["new_password1"].help_text = "Enter your new password"
         self.fields["new_password1"].widget.attrs["placeholder"] = "New password"
+        self.fields["new_password1"].widget.attrs["autocomplete"] = "off"
         self.fields["new_password2"].help_text = "Confirm your new password"
         self.fields["new_password2"].widget.attrs["placeholder"] = "Confirm password"
+        self.fields["new_password2"].widget.attrs["autocomplete"] = "off"
 
     def clean_new_password1(self):
         return form_clean_password(self, "new_password1", PasswordStrength.TEACHER)
@@ -32,69 +33,33 @@ class StudentPasswordResetSetPasswordForm(django_auth_forms.SetPasswordForm):
         super(StudentPasswordResetSetPasswordForm, self).__init__(user, *args, **kwargs)
         self.fields["new_password1"].help_text = "Enter your new password"
         self.fields["new_password1"].widget.attrs["placeholder"] = "New password"
+        self.fields["new_password1"].widget.attrs["autocomplete"] = "off"
         self.fields["new_password2"].help_text = "Confirm your new password"
         self.fields["new_password2"].widget.attrs["placeholder"] = "Confirm password"
+        self.fields["new_password2"].widget.attrs["autocomplete"] = "off"
 
     def clean_new_password1(self):
         return form_clean_password(self, "new_password1", PasswordStrength.INDEPENDENT)
 
 
-class TeacherPasswordResetForm(forms.Form):
+class PasswordResetForm(forms.Form):
     email = forms.EmailField(
-        widget=forms.EmailInput(
-            attrs={"autocomplete": "off", "placeholder": "Email address"}
-        ),
+        widget=forms.EmailInput(attrs={"autocomplete": "off", "placeholder": "Email address"}),
         help_text="Enter your email address",
     )
 
     captcha = ReCaptchaField(widget=ReCaptchaV2Invisible)
 
-    def clean_email(self):
-        email = self.cleaned_data.get("email", None)
-        self.username = ""
-        # Check such an email exists
-        if User.objects.filter(email=email).exists():
-            teacher = Teacher.objects.filter(new_user__email=email)
-            # Check such an email is associated with a teacher
-            if teacher.exists():
-                self.username = teacher[0].new_user.username
-
-        return email
-
-    def send_mail(
-        self,
-        subject_template_name,
-        email_template_name,
-        context,
-        from_email,
-        to_email,
-        html_email_template_name=None,
-    ):
-        """
-        Sends a django.core.mail.EmailMultiAlternatives to `to_email`.
-        """
-        subject = loader.render_to_string(subject_template_name, context)
-        # Email subject *must not* contain newlines
-        subject = "".join(subject.splitlines())
-        body = loader.render_to_string(email_template_name, context)
-
-        email_message = EmailMultiAlternatives(subject, body, from_email, [to_email])
-        if html_email_template_name is not None:
-            html_email = loader.render_to_string(html_email_template_name, context)
-            email_message.attach_alternative(html_email, "text/html")
-
-        email_message.send()
-
     def save(
         self,
         domain_override=None,
-        subject_template_name="registration/password_reset_subject.txt",
-        email_template_name="portal/reset_password_email.html",
+        subject_template_name=None,
+        email_template_name="portal/reset_password_email.txt",
         use_https=False,
         token_generator=default_token_generator,
         from_email=None,
         request=None,
-        html_email_template_name=None,
+        html_email_template_name="portal/reset_password_email.html",
     ):
         """
         Generates a one-use only link for resetting password and sends to the
@@ -102,9 +67,7 @@ class TeacherPasswordResetForm(forms.Form):
         """
         UserModel = get_user_model()
         if self.username:
-            active_users = UserModel._default_manager.filter(
-                username=self.username, is_active=True
-            )
+            active_users = UserModel._default_manager.filter(username=self.username, is_active=True)
             for user in active_users:
                 # Make sure that no email is sent to a user that actually has
                 # a password marked as unusable
@@ -112,128 +75,71 @@ class TeacherPasswordResetForm(forms.Form):
                     continue
                 if not domain_override:
                     current_site = get_current_site(request)
-                    site_name = current_site.name
                     domain = current_site.domain
                 else:
-                    site_name = domain = domain_override
-                context = {
-                    "email": user.email,
-                    "domain": domain,
-                    "site_name": site_name,
-                    "uid": urlsafe_base64_encode(force_bytes(user.pk)),
-                    "user": user,
-                    "token": token_generator.make_token(user),
-                    "protocol": compute_protocol(use_https),
-                }
-
-                self.send_mail(
-                    subject_template_name,
-                    email_template_name,
-                    context,
-                    from_email,
-                    user.email,
-                    html_email_template_name=html_email_template_name,
+                    domain = domain_override
+
+                reset_password_uri = reverse_lazy(
+                    "password_reset_check_and_confirm",
+                    kwargs={
+                        "uidb64": urlsafe_base64_encode(force_bytes(user.pk)),
+                        "token": token_generator.make_token(user),
+                    },
                 )
+                protocol = self._compute_protocol(use_https)
+                reset_password_url = f"{protocol}://{domain}{reset_password_uri}"
 
+                send_dotdigital_email(
+                    campaign_ids["reset_password"],
+                    [user.email],
+                    personalization_values={"RESET_PASSWORD_LINK": reset_password_url},
+                )
 
-class StudentPasswordResetForm(forms.Form):
-    username = forms.CharField(
-        widget=forms.TextInput(
-            attrs={"autocomplete": "off", "placeholder": "Username"}
-        ),
-        help_text="Enter your username",
-    )
+    def _compute_protocol(self, use_https):
+        return "https" if use_https else "http"
 
-    captcha = ReCaptchaField(widget=ReCaptchaV2Invisible)
 
-    def clean_username(self):
-        username = self.cleaned_data.get("username", None)
-        user_filter = User.objects.filter(username=username)
-        # Check such a username exists and such a username is not in use by a student part of a class/school
-        if (
-            not user_filter.exists()
-            or not Student.objects.filter(
-                class_field=None, new_user__username=username
-            ).exists()
-        ):
-            username = ""
-        return username
-
-    def send_mail(
-        self,
-        subject_template_name,
-        email_template_name,
-        context,
-        from_email,
-        to_email,
-        html_email_template_name=None,
-    ):
-        """
-        Sends a django.core.mail.EmailMultiAlternatives to `to_email`.
-        """
-        subject = loader.render_to_string(subject_template_name, context)
-        # Email subject *must not* contain newlines
-        subject = "".join(subject.splitlines())
-        body = loader.render_to_string(email_template_name, context)
+class TeacherPasswordResetForm(PasswordResetForm):
+    def clean_email(self):
+        email = self.cleaned_data.get("email", None)
+        self.username = ""
+        teacher = Teacher.objects.filter(new_user__email=email)
+        # Check such an email exists
+        if teacher.exists():
+            self.username = teacher[0].new_user.username
+        return email
 
-        email_message = EmailMultiAlternatives(subject, body, from_email, [to_email])
-        if html_email_template_name is not None:
-            html_email = loader.render_to_string(html_email_template_name, context)
-            email_message.attach_alternative(html_email, "text/html")
 
-        email_message.send()
+class StudentPasswordResetForm(PasswordResetForm):
+    def clean_email(self):
+        email = self.cleaned_data.get("email", None)
+        self.username = ""
+        student = Student.objects.filter(new_user__email=email)
+        # Check such an email exists
+        if student.exists():
+            self.username = student[0].new_user.username
+        return email
 
-    def save(
-        self,
-        domain_override=None,
-        subject_template_name="registration/password_reset_subject.txt",
-        email_template_name="portal/reset_password_email.html",
-        use_https=False,
-        token_generator=default_token_generator,
-        from_email=None,
-        request=None,
-        html_email_template_name=None,
-    ):
-        """
-        Generates a one-use only link for resetting password and sends to the
-        user.
-        """
-        UserModel = get_user_model()
-        username = self.cleaned_data["username"]
-        if username:
-            active_users = UserModel._default_manager.filter(
-                username=username, is_active=True
-            )
-            for user in active_users:
-                # Make sure that no email is sent to a user that actually has
-                # a password marked as unusable
-                if not user.has_usable_password():
-                    continue
-                if not domain_override:
-                    current_site = get_current_site(request)
-                    site_name = current_site.name
-                    domain = current_site.domain
-                else:
-                    site_name = domain = domain_override
-                context = {
-                    "email": user.email,
-                    "domain": domain,
-                    "site_name": site_name,
-                    "uid": urlsafe_base64_encode(force_bytes(user.pk)),
-                    "user": user,
-                    "token": token_generator.make_token(user),
-                    "protocol": compute_protocol(use_https),
-                }
-
-                self.send_mail(
-                    subject_template_name,
-                    email_template_name,
-                    context,
-                    from_email,
-                    user.email,
-                    html_email_template_name=html_email_template_name,
-                )
 
+class DeleteAccountForm(forms.Form):
+    delete_password = forms.CharField(
+        required=True,
+        widget=forms.PasswordInput(attrs={"autocomplete": "off", "placeholder": "Confirm password"}),
+        help_text="Confirm password",
+    )
+
+    unsubscribe_newsletter = forms.BooleanField(
+        label="Please remove me from the newsletter and marketing emails too.",
+        widget=forms.CheckboxInput(),
+        initial=True,
+        required=False,
+    )
+
+    def __init__(self, user, *args, **kwargs):
+        self.user = user
+        super(DeleteAccountForm, self).__init__(*args, **kwargs)
 
-def compute_protocol(use_https):
-    return "https" if use_https else "http"
+    def clean(self):
+        delete_password = self.cleaned_data.get("delete_password", None)
+        if not self.user.check_password(delete_password):
+            raise forms.ValidationError("Incorrect password")