codeforlife-portal 7.4.8__tar.gz → 8.0.0__tar.gz

{codeforlife-portal-7.4.8/codeforlife_portal.egg-info → codeforlife-portal-8.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 7.4.8
+Version: 8.0.0
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django

{codeforlife-portal-7.4.8 → codeforlife-portal-8.0.0/codeforlife_portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 7.4.8
+Version: 8.0.0
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django

{codeforlife-portal-7.4.8 → codeforlife-portal-8.0.0}/codeforlife_portal.egg-info/SOURCES.txt

@@ -349,8 +349,8 @@ portal/templates/404.html
 portal/templates/500.html
 portal/templates/email.html
 portal/templates/email.txt
-portal/templates/captcha/widget_v2_invisible.html
-portal/templates/captcha/includes/js_v2_invisible.html
+portal/templates/django_recaptcha/widget_v2_invisible.html
+portal/templates/django_recaptcha/includes/js_v2_invisible.html
 portal/templates/portal/about.html
 portal/templates/portal/base.html
 portal/templates/portal/base_no_userprofile.html

codeforlife-portal-8.0.0/codeforlife_portal.egg-info/requires.txt

@@ -0,0 +1,14 @@
+django-recaptcha==4.0.0
+pyyaml==6.0.2
+importlib-metadata==4.13.0
+reportlab==3.6.13
+django-formtools==2.5.1
+django-otp==1.5.4
+requests==2.32.2
+django-treebeard==4.7.1
+django-sekizai==4.1.0
+django-classy-tags==4.1.0
+phonenumbers==8.12.12
+django-ratelimit==3.0.1
+django-preventconcurrentlogins==0.8.2
+setuptools==74.0.0

{codeforlife-portal-7.4.8 → codeforlife-portal-8.0.0}/deploy/middleware/security.py

@@ -4,8 +4,8 @@ from django.middleware.security import SecurityMiddleware
 class CustomSecurityMiddleware(SecurityMiddleware):
     """
     Extends Django's Security Middleware.
-    See https://docs.djangoproject.com/en/3.2/_modules/django/middleware/security/ for
-    the source code, as well as https://docs.djangoproject.com/en/3.2/ref/middleware/#module-django.middleware.security
+    See https://docs.djangoproject.com/en/4.2/_modules/django/middleware/security/ for
+    the source code, as well as https://docs.djangoproject.com/en/4.2/ref/middleware/#module-django.middleware.security
     for docs on security middleware.
     """
 
@@ -13,10 +13,9 @@ class CustomSecurityMiddleware(SecurityMiddleware):
         """
         Extends the original security middleware to ensure the X-XSS-Protection header
         is set to 1.
+        https://docs.djangoproject.com/en/5.1/releases/4.0/#securitymiddleware-no-longer-sets-the-x-xss-protection-header
         """
         super().process_response(request, response)
-
-        if self.xss_filter:
-            response["X-XSS-Protection"] = "1"
+        response.headers.setdefault("X-XSS-Protection", "1; mode=block")
 
         return response

codeforlife-portal-8.0.0/portal/__init__.py

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

{codeforlife-portal-7.4.8 → codeforlife-portal-8.0.0}/portal/admin.py

@@ -12,7 +12,7 @@ from common.models import (
     UserProfile,
 )
 from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.admin import UserAdmin as _UserAdmin
 from django.contrib.auth.models import User
 from django.http import HttpResponse
 from import_export.admin import ExportActionMixin
@@ -172,38 +172,40 @@ class TotalActivityAdmin(admin.ModelAdmin, ExportActionMixin):
         return False
 
 
-def anonymise_user(user_admin, request, queryset):
-    for user in queryset:
-        anonymise(user)
+_UserAdmin.list_display += ("date_joined", "id")
+_UserAdmin.list_filter += ("date_joined",)
 
 
-def export_as_csv(self, request, queryset):
-    meta = self.model._meta
-    field_names = [
-        field.name for field in meta.fields if field.name != "password"
-    ]
+class UserAdmin(_UserAdmin):
+    actions = ["anonymise_user", "export_as_csv"]
+    add_form = AdminUserCreationForm
+    change_password_form = AdminChangeUserPasswordForm
 
-    response = HttpResponse(content_type="text/csv")
-    response["Content-Disposition"] = "attachment; filename={}.csv".format(meta)
-    writer = csv.writer(response)
+    def anonymise_user(self, request, queryset):
+        for user in queryset:
+            anonymise(user)
 
-    writer.writerow(field_names)
-    for obj in queryset:
-        writer.writerow([getattr(obj, field) for field in field_names])
+    anonymise_user.short_description = "Anonymise selected users"
 
-    return response
+    def export_as_csv(self, request, queryset):
+        meta = self.model._meta
+        field_names = [
+            field.name for field in meta.fields if field.name != "password"
+        ]
 
+        response = HttpResponse(content_type="text/csv")
+        response["Content-Disposition"] = "attachment; filename={}.csv".format(
+            meta
+        )
+        writer = csv.writer(response)
 
-anonymise_user.short_description = "Anonymise selected users"
-export_as_csv.short_description = "Export selected users data as CSV"
+        writer.writerow(field_names)
+        for obj in queryset:
+            writer.writerow([getattr(obj, field) for field in field_names])
 
+        return response
 
-UserAdmin.list_display += ("date_joined", "id")
-UserAdmin.list_filter += ("date_joined",)
-UserAdmin.add_form = AdminUserCreationForm
-UserAdmin.change_password_form = AdminChangeUserPasswordForm
-UserAdmin.actions.append(anonymise_user)
-UserAdmin.actions.append(export_as_csv)
+    export_as_csv.short_description = "Export selected users data as CSV"
 
 
 admin.site.register(Class, ClassAdmin)

{codeforlife-portal-7.4.8 → codeforlife-portal-8.0.0}/portal/forms/play.py

@@ -1,8 +1,6 @@
 import re
 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,6 +8,8 @@ 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

{codeforlife-portal-7.4.8 → codeforlife-portal-8.0.0}/portal/forms/registration.py

@@ -1,5 +1,3 @@
-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
@@ -10,6 +8,8 @@ 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 django_recaptcha.fields import ReCaptchaField
+from django_recaptcha.widgets import ReCaptchaV2Invisible
 
 from portal.helpers.password import PasswordStrength, form_clean_password
 

{codeforlife-portal-7.4.8 → codeforlife-portal-8.0.0}/portal/forms/teach.py

@@ -2,14 +2,14 @@ import itertools
 import re
 from builtins import map, range, str
 
-from captcha.fields import ReCaptchaField
-from captcha.widgets import ReCaptchaV2Invisible
 from common.helpers.emails import send_verification_email
 from common.models import Student, stripStudentName, UserSession, Teacher
 from django import forms
 from django.contrib.auth import authenticate
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.models import User
+from django_recaptcha.fields import ReCaptchaField
+from django_recaptcha.widgets import ReCaptchaV2Invisible
 from game.models import Episode
 
 from portal.forms.error_messages import INVALID_LOGIN_MESSAGE

{codeforlife-portal-7.4.8 → codeforlife-portal-8.0.0}/portal/helpers/decorators.py

@@ -1,28 +1,24 @@
 from __future__ import absolute_import
 
 import datetime
-import pytz
-import re
-
+from functools import wraps
 
+import pytz
 from common.models import Teacher, Student
 from django.contrib.auth import logout
 from django.shortcuts import render
-from functools import wraps
 from ratelimit import ALL, UNSAFE
 
 from portal.helpers.ratelimit import is_ratelimited
-from portal.templatetags.app_tags import is_logged_in
-from portal.views.registration import blocked_and_not_expired
-from portal.views.login import has_user_lockout_expired
-from portal.helpers.ratelimit import get_ratelimit_count_for_user
-
 from portal.helpers.request_handlers import get_access_code_from_request
+from portal.templatetags.app_tags import is_logged_in
 
 __all__ = ["ratelimit"]
 
 
-def ratelimit(group=None, key=None, rate=None, method=ALL, block=False, is_teacher=True):
+def ratelimit(
+    group=None, key=None, rate=None, method=ALL, block=False, is_teacher=True
+):
     """
     Ratelimit decorator, adding custom functionality to django-ratelimit's default
     decorator. On block, the user is logged out, redirected to the "locked out" page,
@@ -63,25 +59,29 @@ def ratelimit(group=None, key=None, rate=None, method=ALL, block=False, is_teach
 
                     access_code = get_access_code_from_request(request)
                     model_finder = model.objects.get
-                    # look for school student
-                    # if access code not found (AttributeError)
-                    # if student not found (IndexError)
-                    # move on to another try block
-                    # similar logic followed afterwards
+                    # look for school student if access code not found
+                    # (AttributeError) if student not found (IndexError) move
+                    # on to another try block similar logic followed afterwards
                     if access_code:
                         user_to_lockout = model_finder(
                             new_user__first_name=username,
                             class_field__access_code=access_code,  # extract the found text from regex
                         )
-                        lockout_template = "portal/locked_out_school_student.html"
+                        lockout_template = (
+                            "portal/locked_out_school_student.html"
+                        )
                     # look for indy student or teacher
                     else:
-                        user_to_lockout = model_finder(new_user__username=username)
+                        user_to_lockout = model_finder(
+                            new_user__username=username
+                        )
                 else:
                     user_to_lockout = model.objects.get(new_user=request.user)
 
                 if user_to_lockout:
-                    user_to_lockout.blocked_time = datetime.datetime.now(tz=pytz.utc)
+                    user_to_lockout.blocked_time = datetime.datetime.now(
+                        tz=pytz.utc
+                    )
                     user_to_lockout.save()
 
                     if is_logged_in(request.user):

{codeforlife-portal-7.4.8 → codeforlife-portal-8.0.0}/portal/helpers/password.py

@@ -1,16 +1,14 @@
+import hashlib
 import re
 from enum import Enum, auto
 
+import requests
 from django import forms
 from django.contrib.auth import update_session_auth_hash
 from django.contrib.auth.hashers import PBKDF2PasswordHasher as ph
 from django.core.exceptions import ValidationError
 
 
-import hashlib
-import requests
-
-
 def is_password_pwned(password):
     # Create SHA1 hash of the password
     sha1_hash = hashlib.sha1(password.encode()).hexdigest()
@@ -41,56 +39,56 @@ class PasswordStrength(Enum):
     TEACHER = auto()
 
     def password_test(self, password):
-        if self is PasswordStrength.STUDENT:
-            minimum_password_length = 6
-            # Make student password case insensitive
-            password = password.lower()
-            if password and not password_strength_test(
-                password=password,
-                minimum_password_length=minimum_password_length,
-                upper=False,
-                lower=False,
-                numbers=False,
-                special_char=False,
-            ):
-                raise forms.ValidationError(
-                    f"Password not strong enough, consider using at least {minimum_password_length} characters and making it hard to guess."
-                )
-            if is_password_pwned(password):
-                raise forms.ValidationError("Password is too common, consider using a different password.")
-
-        elif self is PasswordStrength.INDEPENDENT:
-            minimum_password_length = 8
-            if password and not password_strength_test(
-                password=password,
-                minimum_password_length=minimum_password_length,
-                upper=True,
-                lower=True,
-                numbers=True,
-                special_char=False,
-            ):
-                raise forms.ValidationError(
-                    f"Password not strong enough, consider using at least {minimum_password_length} characters, "
-                    "upper and lower case letters, and numbers and making it hard to guess."
-                )
-            if is_password_pwned(password):
-                raise forms.ValidationError("Password is too common, consider using a different password.")
-        else:
-            minimum_password_length = 10
-            if password and not password_strength_test(
-                password=password,
-                minimum_password_length=minimum_password_length,
-                upper=True,
-                lower=True,
-                numbers=True,
-                special_char=True,
-            ):
-                raise forms.ValidationError(
-                    f"Password not strong enough, consider using at least {minimum_password_length} characters, "
-                    "upper and lower case letters, numbers, special characters and making it hard to guess."
-                )
-            if is_password_pwned(password):
-                raise forms.ValidationError("Password is too common, consider using a different password.")
+        if password:
+            if self is PasswordStrength.STUDENT:
+                minimum_password_length = 6
+                # Make student password case insensitive
+                password = password.lower()
+                if not password_strength_test(
+                    password=password,
+                    minimum_password_length=minimum_password_length,
+                    upper=False,
+                    lower=False,
+                    numbers=False,
+                    special_char=False,
+                ):
+                    raise forms.ValidationError(
+                        f"Password not strong enough, consider using at least {minimum_password_length} characters and making it hard to guess."
+                    )
+                if is_password_pwned(password):
+                    raise forms.ValidationError("Password is too common, consider using a different password.")
+            elif self is PasswordStrength.INDEPENDENT:
+                minimum_password_length = 8
+                if not password_strength_test(
+                    password=password,
+                    minimum_password_length=minimum_password_length,
+                    upper=True,
+                    lower=True,
+                    numbers=True,
+                    special_char=False,
+                ):
+                    raise forms.ValidationError(
+                        f"Password not strong enough, consider using at least {minimum_password_length} characters, "
+                        "upper and lower case letters, and numbers and making it hard to guess."
+                    )
+                if is_password_pwned(password):
+                    raise forms.ValidationError("Password is too common, consider using a different password.")
+            else:
+                minimum_password_length = 10
+                if not password_strength_test(
+                    password=password,
+                    minimum_password_length=minimum_password_length,
+                    upper=True,
+                    lower=True,
+                    numbers=True,
+                    special_char=True,
+                ):
+                    raise forms.ValidationError(
+                        f"Password not strong enough, consider using at least {minimum_password_length} characters, "
+                        "upper and lower case letters, numbers, special characters and making it hard to guess."
+                    )
+                if is_password_pwned(password):
+                    raise forms.ValidationError("Password is too common, consider using a different password.")
 
         return password
 

{codeforlife-portal-7.4.8/portal/templates/captcha → codeforlife-portal-8.0.0/portal/templates/django_recaptcha}/includes/js_v2_invisible.html

@@ -1,8 +1,8 @@
-{# This is adapted from django-recaptcha 2.0.5 to work on multiple reCAPTCHA's on the same page #}
-{# See verifyCaptcha_{{ widget_uuid}} for the edit #}
+<!-- This is adapted from django-recaptcha 4.0.0 to work on multiple
+reCAPTCHA's on the same page
+See verifyCaptcha_{{ widget_uuid}} for the edit #} -->
 <script src="https://{{ recaptcha_domain }}/recaptcha/api.js{% if api_params %}?{{ api_params }}{% endif %}"></script>
 <script type="text/javascript">
-
     // Submit function to be called, after reCAPTCHA was successful.
     var onSubmit_{{ widget_uuid }} = function(token) {
         console.log("reCAPTCHA validated for 'data-widget-uuid=\"{{ widget_uuid }}\"'. Submitting form...")

{codeforlife-portal-7.4.8/portal/templates/captcha → codeforlife-portal-8.0.0/portal/templates/django_recaptcha}/widget_v2_invisible.html

@@ -1,5 +1,5 @@
-{# copied from django-recaptcha 2.0.5 #}
-{% include "captcha/includes/js_v2_invisible.html" %}
+<!-- copied from django-recaptcha 4.0.0 -->
+{% include "django_recaptcha/includes/js_v2_invisible.html" %}
 <div class="g-recaptcha"
     {% for name, value in widget.attrs.items %}{% if value is not False %} {{ name }}{% if value is not True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}{% endfor %}
 >

codeforlife-portal-8.0.0/portal/templates/two_factor/core/login.html

@@ -0,0 +1,70 @@
+{# Overriden the original "two_factor" template to remove extending base template and slightly adjust style #}
+
+{% load i18n %}
+{% load two_factor_tags %}
+
+{% block extra_media %}
+{{ form.media }}
+{% endblock %}
+
+{% block content %}
+
+<section class="row mx-0">
+  <span class="oval-blue login-shape-left"></span>
+  <span class="polygon-yellow login-shape-right"></span>
+  <div class="form--login is-flex form--register--teacher">
+    <div class="form col-xs-12 col-sm-8 col-md-8 col-lg-9 center-block">
+      <h4>{% block title %}{% trans "Welcome" %}{% endblock %}</h4>
+
+{% if wizard.steps.current == 'auth' %}
+<p>{% blocktrans %}Enter your credentials.{% endblocktrans %}</p>
+{% elif wizard.steps.current == 'token' %}
+<p>{{ device|as_verbose_action }}</p>
+{% elif wizard.steps.current == 'backup' %}
+<p>{% blocktrans trimmed %}Use this form for entering backup tokens for logging in.
+  These tokens have been generated for you to print and keep safe. Please
+  enter one of these backup tokens to log into your account.{% endblocktrans %}</p>
+{% endif %}
+
+<form action="" method="post">
+  {% block main_form_content %}
+  {% csrf_token %}
+  {% include "two_factor/_wizard_forms.html" %}
+
+  {# hidden submit button to enable [enter] key #}
+  <input type="submit" value="" hidden />
+
+  {% if other_devices %}
+  <p>{% trans "Or, alternatively, use one of your other authentication methods:" %}</p>
+  <p>
+    {% for other in other_devices %}
+    <button name="challenge_device" value="{{ other.persistent_id }}"
+            class="btn btn-secondary btn-block" type="submit">
+      {{ other|as_action }}
+    </button>
+    {% endfor %}</p>
+  {% endif %}
+
+  {% include "two_factor/_wizard_actions.html" %}
+  {% endblock %}
+</form>
+
+{% block 'backup_tokens' %}
+{% if backup_tokens %}
+<hr>
+<div class="backup_tokens_form">
+  <form action="" method="post">
+    {% csrf_token %}
+    <p>{% trans "As a last resort, you can use a backup token:" %}</p>
+    <p>
+      <button name="wizard_goto_step" type="submit" value="backup"
+              class="button button--primary">{% trans "Use Backup Token" %}</button>
+    </p>
+  </form>
+</div>
+    </div>
+  </div>
+</section>
+{% endif %}
+{% endblock %}
+{% endblock %}

codeforlife-portal-8.0.0/portal/templates/two_factor/core/setup.html

@@ -0,0 +1,66 @@
+{# Overriding the original "two_factor" template #}
+
+{% extends "two_factor/_base_focus.html" %}
+{% load i18n %}
+
+{% block extra_media %}
+{{ form.media }}
+{% endblock %}
+
+{% block content %}
+<h4>{% block title %}{% trans "Enable Two-Factor Authentication" %}{% endblock %}</h4>
+{% if wizard.steps.current == 'welcome' %}
+<p>{% blocktrans trimmed %}You are about to take your account security to the
+    next level. Follow the steps in this wizard to enable two-factor
+    authentication.{% endblocktrans %}</p>
+{% elif wizard.steps.current == 'method' %}
+<p>{% blocktrans trimmed %}Please select which authentication method you would
+    like to use.{% endblocktrans %}</p>
+{% elif wizard.steps.current == 'generator' %}
+<p>{% blocktrans trimmed %}To start using a token generator, please use your
+    smartphone to scan the QR code below. For example, use Google
+    Authenticator.{% endblocktrans %}</p>
+<p><img src="{{ QR_URL }}" alt="QR Code" class="bg-white"/></p>
+<p>{% blocktrans trimmed %}Alternatively you can use the following secret to
+    set up TOTP in your authenticator or password manager manually.{% endblocktrans %}</p>
+<p>{% translate "TOTP Secret:" %} <a href="{{ otpauth_url }}">{{ secret_key }}</a></p>
+<p>{% blocktrans %}Then, enter the token generated by the app.{% endblocktrans %}</p>
+
+{% elif wizard.steps.current == 'sms' %}
+<p>{% blocktrans trimmed %}Please enter the phone number you wish to receive the
+    text messages on. This number will be validated in the next step.
+    {% endblocktrans %}</p>
+{% elif wizard.steps.current == 'call' %}
+<p>{% blocktrans trimmed %}Please enter the phone number you wish to be called on.
+    This number will be validated in the next step. {% endblocktrans %}</p>
+{% elif wizard.steps.current == 'validation' %}
+{% if challenge_succeeded %}
+{% if device.method == 'call' %}
+<p>{% blocktrans trimmed %}We are calling your phone right now, please enter the
+    digits you hear.{% endblocktrans %}</p>
+{% elif device.method == 'sms' %}
+<p>{% blocktrans trimmed %}We sent you a text message, please enter the tokens we
+    sent.{% endblocktrans %}</p>
+{% endif %}
+{% else %}
+<p class="alert alert-warning" role="alert">{% blocktrans trimmed %}We've
+    encountered an issue with the selected authentication method. Please
+    go back and verify that you entered your information correctly, try
+    again, or use a different authentication method instead. If the issue
+    persists, contact the site administrator.{% endblocktrans %}</p>
+{% endif %}
+{% elif wizard.steps.current == 'yubikey' %}
+<p>{% blocktrans trimmed %}To identify and verify your YubiKey, please insert a
+    token in the field below. Your YubiKey will be linked to your
+    account.{% endblocktrans %}</p>
+{% endif %}
+
+<form action="" method="post">{% csrf_token %}
+    {% include "two_factor/_wizard_forms.html" %}
+
+    {# hidden submit button to enable [enter] key #}
+    <input type="submit" value="" hidden />
+
+    {% include "two_factor/_wizard_actions.html" %}
+</form>
+{% endblock %}

codeforlife-portal-8.0.0/portal/templates/two_factor/profile/profile.html

@@ -0,0 +1,60 @@
+{% extends "two_factor/_base.html" %}
+{% load i18n %}
+{% load two_factor_tags %}
+
+{% block content %}
+<h1>{% block title %}{% trans "Account Security" %}{% endblock %}</h1>
+
+{% if default_device %}
+<p>{% blocktrans with primary=default_device|as_action %}Primary method: {{ primary }}{% endblocktrans %}</p>
+
+{% if available_phone_methods %}
+<h2>{% trans "Backup Phone Numbers" %}</h2>
+<p>{% blocktrans trimmed %}If your primary method is not available, we are able to
+    send backup tokens to the phone numbers listed below.{% endblocktrans %}</p>
+{% if backup_phones %}
+<ul>
+    {% for phone in backup_phones %}
+    <li>
+        {{ phone|as_action }}
+        <form method="post" action="{% url 'two_factor:phone_delete' phone.id %}"
+              onsubmit="return confirm({% trans 'Are you sure?' %})">
+            {% csrf_token %}
+            <button class="btn btn-sm btn-warning"
+                    type="submit">{% trans "Unregister" %}</button>
+        </form>
+    </li>
+    {% endfor %}
+</ul>
+{% endif %}
+<p><a href="{% url 'two_factor:phone_create' %}"
+      class="btn btn-info">{% trans "Add Phone Number" %}</a></p>
+{% endif %}
+
+<h2>{% trans "Backup Tokens" %}</h2>
+<p>
+    {% blocktrans trimmed %}If you don't have any device with you, you can access
+    your account using backup tokens.{% endblocktrans %}
+    {% blocktrans trimmed count counter=backup_tokens %}
+    You have only one backup token remaining.
+    {% plural %}
+    You have {{ counter }} backup tokens remaining.
+    {% endblocktrans %}
+</p>
+<p><a href="{% url 'two_factor:backup_tokens' %}"
+      class="btn btn-info">{% trans "Show Codes" %}</a></p>
+
+<h3>{% trans "Disable Two-Factor Authentication" %}</h3>
+<p>{% blocktrans trimmed %}However we strongly discourage you to do so, you can
+    also disable two-factor authentication for your account.{% endblocktrans %}</p>
+<p><a class="btn btn-secondary" href="{% url 'two_factor:disable' %}">
+    {% trans "Disable Two-Factor Authentication" %}</a></p>
+{% else %}
+<p>{% blocktrans trimmed %}Two-factor authentication is not enabled for your
+    account. Enable two-factor authentication for enhanced account
+    security.{% endblocktrans %}</p>
+<p><a href="{% url 'two_factor:setup' %}" class="btn btn-primary">
+    {% trans "Enable Two-Factor Authentication" %}</a>
+</p>
+{% endif %}
+{% endblock %}

{codeforlife-portal-7.4.8 → codeforlife-portal-8.0.0}/portal/tests/test_captcha_forms.py

@@ -1,7 +1,7 @@
-from captcha.fields import ReCaptchaField
-from captcha.widgets import ReCaptchaV2Invisible
 from django import forms
 from django.test import TestCase
+from django_recaptcha.fields import ReCaptchaField
+from django_recaptcha.widgets import ReCaptchaV2Invisible
 
 from portal.helpers.captcha import is_captcha_in_form, remove_captcha_from_forms