Merge pull request cookiecutter#4843 from foarsitter/allauth

Allauth elements & MFA
kp-forks · Feb 26, 2024 · daacdd0 · daacdd0
2 parents c3708c0 + 0e41e5e
commit daacdd0
Show file tree

Hide file tree

Showing 30 changed files with 188 additions and 429 deletions.
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -84,6 +84,7 @@
     "crispy_bootstrap5",
     "allauth",
     "allauth.account",
+    "allauth.mfa",
     "allauth.socialaccount",
 {%- if cookiecutter.use_celery == 'y' %}
     "django_celery_beat",

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -31,7 +31,7 @@ uvicorn[standard]==0.27.1  # https://github.com/encode/uvicorn
 django==4.2.10  # pyup: < 5.0  # https://www.djangoproject.com/
 django-environ==0.11.2  # https://github.com/joke2k/django-environ
 django-model-utils==4.4.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.61.1  # https://github.com/pennersr/django-allauth
+django-allauth[mfa]==0.61.1  # https://github.com/pennersr/django-allauth
 django-crispy-forms==2.1  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==2023.10  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

diff --git a/...tter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/account_inactive.html b/...tter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/account_inactive.html
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html
diff --git a/....project_slug}}/{{cookiecutter.project_slug}}/templates/account/base_manage_password.html b/....project_slug}}/{{cookiecutter.project_slug}}/templates/account/base_manage_password.html
@@ -0,0 +1,11 @@
+{% raw %}{% extends "account/base_manage.html" %}
+
+{% block main %}
+  <div class="card">
+    <div class="card-body">
+      {% block content %}
+      {% endblock content %}
+    </div>
+  </div>
+{% endblock main %}{% endraw %}
+
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
diff --git a/...ecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email_confirm.html b/...ecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email_confirm.html
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html
diff --git a/...utter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_change.html b/...utter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_change.html
diff --git a/...cutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html b/...cutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html
diff --git a/...r.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_done.html b/...r.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_done.html
diff --git a/...oject_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html b/...oject_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html
diff --git a/..._slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html b/..._slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html
diff --git a/...iecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_set.html b/...iecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_set.html