Upgrade to maykin-2fa

Upgrade is pretty straightforward. Followed documentation
maykinmedia · Feb 13, 2024 · a4217cc · a4217cc
1 parent 9b32d0b
commit a4217cc
Show file tree

Hide file tree

Showing 15 changed files with 138 additions and 71 deletions.
diff --git a/docs/installation/config.rst b/docs/installation/config.rst
@@ -84,12 +84,6 @@ Other settings
   sent to the Notificaties API for operations on the Object endpoint.
   Defaults to ``True`` for the ``dev`` environment, otherwise defaults to ``False``.
 
-* ``TWO_FACTOR_FORCE_OTP_ADMIN``: Enforce 2 Factor Authentication in the admin or not.
-  Default ``True``. You'll probably want to disable this when using OIDC.
-
-* ``TWO_FACTOR_PATCH_ADMIN``: Whether to use the 2 Factor Authentication login flow for
-  the admin or not. Default ``True``. You'll probably want to disable this when using OIDC.
-
 Initial superuser creation
 --------------------------
 

diff --git a/requirements/base.in b/requirements/base.in
@@ -14,8 +14,7 @@ django-admin-index
 django-axes
 django-redis
 django-rosetta
-maykin-django-two-factor-auth
-maykin-django-two-factor-auth[phonenumbers]
+maykin-2fa
 mozilla-django-oidc-db
 
 # API libraries

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -8,6 +8,8 @@ amqp==5.2.0
     # via kombu
 asgiref==3.7.2
     # via django
+asn1crypto==1.5.1
+    # via webauthn
 attrs==20.3.0
     # via
     #   glom
@@ -18,6 +20,8 @@ boltons==21.0.0
     # via
     #   face
     #   glom
+cbor2==5.6.1
+    # via webauthn
 celery==5.2.2
     # via
     #   -r requirements/base.in
@@ -60,6 +64,7 @@ cryptography==41.0.7
     #   josepy
     #   mozilla-django-oidc
     #   pyopenssl
+    #   webauthn
 django==3.2.23
     # via
     #   -r requirements/base.in
@@ -80,11 +85,12 @@ django==3.2.23
     #   django-sendfile2
     #   django-simple-certmanager
     #   django-solo
+    #   django-two-factor-auth
     #   djangorestframework
     #   drf-nested-routers
     #   drf-spectacular
     #   drf-yasg
-    #   maykin-django-two-factor-auth
+    #   maykin-2fa
     #   mozilla-django-oidc
     #   mozilla-django-oidc-db
     #   notifications-api-common
@@ -98,17 +104,17 @@ django-filter==23.5
     #   -r requirements/base.in
     #   commonground-api-common
 django-formtools==2.3
-    # via maykin-django-two-factor-auth
+    # via django-two-factor-auth
 django-jsonform==2.21.4
     # via mozilla-django-oidc-db
 django-markup==1.3
     # via commonground-api-common
 django-ordered-model==3.7.4
     # via django-admin-index
 django-otp==1.0.6
-    # via maykin-django-two-factor-auth
+    # via django-two-factor-auth
 django-phonenumber-field==5.2.0
-    # via maykin-django-two-factor-auth
+    # via django-two-factor-auth
 django-privates==2.0.0.post0
     # via django-simple-certmanager
 django-redis==5.4.0
@@ -129,6 +135,8 @@ django-solo==2.2.0
     #   mozilla-django-oidc-db
     #   notifications-api-common
     #   zgw-consumers
+django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
+    # via maykin-2fa
 djangorestframework==3.12.4
     # via
     #   -r requirements/base.in
@@ -191,7 +199,7 @@ markdown==3.3.4
     # via commonground-api-common
 markupsafe==2.1.3
     # via jinja2
-maykin-django-two-factor-auth[phonenumbers]==2.0.3
+maykin-2fa==1.0.0
     # via -r requirements/base.in
 mozilla-django-oidc==4.0.0
     # via mozilla-django-oidc-db
@@ -205,8 +213,8 @@ oyaml==1.0
     # via commonground-api-common
 packaging==23.2
     # via drf-yasg
-phonenumbers==8.12.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
 polib==1.1.1
@@ -225,6 +233,7 @@ pyopenssl==23.3.0
     # via
     #   django-simple-certmanager
     #   josepy
