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

portal/templates/two_factor/profile/profile.html

@@ -1,41 +1,59 @@
 {% extends "two_factor/_base.html" %}
-{% load future i18n two_factor %}
+{% load i18n %}
+{% load two_factor_tags %}
 
 {% block content %}
-<h4>{% block title %}{% trans "Account Security" %}{% endblock %}</h4>
+<h1>{% block title %}{% trans "Account Security" %}{% endblock %}</h1>
 
 {% if default_device %}
-{% if default_device_type == 'TOTPDevice' %}
-<p>{% trans "Tokens will be generated by your token generator." %}</p>
-{% elif default_device_type == 'PhoneDevice' %}
-<p>{% blocktrans with primary=default_device|device_action %}Primary method: {{ primary }}{% endblocktrans %}</p>
-{% elif default_device_type == 'RemoteYubikeyDevice' %}
-<p>{% blocktrans %}Tokens will be generated by your YubiKey.{% endblocktrans %}</p>
+<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 %}
 
-<h4>{% trans "Backup Tokens" %}</h4>
+<h2>{% trans "Backup Tokens" %}</h2>
 <p>
-    {% blocktrans %}If you don't have any device with you, you can access
+    {% blocktrans trimmed %}If you don't have any device with you, you can access
     your account using backup tokens.{% endblocktrans %}
