[WIP] First attempt to replace 2FA with maykin-2fa

maykinmedia · Feb 6, 2024 · 4d8dc1a · 4d8dc1a
1 parent a5f2d32
commit 4d8dc1a
Show file tree

Hide file tree

Showing 7 changed files with 142 additions and 46 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -22,7 +22,7 @@ django-redis
 django-rosetta
 django-sniplates
 django-treebeard
-maykin-django-two-factor-auth
+maykin-2fa
 phonenumbers
 django-localflavor
 django-privates

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
-# by the following command:
+# This file is autogenerated by pip-compile with python 3.11
+# To update, run:
 #
 #    ./bin/compile_dependencies.sh
 #
@@ -12,6 +12,8 @@ ape-pie==0.1.0
     # via zgw-consumers
 asgiref==3.4.1
     # via django
+asn1crypto==1.5.1
+    # via webauthn
 attrs==21.2.0
     # via
     #   glom
@@ -26,6 +28,8 @@ boltons==21.0.0
     #   glom
 brotli==1.0.9
     # via fonttools
+cbor2==5.6.0
+    # via webauthn
 celery==5.2.7
     # via notifications-api-common
 certifi==2023.11.17
@@ -61,6 +65,7 @@ cryptography==41.0.7
     #   josepy
     #   mozilla-django-oidc
     #   pyopenssl
+    #   webauthn
 cssselect2==0.4.1
     # via
     #   svglib
@@ -108,12 +113,13 @@ django==3.2.23
     #   django-sniplates
     #   django-timeline-logger
     #   django-treebeard
+    #   django-two-factor-auth
     #   django-view-breadcrumbs
     #   djangorestframework
     #   drf-spectacular
     #   easy-thumbnails
     #   mail-editor
-    #   maykin-django-two-factor-auth
+    #   maykin-2fa
     #   mozilla-django-oidc
     #   mozilla-django-oidc-db
     #   notifications-api-common
@@ -177,7 +183,7 @@ django-filter==21.1
 django-formtools==2.3
     # via
     #   django-cms
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 django-htmx==1.13.0
     # via -r requirements/base.in
 django-image-cropping==1.7
@@ -199,9 +205,9 @@ django-ordered-model==3.4.3
     #   -r requirements/base.in
     #   django-admin-index
 django-otp==1.1.1
-    # 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-polymorphic==3.0.0
     # via django-filer
 django-privates==1.5.0
@@ -246,6 +252,8 @@ django-treebeard==4.4
     #   -r requirements/base.in
     #   django-cms
     #   djangocms-attributes-field
+django-two-factor-auth[phonenumberslite,webauthn]==1.15.5
+    # via maykin-2fa
 django-view-breadcrumbs==2.2.4
     # via -r requirements/base.in
 django-yubin==1.7.1
@@ -296,9 +304,7 @@ face==20.1.1
 fontawesomefree==6.4.2
     # via -r requirements/base.in
 fonttools[woff]==4.29.1
-    # via
-    #   fonttools
-    #   weasyprint
+    # via weasyprint
 furl==2.1.3
     # via
     #   -r requirements/base.in
@@ -352,7 +358,7 @@ markdown==3.3.6
     # via -r requirements/base.in
 markuppy==1.14
     # via tablib
-maykin-django-two-factor-auth==2.0.4
+maykin-2fa==0.2.0
     # via -r requirements/base.in
 maykin-python3-saml==1.14.0.post0
     # via
@@ -378,6 +384,8 @@ packaging==23.0
     # via djangocms-text-ckeditor
 phonenumbers==8.12.33
     # via -r requirements/base.in
+phonenumberslite==8.13.29
+    # via django-two-factor-auth
 pillow==10.1.0
     # via
     #   -r requirements/base.in
@@ -395,6 +403,10 @@ psycopg2==2.9.9
     # via -r requirements/base.in
 pycparser==2.20
     # via cffi
+pydantic==1.10.14
+    # via
+    #   django-two-factor-auth
+    #   webauthn
 pydyf==0.1.2
     # via weasyprint
 pyee==11.0.1
@@ -409,6 +421,7 @@ pyopenssl==23.3.0
     #   django-simple-certmanager
     #   josepy
     #   maykin-python3-saml
+    #   webauthn
     #   zgw-consumers
 pyphen==0.12.0
     # via weasyprint
@@ -439,7 +452,7 @@ pyyaml==6.0
     #   gemma-zds-client
     #   tablib
 qrcode==6.1
-    # via maykin-django-two-factor-auth
+    # via django-two-factor-auth
 redis==3.5.3
     # via django-redis
 reportlab==3.6.13
@@ -481,9 +494,7 @@ sqlparse==0.4.4
 svglib==1.5.1
     # via easy-thumbnails
 tablib[html,ods,xls,xlsx,yaml]==3.1.0
