Skip to content

Commit

Permalink
Merge pull request #1003 from maykinmedia/feature/replace-2fa
Browse files Browse the repository at this point in the history 
[#2076] Replace 2FA with maykin-2fa
  • Loading branch information
@pi-sigma
pi-sigma authored Feb 21, 2024
2 parents 651f7cd + 2330eff commit 8f11f62
Show file tree
Hide file tree
Showing 28 changed files with 191 additions and 69 deletions.
2 changes: 1 addition & 1 deletion requirements/base.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ django-redis
django-rosetta
django-sniplates
django-treebeard
maykin-django-two-factor-auth
maykin-2fa
phonenumbers
django-localflavor
django-privates
Expand Down
29 changes: 21 additions & 8 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
css-inline==0.13.0
# via
# -r requirements/base.in
Expand Down Expand Up @@ -113,12 +118,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 @@ -182,7 +188,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
Expand All @@ -203,10 +209,10 @@ django-ordered-model==3.7.4
# via
# -r requirements/base.in
# django-admin-index
django-otp==1.1.1
# via maykin-django-two-factor-auth
django-otp==1.3.0
# 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 @@ -251,6 +257,8 @@ django-treebeard==4.4
# -r requirements/base.in
# django-cms
# djangocms-attributes-field
django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
# via maykin-2fa
django-view-breadcrumbs==2.2.4
# via -r requirements/base.in
django-yubin==1.7.1
Expand Down Expand Up @@ -358,7 +366,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==1.0.0
# via -r requirements/base.in
maykin-python3-saml==1.14.0.post0
# via
Expand All @@ -382,8 +390,10 @@ orderedmultidict==1.0.1
# via furl
packaging==23.0
# via djangocms-text-ckeditor
phonenumbers==8.12.33
phonenumbers==8.13.29
# via -r requirements/base.in
phonenumberslite==8.13.29
# via django-two-factor-auth
pillow==10.1.0
# via
# -r requirements/base.in
Expand Down Expand Up @@ -415,6 +425,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 @@ -445,7 +456,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 @@ -520,6 +531,8 @@ wcwidth==0.2.5
# via prompt-toolkit
weasyprint==54.2
# via -r requirements/base.in
webauthn==2.0.0
# via django-two-factor-auth
webencodings==0.5.1
# via
# cssselect2
Expand Down
45 changes: 37 additions & 8 deletions requirements/ci.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 @@ -54,6 +59,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 @@ -118,6 +128,7 @@ cryptography==41.0.7
# josepy
# mozilla-django-oidc
# pyopenssl
# webauthn
css-inline==0.13.0
# via
# -c requirements/base.txt
Expand Down Expand Up @@ -183,12 +194,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 @@ -292,7 +304,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
Expand Down Expand Up @@ -332,16 +344,16 @@ django-ordered-model==3.7.4
# -c requirements/base.txt
# -r requirements/base.txt
# django-admin-index
django-otp==1.1.1
django-otp==1.3.0
# 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 @@ -414,6 +426,12 @@ django-treebeard==4.4
# -r requirements/base.txt
# django-cms
# djangocms-attributes-field
django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
# django-two-factor-auth
# maykin-2fa
django-view-breadcrumbs==2.2.4
# via
# -c requirements/base.txt
Expand Down Expand Up @@ -632,7 +650,7 @@ markuppy==1.14
# -c requirements/base.txt
# -r requirements/base.txt
# tablib
maykin-django-two-factor-auth==2.0.4
maykin-2fa==1.0.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -692,10 +710,15 @@ pathspec==0.12.1
# via black
pep8==1.7.1
# via -r requirements/test-tools.in
phonenumbers==8.12.33
phonenumbers==8.13.29
# 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 @@ -761,6 +784,7 @@ pyopenssl==23.3.0
# django-simple-certmanager
# josepy
# maykin-python3-saml
# webauthn
# zgw-consumers
pyphen==0.12.0
# via
Expand Down Expand Up @@ -818,7 +842,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 @@ -947,6 +971,11 @@ weasyprint==54.2
# via
# -c requirements/base.txt
# -r requirements/base.txt
webauthn==2.0.0
# 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 8f11f62

Please sign in to comment.