codeforlife-portal 6.41.8__py2.py3-none-any.whl → 6.41.9__py2.py3-none-any.whl

cfl_common/common/email_messages.py

@@ -1,17 +1,4 @@
-from django.urls import reverse, reverse_lazy
-
-
-def resetEmailPasswordMessage(request, domain, uid, token, protocol):
-    password_reset_uri = reverse_lazy("password_reset_check_and_confirm", kwargs={"uidb64": uid, "token": token})
-    url = f"{protocol}://{domain}{password_reset_uri}"
-    return {
-        "subject": f"Password reset request",
-        "message": (
-            f"You are receiving this email because you requested "
-            f"a password reset for your Code For Life user account.\n\n"
-            f"Please go to the following page and choose a new password: {url}"
-        ),
-    }
+from django.urls import reverse
 
 
 def userAlreadyRegisteredEmail(request, email, is_independent_student=False):

cfl_common/common/mail.py

@@ -7,6 +7,7 @@ from common import app_settings
 campaign_ids = {
     "email_change_notification": 1551600,
     "email_change_verification": 1551594,
+    "reset_password": 1557153,
     "verify_new_user": 1551577,
     "verify_new_user_first_reminder": 1557170,
     "verify_new_user_second_reminder": 1557173,

cfl_common/common/tests/utils/email.py

@@ -1,4 +1,3 @@
-import re
 from builtins import str
 
 
@@ -35,9 +34,7 @@ def _follow_duplicate_account_email_link(page, email):
     page.browser.get(message[i:j])
 
 
-def follow_reset_email_link(browser, email):
-    message = str(email.body)
-    link = re.search("http.+/", message).group(0)[:-1]
+def follow_reset_email_link(browser, link):
     browser.get(link)
 
     from portal.tests.pageObjects.portal.password_reset_form_page import (

{codeforlife_portal-6.41.8.dist-info → codeforlife_portal-6.41.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 6.41.8
+Version: 6.41.9
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Framework :: Django
@@ -25,7 +25,7 @@ Requires-Dist: sqlparse ==0.4.4
 Requires-Dist: libsass ==0.22.0
 Requires-Dist: phonenumbers ==8.12.12
 Requires-Dist: more-itertools ==8.7.0
-Requires-Dist: cfl-common ==6.41.8
+Requires-Dist: cfl-common ==6.41.9
 Requires-Dist: django-ratelimit ==3.0.1
 Requires-Dist: django-preventconcurrentlogins ==0.8.2
 Requires-Dist: django-csp ==3.7

{codeforlife_portal-6.41.8.dist-info → codeforlife_portal-6.41.9.dist-info}/RECORD

@@ -5,8 +5,8 @@ cfl_common/common/app_settings.py,sha256=x2ROLY5Xl5LgqjxyTiChZvQorZYUXpFzEkaLsjh
 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=sZT6s9zMT5FFIqNODsURT0ifxbDgXpDlki8UxaBq2iE,2940
-cfl_common/common/email_messages.py,sha256=res-Uh_0KihJdvXKZg9EbvQ4ohQwS2rlR2wNHcazLoo,5009
-cfl_common/common/mail.py,sha256=EsqghHcRbrvCHI-eVcd88PrVVvsz1ZMbUzHrWne3nyE,4192
+cfl_common/common/email_messages.py,sha256=DRiz6MCKUGdFsC-pN9EwFqzPhpzMWXaT9HPcji1BkvE,4437
+cfl_common/common/mail.py,sha256=5iwvedYfaJUv7v8vVpV1kyBtnw04EJhHPy3FRGI9WHM,4223
 cfl_common/common/models.py,sha256=vnvy8U-sHopyaxgJK9wTxelbKsCnYMjuEu3HIuAEkrs,14974
 cfl_common/common/permissions.py,sha256=gC6RQGZI2QDBbglx-xr_V4Hl2C2nf1V2_uPmEuoEcJo,2416
 cfl_common/common/utils.py,sha256=Nn2Npao9Uqad5Js_IdHwF-ow6wrPNpBLW4AO1LxoEBc,1727
@@ -72,7 +72,7 @@ cfl_common/common/tests/test_migration_remove_teacher_title.py,sha256=wwm6tayb75
 cfl_common/common/tests/test_models.py,sha256=xMdzonW5CADMjas_zfg8V1YPQpUetleyn6TE95hbO9k,3723
 cfl_common/common/tests/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cfl_common/common/tests/utils/classes.py,sha256=ZA2pp9Pyx3rwi0VFwtuUA2Pys9xQJ-L_zE0u2tpwEH4,1094
-cfl_common/common/tests/utils/email.py,sha256=lNLl1SoQUnRAI0Z7nuaUS8HQwt9YHVc-YB9rqdYzyrw,2190
+cfl_common/common/tests/utils/email.py,sha256=x3DjWCT997wwj33YuiA3mDqkNahr63zVmz_mX7XIomo,2094
 cfl_common/common/tests/utils/organisation.py,sha256=vNgKFtU3VPcWRnZfh82yCS90PLAK1XTYJNIxGwfgUI4,966
 cfl_common/common/tests/utils/student.py,sha256=XlgWT0TdbIY6w9uB4SqOoXmhxxCRnucEcPY9Q5Xva0U,4415
 cfl_common/common/tests/utils/teacher.py,sha256=kY9LuP1mTEj_andYxF9k54xEHiJ36a6dokHxA9cB9f0,2500
@@ -100,7 +100,7 @@ example_project/portal_test_settings.py,sha256=fkbeU36YhWvNbR_hm28Rq4pV6ln-dGHK1
 example_project/settings.py,sha256=GLelTfsnhAuf_rqjXUoIWoLtzKvr-9l8UQDQ23rxPQc,5580
 example_project/urls.py,sha256=OVeRQ-TCpzHISBRuzqD0yd3ewF7H5U3c-f2p2alfUD0,430
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=pyl7O78P7TAJri2pK5Y-iTzCD_xdXYcgFo2SPmfimVk,23
+portal/__init__.py,sha256=nAOTZ1PFPrTXtaItbh3AKoAgKP-NWvT-PzlyaRCQ8gE,23
 portal/admin.py,sha256=k5Hsiln43DlVPoufnrx5AXWu_RijX8xi_n7wwBuuCJo,5132
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -118,7 +118,7 @@ portal/forms/error_messages.py,sha256=8d3z_3e2L-5zwj5hFhnUByC5k2CEpIVVuJg2nYkCUQ
 portal/forms/invite_teacher.py,sha256=jkDNcCfkts4_lXRzhcI3xBam21Zn2yX9wMpMVhDtW1w,880
 portal/forms/organisation.py,sha256=QcQyd7AiqBmvt4y8uQSQylguUbKOKqo2pjqWIkpWjDg,7433
 portal/forms/play.py,sha256=IO0gfKfTv7lXEN1K9w0XG8vY-55obBqLpiEBWaUluZ8,11351
-portal/forms/registration.py,sha256=xNNu_5FH8UaoX5hULVpT4ml7J1djCvjivXcu7VdCC2E,6245
+portal/forms/registration.py,sha256=gWcY7rllhWO3c9as6QHUDWZx1Jme7DqtGHYaKcvxe-U,5990
 portal/forms/teach.py,sha256=-3dMQxIQtYq2xg5DgtIJMpN7RajNhTvc56Clr5QjsHo,20440
 portal/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/helpers/captcha.py,sha256=Amwg3HZ9eIh1LGYVYWYruk1ccNj6P3nYP_evufOY8BY,254
@@ -538,16 +538,16 @@ portal/tests/test_class.py,sha256=V6Fkc6PqdisefKD3xs9PbfE2pKp-9e0gwQVkPUiu6bk,14
 portal/tests/test_daily_activities.py,sha256=-siDCMGBD1ijjccHVk7eEmrk4bgTsvbh0B6hDoj2fo0,1803
 portal/tests/test_emails.py,sha256=-rI3FlJO7n9qfZ8Vz_Fe3DmjOngr4r23PCpjIoRxNY0,9133
 portal/tests/test_helper_methods.py,sha256=-SQCDZm2XUtyXGEp0CHIb_SSC9CPD-XOSnpnY8QclHk,890
-portal/tests/test_independent_student.py,sha256=Kl2dyZh6-4TdlwWpsi2w1q54SoC_P2YWEvjJXrd6LdY,25857
+portal/tests/test_independent_student.py,sha256=ysWpkYiwjPdB7gO3ow-5JuxqLi0IywRSxG1s3rKzTK0,26282
 portal/tests/test_invite_teacher.py,sha256=oeOaoJV1IqJSYPlaPFjnhVXdB2mq8otCTLp_lfjuCfk,12224
 portal/tests/test_middleware.py,sha256=b6jfNmiRZ2snqLKsyJUG-RivoX5fmrqLlQkG9MeVnqM,8034
 portal/tests/test_newsletter_footer.py,sha256=MdVUX53mEoDTa4Krq-jg9LFNo-QyghqvTvhHeNXBGnE,838
 portal/tests/test_organisation.py,sha256=fOtck-0MkPM2F0V4RFH-QUeWEk6yUIXDv_GI5cl8sdg,7649
 portal/tests/test_partials.py,sha256=ydh1nef6BqvMfah2BSBS9QDiKY0xopY74k_W1YVobAE,3687
-portal/tests/test_ratelimit.py,sha256=-nlQHOT0Mk_9IKnKYa_t82Y6EL6oZD8uVZ5rof4C1O0,19144
+portal/tests/test_ratelimit.py,sha256=XWq1A9XgRrlcMHibGoJ0kc4gLc5U_u5UhKHjthxCfYA,19376
 portal/tests/test_school_student.py,sha256=bFZwY4twaFHQLp0cltMq8cLNDZGgCHTZBCZHK0JcV8s,8604
 portal/tests/test_security.py,sha256=FGrlRfnzi-Xx2_bn4fTZlYORKm7w_GhGkD3havvplwc,3239
-portal/tests/test_teacher.py,sha256=mft_xw97AkNi5OGprafpMMdGM1L1J_sMedBBg_Unb9k,36139
+portal/tests/test_teacher.py,sha256=_VmQCWq07uCFbvq6Vd7GN00mE7vY7WNMeQTk6bHxFPI,36898
 portal/tests/test_teacher_student.py,sha256=NWITbUw1kijqu3c8eRHLHJKaYQMOsOMvl7PAVx5QghI,21567
 portal/tests/test_views.py,sha256=6y4ICpo5KPTWQed3J1Hg74ZGBKI2y3-HNHAowOsge80,38769
 portal/tests/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -636,8 +636,8 @@ portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 portal/views/two_factor/core.py,sha256=O_wcBeFqdPYSGNGv-pT_vbs5-Dj1Z-Jfkd6f9-E5yZI,760
 portal/views/two_factor/form.py,sha256=lnHNKI-BMlpncTuW3zUzjPaJJNuEra2I_nOam0eOKFY,257
 portal/views/two_factor/profile.py,sha256=tkl_ludo8arMtd5LKNmohM66vpC_YQiP-0nspTSJiJ4,383
-codeforlife_portal-6.41.8.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-6.41.8.dist-info/METADATA,sha256=KJ07q2JnnR-2DEPePhUc1DtBIp_-1aj6lxsj8WgQRbw,1169
-codeforlife_portal-6.41.8.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-codeforlife_portal-6.41.8.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-6.41.8.dist-info/RECORD,,
+codeforlife_portal-6.41.9.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-6.41.9.dist-info/METADATA,sha256=KJR7skjhTgCC6qAImEMgWNl5VRqDo4I4hpSNERjawsY,1169
+codeforlife_portal-6.41.9.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+codeforlife_portal-6.41.9.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-6.41.9.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "6.41.8"
+__version__ = "6.41.9"

portal/forms/registration.py

@@ -1,15 +1,16 @@
 from captcha.fields import ReCaptchaField
 from captcha.widgets import ReCaptchaV2Invisible
-from common.email_messages import resetEmailPasswordMessage
-from common.helpers.emails import NOTIFICATION_EMAIL, send_email
+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.tokens import default_token_generator
 from django.contrib.sites.shortcuts import get_current_site
+from django.urls import reverse_lazy
 from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_encode
+
 from portal.helpers.password import PasswordStrength, form_clean_password
 
 
@@ -74,30 +75,24 @@ class PasswordResetForm(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": self._compute_protocol(use_https),
-                }
-
-                email_subject_content = resetEmailPasswordMessage(
-                    request, domain, context["uid"], context["token"], context["protocol"]
+                    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_email(
-                    NOTIFICATION_EMAIL,
+                send_dotdigital_email(
+                    campaign_ids["reset_password"],
                     [user.email],
-                    email_subject_content["subject"],
-                    email_subject_content["message"],
-                    email_subject_content["subject"],
+                    personalization_values={"RESET_PASSWORD_LINK": reset_password_url},
                 )
 
     def _compute_protocol(self, use_https):

portal/tests/test_independent_student.py

@@ -284,7 +284,8 @@ class TestIndependentStudentFrontend(BaseTest):
 
         assert self.is_dashboard(page)
 
-    def test_reset_password(self):
+    @patch("portal.forms.registration.send_dotdigital_email")
+    def test_reset_password(self, mock_send_dotdigital_email: Mock):
         page = self.go_to_homepage()
 
         page, name, username, _, _ = create_independent_student(page)
@@ -292,9 +293,13 @@ class TestIndependentStudentFrontend(BaseTest):
 
         page.reset_email_submit(username)
 
-        self.wait_for_email()
+        mock_send_dotdigital_email.assert_called_with(campaign_ids["reset_password"], ANY, personalization_values=ANY)
 
-        page = email_utils.follow_reset_email_link(self.selenium, mail.outbox[0])
+        reset_password_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"][
+            "RESET_PASSWORD_LINK"
+        ]
+
+        page = email_utils.follow_reset_email_link(self.selenium, reset_password_url)
 
         new_password = "AnotherPassword12"
 
@@ -312,14 +317,13 @@ class TestIndependentStudentFrontend(BaseTest):
         page = page.go_to_account_page()
         assert page.check_account_details({"name": name})
 
-    def test_reset_password_fail(self):
+    @patch("portal.forms.registration.send_dotdigital_email")
+    def test_reset_password_fail(self, mock_send_dotdigital_email: Mock):
         page = self.get_to_forgotten_password_page()
         fake_email = "fake_email@fakeemail.com"
         page.reset_email_submit(fake_email)
 
-        time.sleep(5)
-
-        assert len(mail.outbox) == 0
+        mock_send_dotdigital_email.assert_not_called()
 
     def test_update_name_success(self):
         homepage = self.go_to_homepage()

portal/tests/test_ratelimit.py

@@ -326,7 +326,8 @@ class TestRatelimit(TestCase):
 
         assert get_ratelimit_count_for_user(email) == 1
 
-    def test_teacher_reset_password_unblocks_user(self):
+    @patch("portal.forms.registration.send_dotdigital_email")
+    def test_teacher_reset_password_unblocks_user(self, mock_send_dotdigital_email: Mock):
         """
         Given a blocked teacher,
         When they reset they password,
@@ -344,15 +345,17 @@ class TestRatelimit(TestCase):
         # Ask for reset password link
         self._reset_password_request(email)
 
-        assert len(mail.outbox) == 1
+        mock_send_dotdigital_email.assert_called_once_with(
+            campaign_ids["reset_password"], ANY, personalization_values=ANY
+        )
 
-        # Get reset link from email
-        message = str(mail.outbox[0].body)
-        url = re.search("http.+/", message).group(0)
+        reset_password_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"][
+            "RESET_PASSWORD_LINK"
+        ]
 
         new_password = "AnotherPassword12!"
 
-        self._reset_password(url, new_password)
+        self._reset_password(reset_password_url, new_password)
 
         login_response = self._teacher_login(email, new_password)
 

portal/tests/test_teacher.py

@@ -628,7 +628,8 @@ class TestTeacherFrontend(BaseTest):
 
         assert self.is_dashboard_page(page)
 
-    def test_reset_password(self):
+    @patch("portal.forms.registration.send_dotdigital_email")
+    def test_reset_password(self, mock_send_dotdigital_email: Mock):
         email, _ = signup_teacher_directly()
         create_organisation_directly(email)
         _, _, access_code = create_class_directly(email)
@@ -638,9 +639,13 @@ class TestTeacherFrontend(BaseTest):
 
         page.reset_email_submit(email)
 
-        self.wait_for_email()
+        mock_send_dotdigital_email.assert_called_with(campaign_ids["reset_password"], ANY, personalization_values=ANY)
 
-        page = email_utils.follow_reset_email_link(self.selenium, mail.outbox[0])
+        reset_password_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"][
+            "RESET_PASSWORD_LINK"
+        ]
+
+        page = email_utils.follow_reset_email_link(self.selenium, reset_password_url)
 
         new_password = "AnotherPassword12!"
 
@@ -650,7 +655,8 @@ class TestTeacherFrontend(BaseTest):
         page = HomePage(self.selenium).go_to_teacher_login_page().login(email, new_password)
         assert self.is_dashboard_page(page)
 
-    def test_reset_with_same_password(self):
+    @patch("portal.forms.registration.send_dotdigital_email")
+    def test_reset_with_same_password(self, mock_send_dotdigital_email: Mock):
         email, password = signup_teacher_directly()
         create_organisation_directly(email)
         _, _, access_code = create_class_directly(email)
@@ -660,23 +666,26 @@ class TestTeacherFrontend(BaseTest):
 
         page.reset_email_submit(email)
 
-        self.wait_for_email()
+        mock_send_dotdigital_email.assert_called_with(campaign_ids["reset_password"], ANY, personalization_values=ANY)
+
+        reset_password_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"][
+            "RESET_PASSWORD_LINK"
+        ]
 
-        page = email_utils.follow_reset_email_link(self.selenium, mail.outbox[0])
+        page = email_utils.follow_reset_email_link(self.selenium, reset_password_url)
 
         page.reset_password_fail(password)
 
         message = page.browser.find_element(By.CLASS_NAME, "errorlist")
         assert "Please choose a password that you haven't used before" in message.text
 
-    def test_reset_password_fail(self):
+    @patch("portal.forms.registration.send_dotdigital_email")
+    def test_reset_password_fail(self, mock_send_dotdigital_email: Mock):
         page = self.get_to_forgotten_password_page()
         fake_email = "fake_email@fakeemail.com"
         page.reset_email_submit(fake_email)
 
-        time.sleep(5)
-
-        assert len(mail.outbox) == 0
+        mock_send_dotdigital_email.assert_not_called()
 
     def test_admin_sees_all_school_classes(self):
         email, password = signup_teacher_directly()