+    #   webauthn
     #   zgw-consumers
 pyrsistent==0.17.3
     # via jsonschema
@@ -248,7 +257,7 @@ pyyaml==6.0.1
     #   gemma-zds-client
     #   oyaml
 qrcode==6.1
-    # via maykin-django-two-factor-auth
+    # via django-two-factor-auth
 redis==3.5.3
     # via django-redis
 requests==2.25.1
@@ -298,6 +307,8 @@ vine==5.1.0
     #   kombu
 wcwidth==0.2.13
     # via prompt-toolkit
+webauthn==2.0.0
+    # via django-two-factor-auth
 zgw-consumers==0.27.0
     # via
     #   -r requirements/base.in

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -12,6 +12,10 @@ asgiref==3.7.2
     # via
     #   -r requirements/base.txt
     #   django
+asn1crypto==1.5.1
+    # via
+    #   -r requirements/base.txt
+    #   webauthn
 attrs==20.3.0
     # via
     #   -r requirements/base.txt
@@ -28,6 +32,10 @@ boltons==21.0.0
     #   -r requirements/base.txt
     #   face
     #   glom
+cbor2==5.6.1
+    # via
+    #   -r requirements/base.txt
+    #   webauthn
 celery==5.2.2
     # via
     #   -r requirements/base.txt
@@ -89,6 +97,7 @@ cryptography==41.0.7
     #   josepy
     #   mozilla-django-oidc
     #   pyopenssl
+    #   webauthn
 cssselect==1.1.0
     # via pyquery
 django==3.2.23
@@ -111,11 +120,12 @@ django==3.2.23
     #   django-sendfile2
     #   django-simple-certmanager
     #   django-solo
+    #   django-two-factor-auth
     #   djangorestframework
     #   drf-nested-routers
     #   drf-spectacular
     #   drf-yasg
-    #   maykin-django-two-factor-auth
+    #   maykin-2fa
     #   mozilla-django-oidc
     #   mozilla-django-oidc-db
     #   notifications-api-common
@@ -131,7 +141,7 @@ django-filter==23.5
 django-formtools==2.3
     # via
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 django-jsonform==2.21.4
     # via
     #   -r requirements/base.txt
@@ -147,11 +157,11 @@ django-ordered-model==3.7.4
 django-otp==1.0.6
     # via
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 django-phonenumber-field==5.2.0
     # via
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 django-privates==2.0.0.post0
     # via
     #   -r requirements/base.txt
@@ -183,6 +193,11 @@ django-solo==2.2.0
     #   mozilla-django-oidc-db
     #   notifications-api-common
     #   zgw-consumers
+django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
+    # via
+    #   -r requirements/base.txt
+    #   django-two-factor-auth
+    #   maykin-2fa
 django-webtest==1.9.7
     # via -r requirements/test-tools.in
 djangorestframework==3.12.4
@@ -283,10 +298,8 @@ markupsafe==2.1.3
     # via
     #   -r requirements/base.txt
     #   jinja2
-maykin-django-two-factor-auth[phonenumbers]==2.0.3
-    # via
-    #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+maykin-2fa==1.0.0
+    # via -r requirements/base.txt
 mozilla-django-oidc==4.0.0
     # via
     #   -r requirements/base.txt
@@ -305,10 +318,10 @@ packaging==23.2
     # via
     #   -r requirements/base.txt
     #   drf-yasg
-phonenumbers==8.12.29
+phonenumberslite==8.13.30
     # via
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 pillow==10.2.0
     # via -r requirements/base.txt
 polib==1.1.1
@@ -335,6 +348,7 @@ pyopenssl==23.3.0
     #   -r requirements/base.txt
     #   django-simple-certmanager
     #   josepy
+    #   webauthn
     #   zgw-consumers
 pyquery==1.4.3
     # via -r requirements/test-tools.in
@@ -367,7 +381,7 @@ pyyaml==6.0.1
 qrcode==6.1
     # via
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 redis==3.5.3
     # via
     #   -r requirements/base.txt
@@ -444,6 +458,10 @@ wcwidth==0.2.13
     # via
     #   -r requirements/base.txt
     #   prompt-toolkit
+webauthn==2.0.0
+    # via
+    #   -r requirements/base.txt
+    #   django-two-factor-auth
 webob==1.8.7
     # via webtest
 webtest==2.0.35