Skip to content

Commit

Permalink
[WIP] First attempt to replace 2FA with maykin-2fa
Browse files Browse the repository at this point in the history
  • Loading branch information
alextreme authored and pi-sigma committed Feb 5, 2024
1 parent e8471d8 commit cfb3236
Show file tree
Hide file tree
Showing 7 changed files with 134 additions and 47 deletions.
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ django-redis
django-rosetta
django-sniplates
django-treebeard
maykin-django-two-factor-auth
maykin-2fa
phonenumbers
django-localflavor
django-privates
Expand Down
42 changes: 28 additions & 14 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -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
#
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -61,6 +65,7 @@ cryptography==41.0.7
# josepy
# mozilla-django-oidc
# pyopenssl
# webauthn
cssselect2==0.4.1
# via
# svglib
Expand Down Expand Up @@ -109,12 +114,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
Expand Down Expand Up @@ -178,7 +184,7 @@ django-filter==21.1
django-formtools==2.3
# via
# django-cms
# maykin-django-two-factor-auth
# django-two-factor-auth
django-hijack==3.0.4
# via -r requirements/base.in
django-htmx==1.13.0
Expand All @@ -202,9 +208,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
Expand Down Expand Up @@ -249,6 +255,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
Expand Down Expand Up @@ -299,9 +307,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
Expand Down Expand Up @@ -355,7 +361,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
Expand All @@ -381,6 +387,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
Expand All @@ -398,6 +406,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
Expand All @@ -412,6 +424,7 @@ pyopenssl==23.3.0
# django-simple-certmanager
# josepy
# maykin-python3-saml
# webauthn
# zgw-consumers
pyphen==0.12.0
# via weasyprint
Expand Down Expand Up @@ -442,7 +455,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
Expand Down Expand Up @@ -484,9 +497,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
Expand All @@ -495,6 +506,7 @@ tinycss2==1.1.1
# weasyprint
typing-extensions==4.4.0
# via
# pydantic
# pyee
# xsdata
uritemplate==4.1.1
Expand All @@ -516,6 +528,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
Expand Down
54 changes: 43 additions & 11 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -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
#
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -115,6 +125,7 @@ cryptography==41.0.7
# josepy
# mozilla-django-oidc
# pyopenssl
# webauthn
cssselect==1.1.0
# via pyquery
cssselect2==0.4.1
Expand Down Expand Up @@ -175,12 +186,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
Expand Down Expand Up @@ -284,7 +296,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-hijack==3.0.4
# via
# -c requirements/base.txt
Expand Down Expand Up @@ -332,12 +344,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
Expand Down Expand Up @@ -410,6 +422,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
Expand Down Expand Up @@ -470,7 +487,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
Expand Down Expand Up @@ -512,7 +528,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
Expand Down Expand Up @@ -623,7 +638,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
Expand Down Expand Up @@ -681,6 +696,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
Expand Down Expand Up @@ -714,6 +734,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
Expand All @@ -740,6 +766,7 @@ pyopenssl==23.3.0
# django-simple-certmanager
# josepy
# maykin-python3-saml
# webauthn
# zgw-consumers
pyphen==0.12.0
# via
Expand Down Expand Up @@ -797,7 +824,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
Expand Down Expand Up @@ -870,7 +897,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
Expand All @@ -888,6 +914,7 @@ typing-extensions==4.4.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
# pydantic
# pyee
# xsdata
uritemplate==4.1.1
Expand Down Expand Up @@ -925,6 +952,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
Expand Down
Loading

0 comments on commit cfb3236

Please sign in to comment.