-    {% blocktrans count counter=backup_tokens %}
+    {% 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="button button--primary">{% trans "Show Codes" %}</a></p>
+      class="btn btn-info">{% trans "Show Codes" %}</a></p>
 
-<h4>{% trans "Disable Two-Factor Authentication" %}</h4>
-<p>{% blocktrans %}However we strongly discourage you to do so, you can
+<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="button button--primary" href="{% url 'two_factor:disable' %}">
+<p><a class="btn btn-secondary" href="{% url 'two_factor:disable' %}">
     {% trans "Disable Two-Factor Authentication" %}</a></p>
 {% else %}
-<p>{% blocktrans %}Two-factor authentication is not enabled for your
+<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="button button--primary">
+<p><a href="{% url 'two_factor:setup' %}" class="btn btn-primary">
     {% trans "Enable Two-Factor Authentication" %}</a>
 </p>
 {% endif %}

portal/templatetags/app_tags.py

@@ -1,16 +1,9 @@
-from aimmo.templatetags.players_utils import get_user_playable_games
-from aimmo.worksheets import get_complete_worksheets, get_incomplete_worksheets
 from common import app_settings as common_app_settings
-from common.models import EmailVerification
-from common.permissions import logged_in_as_teacher
 from common.utils import using_two_factor
 from django import template
 from django.conf import settings
-from django.contrib.auth.models import User
-from django.core.exceptions import ObjectDoesNotExist
-from django.shortcuts import reverse
-from django.template.context import RequestContext
 from django.template.defaultfilters import stringfilter
+
 from portal import __version__, beta
 
 register = template.Library()
@@ -23,33 +16,25 @@ def emaildomain(email):
 
 
 @register.filter(name="has_2FA")
-def has_2FA(u):
-    return using_two_factor(u)
+def has_2FA(user):
+    return using_two_factor(user)
 
 
 @register.filter(name="is_logged_in")
-def is_logged_in(u):
+def is_logged_in(user):
     return (
-        u
-        and u.is_authenticated
-        and (not using_two_factor(u) or (hasattr(u, "is_verified") and u.is_verified()))
+        user
+        and user.is_authenticated
+        and (
+            not using_two_factor(user)
+            or (hasattr(user, "is_verified") and user.userprofile.is_verified)
+        )
     )
 
 
 @register.filter
-def is_verified(u: User) -> bool:
-    try:
-        verifications = EmailVerification.objects.filter(user=u)
-        latest_verification = verifications.latest("user")
-    except ObjectDoesNotExist:
-        return False
-
-    return latest_verification.verified
-
-
-@register.filter
-def is_developer(u):
-    return not u.is_anonymous and u.userprofile.developer
+def is_developer(user):
+    return not user.is_anonymous and user.userprofile.developer
 
 
 @register.filter
@@ -63,98 +48,91 @@ def has_beta_access(request):
     return beta.has_beta_access(request)
 
 
-@register.inclusion_tag("portal/partials/aimmo_games_table.html", takes_context=True)
-def games_table(context, base_url):
-    playable_games = get_user_playable_games(context, base_url)
-
-    playable_games["complete_worksheets"] = get_complete_worksheets()
-    playable_games["incomplete_worksheets"] = get_incomplete_worksheets()
-
-    return playable_games
-
-
 @register.filter(name="make_into_username")
-def make_into_username(u):
+def make_into_username(user):
     username = ""
-    if hasattr(u, "userprofile"):
-        if hasattr(u.userprofile, "student"):
-            username = u.first_name
-        elif hasattr(u.userprofile, "teacher"):
-            username = u.first_name + " " + u.last_name
+    if hasattr(user, "userprofile"):
+        if hasattr(user.userprofile, "student"):
+            username = user.first_name
+        elif hasattr(user.userprofile, "teacher"):
+            username = user.first_name + " " + user.last_name
 
     return username
 
 
 @register.filter(name="is_logged_in_as_teacher")
-def is_logged_in_as_teacher(u):
-    return is_logged_in(u) and u.userprofile and hasattr(u.userprofile, "teacher")
+def is_logged_in_as_teacher(user):
+    return (
+        is_logged_in(user)
+        and user.userprofile
+        and hasattr(user.userprofile, "teacher")
+    )
+
+
+@register.filter(name="is_logged_in_as_admin_teacher")
+def is_logged_in_as_admin_teacher(user):
+    return is_logged_in_as_teacher(user) and user.userprofile.teacher.is_admin
 
 
 @register.filter(name="is_logged_in_as_student")
-def is_logged_in_as_student(u):
+def is_logged_in_as_student(user):
     return (
-        is_logged_in(u)
-        and u.userprofile
-        and hasattr(u.userprofile, "student")
-        and u.userprofile.student.class_field != None
+        is_logged_in(user)
+        and user.userprofile
+        and hasattr(user.userprofile, "student")
+        and user.userprofile.student.class_field is not None
     )
 
 
 @register.filter(name="is_independent_student")
-def is_independent_student(u):
+def is_independent_student(user):
     return (
-        is_logged_in(u)
-        and u.userprofile
-        and hasattr(u.userprofile, "student")
-        and u.userprofile.student.is_independent()
+        is_logged_in(user)
+        and user.userprofile
+        and hasattr(user.userprofile, "student")
+        and user.userprofile.student.is_independent()
     )
 
 
 @register.filter(name="has_teacher_finished_onboarding")
-def has_teacher_finished_onboarding(u):
-    teacher = u.userprofile.teacher
-    classes = teacher.class_teacher.all()
-    return (
-        is_logged_in_as_teacher(u)
-        and teacher.has_school()
-        and classes
-        and (classes.count() > 1 or classes[0].has_students())
-    )
+def has_teacher_finished_onboarding(user):
+    teacher = user.userprofile.teacher
+    return is_logged_in_as_teacher(user) and teacher.has_school()
 
 
 @register.filter(name="is_logged_in_as_school_user")
-def is_logged_in_as_school_user(u):
+def is_logged_in_as_school_user(user):
     return (
-        is_logged_in(u)
-        and u.userprofile
+        is_logged_in(user)
+        and user.userprofile
         and (
             (
-                hasattr(u.userprofile, "student")
-                and u.userprofile.student.class_field != None
+                hasattr(user.userprofile, "student")
+                and user.userprofile.student.class_field is not None
             )
-            or hasattr(u.userprofile, "teacher")
+            or hasattr(user.userprofile, "teacher")
         )
     )
 
 
 @register.filter(name="get_user_status")
-def get_user_status(u):
-    if is_logged_in_as_school_user(u):
-        if is_logged_in_as_teacher(u):
+def get_user_status(user):
+    if is_logged_in_as_school_user(user):
+        if is_logged_in_as_teacher(user):
             return "TEACHER"
         else:
             return "SCHOOL_STUDENT"
-    elif is_logged_in(u):
+    elif is_logged_in(user):
         return "INDEPENDENT_STUDENT"
     else:
         return "UNTRACKED"
 
 
 @register.filter(name="make_title_caps")
-def make_title_caps(s):
-    if len(s) > 0:
-        s = s[0].upper() + s[1:]
-    return s
+def make_title_caps(string):
+    if len(string) > 0:
+        string = string[0].upper() + string[1:]
+    return string
 
 
 @register.filter(name="cloud_storage")
@@ -168,9 +146,6 @@ def get_project_version():
     return __version__
 
 
-@register.simple_tag(takes_context=True)
-def url_for_aimmo_dashboard(context: RequestContext):
-    if logged_in_as_teacher(context.request.user):
-        return reverse("teacher_aimmo_dashboard")
-    else:
-        return reverse("student_aimmo_dashboard")
+@register.filter
+def get_dict_item(dictionary, key):
+    return dictionary[key]

portal/templatetags/card_list_tags.py

@@ -11,9 +11,5 @@ def card_list(context):
     - image: the path to the card's image (top-half)
     - title: the heading of the card
     - description (optional): the text paragraph of the card
-    - thumbnail_text (optional): text to be shown as the thumbnail
-    - thumbnail_image (optional): the path to the image to be shown as the thumbnail
-    - button_text (optional): the text on the card's button
-    - button_link (optional): the link that the button redirects to
     """
     return context["CARD_LIST"]

portal/tests/base_test.py

@@ -1,12 +1,10 @@
 import socket
 import time
 
+from django.contrib.sites.models import Site
 from django.urls import reverse
 
 from deploy import captcha
-
-# Uncomment to use FireFox
-# master_browser = webdriver.Firefox()
 from portal.tests.pageObjects.portal.home_page import HomePage
 from .selenium_test_case import SeleniumTestCase
 
@@ -41,3 +39,16 @@ class BaseTest(SeleniumTestCase):
             else:
                 break
             attempts += 1
+
+    def __call__(self, result=None):
+        self._set_site_to_local_domain()
+        return super().__call__(result)
+
+    def _set_site_to_local_domain(self):
+        """
+        Sets the Site Django object to the local domain (locally, localhost:8000).
+        Needed to generate valid registration and password reset links in tests.
+        """
+        current_site = Site.objects.get_current()
+        current_site.domain = f"{self.server_thread.host}:{self.server_thread.port}"
+        current_site.save()

portal/tests/conftest.py

@@ -1,8 +1,6 @@
 from collections import namedtuple
-from unittest.mock import MagicMock
 
 import pytest
-from aimmo.models import Game
 from common.models import Class
 from common.tests.utils.classes import create_class_directly
 from common.tests.utils.organisation import create_organisation_directly
@@ -12,8 +10,6 @@ from common.tests.utils.student import (
 )
 from common.tests.utils.teacher import signup_teacher_directly
 
-from .utils.aimmo_games import create_aimmo_game_directly
-
 SchoolStudent = namedtuple("student", ["username", "password"])
 IndependentStudent = namedtuple("independent_student", ["username", "password"])
 TeacherLoginDetails = namedtuple("teacher", ["email", "password"])
@@ -41,14 +37,3 @@ def student1(db, class1) -> SchoolStudent:
 def independent_student1(db) -> IndependentStudent:
     username, password, _ = create_independent_student_directly()
     return IndependentStudent(username, password)
-
-
-@pytest.fixture
-def aimmo_game1(db, class1) -> Game:
-    return create_aimmo_game_directly(klass=class1, worksheet_id=1)
-
-
-@pytest.fixture(autouse=True)
-def mock_game_manager(monkeypatch):
-    """Mock GameManager for all tests."""
-    monkeypatch.setattr("aimmo.game_creator.GameManager", MagicMock())

portal/tests/migrations/test_migration_make_portaladmin_teacher.py

@@ -4,9 +4,7 @@ import pytest
 @pytest.mark.django_db
 def test_portaladmin_has_teacher_profile(migrator):
     migrator.apply_initial_migration(("portal", "0060_delete_guardian"))
-    new_state = migrator.apply_tested_migration(
-        ("portal", "0061_make_portaladmin_teacher")
-    )
+    new_state = migrator.apply_tested_migration(("portal", "0061_make_portaladmin_teacher"))
 
     User = new_state.apps.get_model("auth", "User")
     UserProfile = new_state.apps.get_model("common", "UserProfile")
@@ -34,9 +32,7 @@ def test_portaladmin_has_teacher_profile(migrator):
     assert portaladmin_class.teacher == portaladmin_teacher
 
     portaladmin_student_user = User.objects.get(username="portaladmin student")
-    portaladmin_student_userprofile = UserProfile.objects.get(
-        user=portaladmin_student_user
-    )
+    portaladmin_student_userprofile = UserProfile.objects.get(user=portaladmin_student_user)
     portaladmin_student = Student.objects.get(user=portaladmin_student_userprofile)
 
     assert portaladmin_student.class_field == portaladmin_class

portal/tests/migrations/test_migration_preview_users.py

@@ -3,17 +3,11 @@ import pytest
 
 @pytest.mark.django_db
 def test_preview_user_field_added(migrator):
-    migrator.apply_initial_migration(
-        ("portal", "0054_pending_join_request_can_be_blank")
-    )
+    migrator.apply_initial_migration(("portal", "0054_pending_join_request_can_be_blank"))
     new_state = migrator.apply_tested_migration(("portal", "0055_add_preview_user"))
 
     userprofile_model = new_state.apps.get_model("portal", "UserProfile")
-    assert userprofile_model._meta.get_field(
-        "preview_user"
-    ).get_internal_type(), "BooleanField"
+    assert userprofile_model._meta.get_field("preview_user").get_internal_type(), "BooleanField"
 
     school_model = new_state.apps.get_model("portal", "School")
-    assert school_model._meta.get_field(
-        "eligible_for_testing"
-    ).get_internal_type(), "BooleanField"
+    assert school_model._meta.get_field("eligible_for_testing").get_internal_type(), "BooleanField"

portal/tests/migrations/test_migration_remove_guardian.py

@@ -3,9 +3,7 @@ import pytest
 
 @pytest.mark.django_db
 def test_guardian_model_removed(migrator):
-    migrator.apply_initial_migration(
-        ("portal", "0059_move_email_verifications_to_common")
-    )
+    migrator.apply_initial_migration(("portal", "0059_move_email_verifications_to_common"))
     new_state = migrator.apply_tested_migration(("portal", "0060_delete_guardian"))
 
     model_names = [model._meta.db_table for model in new_state.apps.get_models()]

portal/tests/migrations/test_migration_use_common_models.py

@@ -4,9 +4,7 @@ import pytest
 @pytest.mark.django_db
 def test_models_moved_to_common(migrator):
     migrator.apply_initial_migration(("portal", "0057_delete_frontpagenews"))
-    new_state = migrator.apply_tested_migration(
-        ("portal", "0058_move_to_common_models")
-    )
+    new_state = migrator.apply_tested_migration(("portal", "0058_move_to_common_models"))
 
     model_names = [model._meta.db_table for model in new_state.apps.get_models()]
 
@@ -20,9 +18,7 @@ def test_models_moved_to_common(migrator):
 @pytest.mark.django_db
 def test_emailverification_moved_to_common(migrator):
     migrator.apply_initial_migration(("portal", "0058_move_to_common_models"))
-    new_state = migrator.apply_tested_migration(
-        ("portal", "0059_move_email_verifications_to_common")
-    )
+    new_state = migrator.apply_tested_migration(("portal", "0059_move_email_verifications_to_common"))
 
     model_names = [model._meta.db_table for model in new_state.apps.get_models()]
 

portal/tests/migrations/test_migration_verify_portaladmin.py

@@ -18,9 +18,7 @@ def test_verify_portaladmin(migrator):
 @pytest.mark.django_db
 def test_verify_portaladmin_rollback(migrator):
     migrator.apply_initial_migration(("portal", "0062_verify_portaladmin"))
-    new_state = migrator.apply_tested_migration(
-        ("portal", "0061_make_portaladmin_teacher")
-    )
+    new_state = migrator.apply_tested_migration(("portal", "0061_make_portaladmin_teacher"))
 
     User = new_state.apps.get_model("auth", "User")
     EmailVerification = new_state.apps.get_model("common", "EmailVerification")

portal/tests/pageObjects/portal/admin/admin_base_page.py

@@ -8,24 +8,3 @@ class AdminBasePage(BasePage):
     def __init__(self, browser, live_server_url):
         super(AdminBasePage, self).__init__(browser)
         self.live_server_url = live_server_url
-
-    def go_to_admin_data_page_failure(self):
-        url = self.live_server_url + reverse("aggregated_data")
-        self.browser.get(url)
-
-        return ForbiddenPage(self.browser)
-
-    def go_to_admin_map_page_failure(self):
-        self._go_to_admin_map_page()
-        return ForbiddenPage(self.browser)
-
-    def go_to_admin_map_page(self):
-        self._go_to_admin_map_page()
-
-        from portal.tests.pageObjects.portal.admin.admin_map_page import AdminMapPage
-
-        return AdminMapPage(self.browser, self.live_server_url)
-
-    def _go_to_admin_map_page(self):
-        url = self.live_server_url + reverse("map")
-        self.browser.get(url)

portal/tests/pageObjects/portal/base_page.py

@@ -1,15 +1,15 @@
 from __future__ import absolute_import
 
-from builtins import object
 import time
+from builtins import object
 
 from selenium.common.exceptions import TimeoutException
+from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.common.action_chains import ActionChains
 
-FADE_TIME = 0.3
+FADE_TIME = 0.5
 
 
 class BasePage(object):
@@ -40,7 +40,9 @@ class BasePage(object):
         self.wait(EC.presence_of_element_located(locator), wait_seconds)
 
     def wait_for_absence(self, locator, wait_seconds=DEFAULT_WAIT_SECONDS):
-        self.wait_until_not(EC.presence_of_element_located(locator), wait_seconds)
+        self.wait_until_not(
+            EC.presence_of_element_located(locator), wait_seconds
+        )
 
     def wait(self, method, wait_seconds=DEFAULT_WAIT_SECONDS):
         WebDriverWait(self.browser, wait_seconds).until(method)
@@ -78,33 +80,21 @@ class BasePage(object):
         return self.element_exists_by_id(pageName)
 
     def hover_over_resources_dropdown(self):
-        resources_dropdown = self.browser.find_element_by_id(
-            "teaching_resources_button"
+        resources_dropdown = self.browser.find_element(
+            By.ID, "teaching_resources_button"
         )
         hover = ActionChains(self.browser).move_to_element(resources_dropdown)
         hover.perform()
 
     def go_to_rapid_router_resources_page(self):
         self.hover_over_resources_dropdown()
-        self.browser.find_element_by_id("rapid_router_resources_button").click()
-        from .resources_page import ResourcesPage
-
-        return ResourcesPage(self.browser)
-
-    def go_to_kurono_resources_page(self):
-        self.hover_over_resources_dropdown()
-        self.browser.find_element_by_id("kurono_resources_button").click()
+        self.browser.find_element(
+            By.ID, "rapid_router_resources_button"
+        ).click()
         from .resources_page import ResourcesPage
 
         return ResourcesPage(self.browser)
 
-    def go_to_kurono_teacher_dashboard_page(self):
-        self.browser.find_element_by_id("games_button").click()
-        self.browser.find_element_by_id("teacher_kurono_dashboard_button").click()
-        from .kurono_teacher_dashboard_page import KuronoTeacherDashboardPage
-
-        return KuronoTeacherDashboardPage(self.browser)
-
     def is_on_admin_login_page(self):
         return self.on_correct_page("administration_login")
 
@@ -119,22 +109,22 @@ class BasePage(object):
 
     def was_form_invalid(self, formID, error):
         errors = (
-            self.browser.find_element_by_id(formID)
-            .find_element_by_class_name("errorlist")
+            self.browser.find_element(By.ID, formID)
+            .find_element(By.CLASS_NAME, "errorlist")
             .text
         )
         return error in errors
 
     def is_dialog_showing(self):
         time.sleep(FADE_TIME)
-        return self.browser.find_element_by_id("popup").is_displayed()
+        return self.browser.find_element(By.ID, "popup").is_displayed()
 
     def confirm_dialog(self):
-        self.browser.find_element_by_id("confirm_button").click()
+        self.browser.find_element(By.ID, "confirm_button").click()
         time.sleep(FADE_TIME)
         return self
 
     def cancel_dialog(self):
-        self.browser.find_element_by_id("cancel_button").click()
+        self.browser.find_element(By.ID, "cancel_button").click()
         time.sleep(FADE_TIME)
         return self

portal/tests/pageObjects/portal/email_verification_needed_page.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 
+from selenium.webdriver.common.by import By
+
 from . import home_page
 from .base_page import BasePage
 
@@ -7,9 +9,8 @@ from .base_page import BasePage
 class EmailVerificationNeededPage(BasePage):
     def __init__(self, browser):
         super(EmailVerificationNeededPage, self).__init__(browser)
-
         assert self.on_correct_page("emailVerificationNeeded_page")
 
     def return_to_home_page(self):
-        self.browser.find_element_by_id("home_button").click()
+        self.browser.find_element(By.ID, "home_button").click()
         return home_page.HomePage(self.browser)