-    # via
-    #   django-import-export
-    #   tablib
+    # via django-import-export
 tinycss2==1.1.1
     # via
     #   -r requirements/base.in
@@ -492,6 +503,7 @@ tinycss2==1.1.1
     #   weasyprint
 typing-extensions==4.4.0
     # via
+    #   pydantic
     #   pyee
     #   xsdata
 uritemplate==4.1.1
@@ -513,6 +525,8 @@ wcwidth==0.2.5
     # via prompt-toolkit
 weasyprint==54.2
     # via -r requirements/base.in
+webauthn==1.11.1
+    # via django-two-factor-auth
 webencodings==0.5.1
     # via
     #   cssselect2

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
-# by the following command:
+# This file is autogenerated by pip-compile with python 3.11
+# To update, run:
 #
 #    ./bin/compile_dependencies.sh
 #
@@ -23,6 +23,11 @@ asgiref==3.4.1
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   django
+asn1crypto==1.5.1
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   webauthn
 astroid==2.15.8
     # via pylint
 attrs==21.2.0
@@ -52,6 +57,11 @@ brotli==1.0.9
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   fonttools
+cbor2==5.6.0
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   webauthn
 celery==5.2.7
     # via
     #   -c requirements/base.txt
@@ -115,6 +125,7 @@ cryptography==41.0.7
     #   josepy
     #   mozilla-django-oidc
     #   pyopenssl
+    #   webauthn
 cssselect==1.1.0
     # via pyquery
 cssselect2==0.4.1
@@ -174,12 +185,13 @@ django==3.2.23
     #   django-sniplates
     #   django-timeline-logger
     #   django-treebeard
+    #   django-two-factor-auth
     #   django-view-breadcrumbs
     #   djangorestframework
     #   drf-spectacular
     #   easy-thumbnails
     #   mail-editor
-    #   maykin-django-two-factor-auth
+    #   maykin-2fa
     #   mozilla-django-oidc
     #   mozilla-django-oidc-db
     #   notifications-api-common
@@ -283,7 +295,7 @@ django-formtools==2.3
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   django-cms
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 django-htmx==1.13.0
     # via
     #   -c requirements/base.txt
@@ -327,12 +339,12 @@ django-otp==1.1.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 django-phonenumber-field==5.2.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 django-polymorphic==3.0.0
     # via
     #   -c requirements/base.txt
@@ -405,6 +417,11 @@ django-treebeard==4.4
     #   -r requirements/base.txt
     #   django-cms
     #   djangocms-attributes-field
+django-two-factor-auth[phonenumberslite,webauthn]==1.15.5
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   maykin-2fa
 django-view-breadcrumbs==2.2.4
     # via
     #   -c requirements/base.txt
@@ -465,7 +482,6 @@ easy-thumbnails[svg]==2.8.5
     #   -r requirements/base.txt
     #   django-filer
     #   djangocms-picture
-    #   easy-thumbnails
 ecs-logging==2.1.0
     # via
     #   -c requirements/base.txt
@@ -507,7 +523,6 @@ fonttools[woff]==4.29.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-    #   fonttools
     #   weasyprint
 freezegun==1.1.0
     # via -r requirements/test-tools.in
@@ -618,7 +633,7 @@ markuppy==1.14
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   tablib
-maykin-django-two-factor-auth==2.0.4
+maykin-2fa==0.2.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -676,6 +691,11 @@ phonenumbers==8.12.33
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+phonenumberslite==8.13.29
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   django-two-factor-auth
 pillow==10.1.0
     # via
     #   -c requirements/base.txt
@@ -709,6 +729,12 @@ pycparser==2.20
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   cffi
+pydantic==1.10.14
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   django-two-factor-auth
+    #   webauthn
 pydyf==0.1.2
     # via
     #   -c requirements/base.txt
@@ -735,6 +761,7 @@ pyopenssl==23.3.0
     #   django-simple-certmanager
     #   josepy
     #   maykin-python3-saml
+    #   webauthn
     #   zgw-consumers
 pyphen==0.12.0
     # via
@@ -792,7 +819,7 @@ qrcode==6.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 redis==3.5.3
     # via
     #   -c requirements/base.txt
@@ -865,7 +892,6 @@ tablib[html,ods,xls,xlsx,yaml]==3.1.0
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   django-import-export
-    #   tablib
 tblib==1.7.0
     # via -r requirements/test-tools.in
 text-unidecode==1.3
@@ -883,6 +909,7 @@ typing-extensions==4.4.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   pydantic
     #   pyee
     #   xsdata
 uritemplate==4.1.1
@@ -920,6 +947,11 @@ weasyprint==54.2
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+webauthn==1.11.1
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   django-two-factor-auth
 webencodings==0.5.1
     # via
     #   -c requirements/base.txt