➕ added maykin 2fa

docker-compose.yml

@@ -23,8 +23,6 @@ services:
       - DB_HOST=db
       - CACHE_DEFAULT=redis:6379/0
       - CACHE_AXES=redis:6379/0
-      - TWO_FACTOR_PATCH_ADMIN=no
-      - TWO_FACTOR_FORCE_OTP_ADMIN=no
       - CELERY_BROKER_URL=redis://redis:6379/0
       - CELERY_RESULT_BACKEND=redis://redis:6379/0
       - CELERY_LOGLEVEL=DEBUG

dotenv.example

@@ -8,3 +8,6 @@ DB_USER="sdg"
 DB_PASSWORD=""
 DB_HOST=""
 DB_PORT=""
+
+# Applies to dev settings module only!
+DISABLE_2FA=yes

requirements/base.in

@@ -10,7 +10,7 @@ pydantic
 email-validator
 
 # Framework libraries
-django==4.2.0
+django==3.2.0
 django-admin-index
 django-better-admin-arrayfield
 django-axes[ipware]
@@ -27,7 +27,7 @@ django-filter
 django-timeline-logger
 celery
 django-celery-beat
-maykin-django-two-factor-auth[phonenumbers]
+maykin-2fa
 
 # API libraries
 djangorestframework

requirements/base.txt

@@ -10,6 +10,8 @@ annotated-types==0.6.0
     # via pydantic
 asgiref==3.7.2
     # via django
+asn1crypto==1.5.1
+    # via webauthn
 async-timeout==4.0.3
     # via redis
 attrs==23.2.0
@@ -31,12 +33,14 @@ boltons==23.1.1
     # via
     #   face
     #   glom
+cbor2==5.6.1
+    # via webauthn
 celery==5.3.6
     # via
     #   -r requirements/base.in
     #   django-celery-beat
     #   notifications-api-common
-certifi==2023.11.17
+certifi==2024.2.2
     # via
     #   django-simple-certmanager
     #   elastic-apm
@@ -60,14 +64,15 @@ click-repl==0.3.0
     # via celery
 cron-descriptor==1.4.3
     # via django-celery-beat
-cryptography==42.0.1
+cryptography==42.0.2
     # via
     #   django-simple-certmanager
     #   pyjwt
     #   pyopenssl
+    #   webauthn
 defusedxml==0.7.1
     # via python3-openid
-django==3.2.23
+django==3.2
     # via
     #   -r requirements/base.in
     #   django-admin-index
@@ -96,20 +101,21 @@ django==3.2.23
     #   django-solo
     #   django-timeline-logger
     #   django-timezone-field
+    #   django-two-factor-auth
     #   djangorestframework
     #   drf-nested-routers
     #   drf-spectacular
-    #   maykin-django-two-factor-auth
+    #   maykin-2fa
     #   notifications-api-common
     #   vng-api-common
     #   zgw-consumers
 django-admin-index==3.1.0
     # via -r requirements/base.in
-django-allauth==0.60.1
+django-allauth==0.61.1
     # via -r requirements/base.in
 django-appconf==1.0.6
     # via django-timeline-logger
-django-axes==6.3.0
+django-axes[ipware]==6.3.0
     # via -r requirements/base.in
 django-better-admin-arrayfield==1.4.2
     # via -r requirements/base.in
@@ -119,32 +125,28 @@ django-choices==2.0.0
     # via
     #   -r requirements/base.in
     #   vng-api-common
-django-compat==1.0.15
-    # via django-hijack-admin
 django-decorator-include==3.0
     # via -r requirements/base.in
 django-filter==23.5
     # via
     #   -r requirements/base.in
     #   vng-api-common
 django-formtools==2.5.1
-    # via maykin-django-two-factor-auth
-django-hijack==2.3.0
-    # via
-    #   -r requirements/base.in
-    #   django-hijack-admin
-django-hijack-admin==2.1.10
+    # via django-two-factor-auth
+django-hijack==3.4.5
     # via -r requirements/base.in
+django-ipware==6.0.4
+    # via django-axes
 django-markdownify==0.9.3
     # via -r requirements/base.in
 django-markdownx==4.0.7
     # via -r requirements/base.in
 django-ordered-model==3.7.4
     # via django-admin-index
 django-otp==1.3.0
