From e23d3151ca0051e987ad924decb1bffd3c700f8d Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Wed, 22 Jun 2022 19:57:34 +0200
Subject: [PATCH] Work around django-two-factor-auth API breakage in 1.14.0
---
CHANGELOG.rst | 2 ++
aleksis/core/settings.py | 1 +
aleksis/core/templates/two_factor/core/login.html | 2 +-
aleksis/core/templates/two_factor/profile/profile.html | 2 +-
pyproject.toml | 2 +-
5 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fe40b48d5..354f94f5c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -19,6 +19,8 @@ Changed
~~~~~~~
* Restructure group page and show more information about members.
+* django-two-factor-auth >= 1.14.0 is now required due to a
+ backwards-incompatible breakage in that library
Fixed
~~~~~~~
diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index d328512d3..e5e6984a7 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -144,6 +144,7 @@ INSTALLED_APPS = [
"dynamic_preferences.users.apps.UserPreferencesConfig",
"impersonate",
"two_factor",
+ "two_factor.plugins.phonenumber",
"material",
"ckeditor",
"ckeditor_uploader",
diff --git a/aleksis/core/templates/two_factor/core/login.html b/aleksis/core/templates/two_factor/core/login.html
index 77b135569..614585522 100644
--- a/aleksis/core/templates/two_factor/core/login.html
+++ b/aleksis/core/templates/two_factor/core/login.html
@@ -1,6 +1,6 @@
{# -*- engine:django -*- #}
{% extends "two_factor/_base_focus.html" %}
-{% load i18n two_factor account socialaccount %}
+{% load i18n phonenumber account socialaccount %}
{% block browser_title %}
{% trans "Login" %}
diff --git a/aleksis/core/templates/two_factor/profile/profile.html b/aleksis/core/templates/two_factor/profile/profile.html
index dd9472e7f..fe96135d0 100644
--- a/aleksis/core/templates/two_factor/profile/profile.html
+++ b/aleksis/core/templates/two_factor/profile/profile.html
@@ -1,5 +1,5 @@
{% extends "two_factor/_base_focus.html" %}
-{% load i18n two_factor %}
+{% load i18n phonenumber %}
{% block browser_title %}
{% trans "Account Security" %}
diff --git a/pyproject.toml b/pyproject.toml
index b492b58bc..254c67a90 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -71,7 +71,7 @@ django-ipware = "^4.0"
django-impersonate = "^1.4"
psycopg2 = "^2.8"
django_select2 = "^7.1"
-django-two-factor-auth = { version = "^1.12.1", extras = [ "yubikey", "phonenumbers", "call", "sms" ] }
+django-two-factor-auth = { version = "^1.14.0", extras = [ "yubikey", "phonenumbers", "call", "sms" ] }
django-yarnpkg = "^6.0"
django-material = "^1.6.0"
django-dynamic-preferences = "^1.11"
--
GitLab