Merge pull request #287 from maykinmedia/deps/digid-saml

Deps/digid saml
maykinmedia · Jul 12, 2022 · 551ad4b · 551ad4b
2 parents 3615a96 + 4a99091
commit 551ad4b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -60,9 +60,8 @@ elastic-apm  # Elastic APM integration
 beautifulsoup4
 
 # DigidLocal
-# UNSAFE! Should be replaced with pinned version
-git+https://github.com/maykinmedia/django-digid-eherkenning.git@feature/digid-logout-soap
-git+https://github.com/maykinmedia/python3-saml.git@f587f77b78be79d51139f29a957b406072e2b537#egg=python3_saml
+django-digid-eherkenning
+git+https://github.com/maykinmedia/python3-saml.git@9f1ffa86fdfe68ccbcf063613c6e6cbb5447c360#egg=python3_saml
 pyopenssl
 django-sessionprofile
 

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -115,7 +115,7 @@ django-csp==3.7
     # via -r requirements/base.in
 django-csp-reports==1.8.1
     # via -r requirements/base.in
-django-digid-eherkenning @ git+https://github.com/maykinmedia/django-digid-eherkenning.git@feature/digid-logout-soap
+django-digid-eherkenning==0.4.1
     # via -r requirements/base.in
 django-elasticsearch-dsl==7.2.1
     # via -r requirements/base.in
@@ -304,7 +304,7 @@ python-dotenv==0.19.0
     # via -r requirements/base.in
 python-stdnum==1.17
     # via django-localflavor
-python3_saml @ git+https://github.com/maykinmedia/python3-saml.git@f587f77b78be79d51139f29a957b406072e2b537
+python3_saml @ git+https://github.com/maykinmedia/python3-saml.git@9f1ffa86fdfe68ccbcf063613c6e6cbb5447c360
     # via -r requirements/base.in
 pytz==2021.3
     # via

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -180,7 +180,7 @@ django-csp-reports==1.8.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-django-digid-eherkenning @ git+https://github.com/maykinmedia/django-digid-eherkenning.git@feature/digid-logout-soap
+django-digid-eherkenning==0.4.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -579,7 +579,7 @@ python-stdnum==1.17
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   django-localflavor
-python3_saml @ git+https://github.com/maykinmedia/python3-saml.git@f587f77b78be79d51139f29a957b406072e2b537
+python3-saml @ git+https://github.com/maykinmedia/python3-saml.git@9f1ffa86fdfe68ccbcf063613c6e6cbb5447c360
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -44,6 +44,8 @@ brotli==1.0.9
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   fonttools
+build==0.8.0
+    # via pip-tools
 certifi==2021.5.30
     # via
     #   -c requirements/ci.txt
@@ -207,7 +209,7 @@ django-csp-reports==1.8.1
     #   -r requirements/ci.txt
 django-debug-toolbar==3.2.2
     # via -r requirements/dev.in
-django-digid-eherkenning @ git+https://github.com/maykinmedia/django-digid-eherkenning.git@feature/digid-logout-soap
+django-digid-eherkenning==0.4.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -558,13 +560,15 @@ orderedmultidict==1.0.1
     #   -r requirements/ci.txt
     #   furl
 packaging==21.0
-    # via sphinx
+    # via
+    #   build
+    #   sphinx
 pathspec==0.9.0
     # via black
 pbr==5.9.0
     # via stevedore
 pep517==0.11.0
-    # via pip-tools
+    # via build
 pep8==1.7.1
     # via
     #   -c requirements/ci.txt
@@ -579,7 +583,7 @@ pillow==9.0.1
     #   -r requirements/ci.txt
     #   easy-thumbnails
     #   weasyprint
-pip-tools==6.3.0
+pip-tools==6.8.0
     # via -r requirements/dev.in
 platformdirs==2.4.0
     # via
@@ -669,7 +673,7 @@ python-stdnum==1.17
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   django-localflavor
-python3_saml @ git+https://github.com/maykinmedia/python3-saml.git@f587f77b78be79d51139f29a957b406072e2b537
+python3-saml @ git+https://github.com/maykinmedia/python3-saml.git@9f1ffa86fdfe68ccbcf063613c6e6cbb5447c360
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -808,6 +812,7 @@ toml==0.10.2
 tomli==1.2.1
     # via
     #   black
+    #   build
     #   pep517
 typing-extensions==3.10.0.2
     # via

diff --git a/src/open_inwoner/accounts/middleware.py b/src/open_inwoner/accounts/middleware.py
@@ -18,7 +18,9 @@ def __call__(self, request):
             # If the user is currently not editing their information, but it is required
             # redirect to that view.
             if (
-                not request.path.startswith((necessary_fields_url, reverse("logout")))
+                not request.path.startswith(
+                    (necessary_fields_url, reverse("logout"), reverse("digid:logout"))
+                )
                 and request.user.require_necessary_fields()
             ):
                 return HttpResponseRedirect(necessary_fields_url)