-    # via maykin-django-two-factor-auth
-django-phonenumber-field==5.2.0
-    # via maykin-django-two-factor-auth
+    # via django-two-factor-auth
+django-phonenumber-field==7.3.0
+    # via django-two-factor-auth
 django-privates==2.0.0.post0
     # via django-simple-certmanager
 django-redis==5.4.0
@@ -174,6 +176,8 @@ django-timeline-logger==3.0.0
     # via -r requirements/base.in
 django-timezone-field==6.1.0
     # via django-celery-beat
+django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
+    # via maykin-2fa
 djangorestframework==3.12.4
     # via
     #   -r requirements/base.in
@@ -202,7 +206,7 @@ email-validator==2.1.0.post1
     # via -r requirements/base.in
 face==20.1.1
     # via glom
-faker==22.6.0
+faker==23.2.0
     # via zgw-consumers
 gemma-zds-client==1.0.1
     # via
@@ -233,16 +237,16 @@ markdown==3.5.2
     # via
     #   django-markdownify
     #   django-markdownx
-maykin-django-two-factor-auth[phonenumbers]==2.0.4
+maykin-2fa==1.0.0
     # via -r requirements/base.in
 notifications-api-common==0.2.2
     # via vng-api-common
 oauthlib==3.2.2
     # via requests-oauthlib
 oyaml==1.0
     # via vng-api-common
-phonenumbers==8.13.29
-    # via maykin-django-two-factor-auth
+phonenumberslite==8.13.30
+    # via django-two-factor-auth
 pillow==10.2.0
     # via
     #   -r requirements/base.in
@@ -255,9 +259,9 @@ psycopg2==2.8.6
     # via -r requirements/base.in
 pycparser==2.21
     # via cffi
-pydantic==2.6.0
+pydantic==2.6.1
     # via -r requirements/base.in
-pydantic-core==2.16.1
+pydantic-core==2.16.2
     # via pydantic
 pyjwt[crypto]==2.8.0
     # via
@@ -268,7 +272,10 @@ pyjwt[crypto]==2.8.0
 pyopenssl==24.0.0
     # via
     #   django-simple-certmanager
+    #   webauthn
     #   zgw-consumers
+pypng==0.20220715.0
+    # via qrcode
 python-crontab==3.0.0
     # via django-celery-beat
 python-dateutil==2.8.2
@@ -281,9 +288,11 @@ python-decouple==3.8
     # via -r requirements/base.in
 python-dotenv==1.0.1
     # via -r requirements/base.in
+python-ipware==2.0.1
+    # via django-ipware
 python3-openid==3.2.0
     # via django-allauth
-pytz==2023.4
+pytz==2024.1
     # via
     #   -r requirements/base.in
     #   django
@@ -293,8 +302,8 @@ pyyaml==6.0.1
     #   gemma-zds-client
     #   oyaml
     #   vng-api-common
-qrcode==6.1
-    # via maykin-django-two-factor-auth
+qrcode==7.4.2
+    # via django-two-factor-auth
 redis==5.0.1
     # via django-redis
 referencing==0.33.0
@@ -314,19 +323,17 @@ requests-mock==1.11.0
     # via zgw-consumers
 requests-oauthlib==1.3.1
     # via django-allauth
-rpds-py==0.17.1
+rpds-py==0.18.0
     # via
     #   jsonschema
     #   referencing
-sentry-sdk==1.39.2
+sentry-sdk==1.40.4
     # via -r requirements/base.in
 six==1.16.0
     # via
     #   bleach
-    #   django-compat
     #   isodate
     #   python-dateutil
-    #   qrcode
     #   requests-mock
 soupsieve==2.5
     # via beautifulsoup4
@@ -339,18 +346,19 @@ typing-extensions==4.9.0
     #   asgiref
     #   pydantic
     #   pydantic-core
-tzdata==2023.4
+    #   qrcode
+tzdata==2024.1
     # via
     #   celery
     #   django-celery-beat
 uritemplate==4.1.1
     # via drf-spectacular
-urllib3==2.1.0
+urllib3==2.2.0
     # via
     #   elastic-apm
     #   requests
     #   sentry-sdk
-uwsgi==2.0.23
+uwsgi==2.0.24
     # via -r requirements/base.in
 vine==5.1.0
     # via
@@ -361,6 +369,8 @@ vng-api-common==2.0.5
     # via -r requirements/base.in
 wcwidth==0.2.13
     # via prompt-toolkit
+webauthn==2.0.0
+    # via django-two-factor-auth
 webencodings==0.5.1
     # via
     #   bleach