Merge pull request #696 from maykinmedia/develop

Release v1.8
maykinmedia · Jun 23, 2023 · 26339be · 26339be
2 parents a041ff7 + d63bf9e
commit 26339be
Show file tree

Hide file tree

Showing 149 changed files with 4,953 additions and 2,066 deletions.
diff --git a/README.rst b/README.rst
@@ -3,7 +3,7 @@ Open Inwoner
 ==================
 
 
-:Version: 1.7
+:Version: 1.8
 :Source: https://github.com/maykinmedia/open-inwoner
 :Keywords: inwoner
 :PythonVersion: 3.9

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -136,7 +136,6 @@ django-better-admin-arrayfield==1.4.2
 django-choices==1.7.2
     # via
     #   -r requirements/base.in
-    #   django-digid-eherkenning
     #   mail-editor
 django-ckeditor==6.2.0
     # via mail-editor
@@ -161,7 +160,7 @@ django-csp==3.7
     # via -r requirements/base.in
 django-csp-reports==1.8.1
     # via -r requirements/base.in
-django-digid-eherkenning==0.4.1
+django-digid-eherkenning==0.7.0
     # via -r requirements/base.in
 django-elasticsearch-dsl==7.2.1
     # via -r requirements/base.in
@@ -232,12 +231,15 @@ django-sessionprofile==1.0
     #   -r requirements/base.in
     #   django-digid-eherkenning
 django-simple-certmanager==1.3.0
-    # via zgw-consumers
+    # via
+    #   django-digid-eherkenning
+    #   zgw-consumers
 django-sniplates==0.7.0
     # via -r requirements/base.in
 django-solo==1.2.0
     # via
     #   -r requirements/base.in
+    #   django-digid-eherkenning
     #   django-open-forms-client
     #   mozilla-django-oidc-db
     #   notifications-api-common
@@ -357,7 +359,9 @@ markuppy==1.14
 maykin-django-two-factor-auth==2.0.4
     # via -r requirements/base.in
 maykin-python3-saml==1.14.0.post0
-    # via -r requirements/base.in
+    # via
+    #   -r requirements/base.in
+    #   django-digid-eherkenning
 messagebird==2.1.0
     # via -r requirements/base.in
 mozilla-django-oidc==2.0.0

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -210,7 +210,6 @@ django-choices==1.7.2
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-    #   django-digid-eherkenning
     #   mail-editor
 django-ckeditor==6.2.0
     # via
@@ -249,7 +248,7 @@ django-csp-reports==1.8.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-django-digid-eherkenning==0.4.1
+django-digid-eherkenning==0.7.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -383,6 +382,7 @@ django-simple-certmanager==1.3.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   django-digid-eherkenning
     #   zgw-consumers
 django-sniplates==0.7.0
     # via
@@ -392,6 +392,7 @@ django-solo==1.2.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   django-digid-eherkenning
     #   django-open-forms-client
     #   mozilla-django-oidc-db
     #   notifications-api-common
@@ -628,6 +629,7 @@ maykin-python3-saml==1.14.0.post0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   django-digid-eherkenning
 mccabe==0.6.1
     # via pylint
 messagebird==2.1.0

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -235,7 +235,6 @@ django-choices==1.7.2
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-    #   django-digid-eherkenning
     #   mail-editor
 django-ckeditor==6.2.0
     # via
@@ -276,7 +275,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==0.4.1
+django-digid-eherkenning==0.7.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -412,6 +411,7 @@ django-simple-certmanager==1.3.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   django-digid-eherkenning
     #   zgw-consumers
 django-sniplates==0.7.0
     # via
@@ -421,6 +421,7 @@ django-solo==1.2.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   django-digid-eherkenning
     #   django-open-forms-client
     #   mozilla-django-oidc-db
     #   notifications-api-common
@@ -686,6 +687,7 @@ maykin-python3-saml==1.14.0.post0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   django-digid-eherkenning
 mccabe==0.6.1
     # via
     #   -c requirements/ci.txt

diff --git a/src/open_inwoner/accounts/admin.py b/src/open_inwoner/accounts/admin.py
@@ -71,16 +71,9 @@ class _UserAdmin(ImageCroppingMixin, UserAdmin):
                     "infix",
                     "last_name",
                     "contact_type",
-                    "bsn",
-                    "rsin",
                     "oidc_id",
-                    "birthday",
                     "image",
                     "cropping",
-                    "street",
-                    "housenumber",
-                    "postcode",
-                    "city",
                     "phonenumber",
                     "selected_categories",
                 )

diff --git a/src/open_inwoner/accounts/forms.py b/src/open_inwoner/accounts/forms.py
@@ -1,5 +1,3 @@
-import os
-
 from django import forms
 from django.conf import settings
 from django.contrib.auth import authenticate
@@ -12,15 +10,11 @@
 from django_registration.forms import RegistrationForm
 
 from open_inwoner.configurations.models import SiteConfiguration
-from open_inwoner.openzaak.models import (
-    OpenZaakConfig,
-    ZaakTypeInformatieObjectTypeConfig,
-)
 from open_inwoner.pdc.models.category import Category
 from open_inwoner.utils.forms import LimitedUploadFileField, PrivateFileWidget
 from open_inwoner.utils.validators import (
+    CharFieldValidator,
     format_phone_number,
-    validate_charfield_entry,
     validate_phone_number,
 )
 
@@ -313,10 +307,10 @@ class ContactFilterForm(forms.Form):
 
 class ContactCreateForm(forms.Form):
     first_name = forms.CharField(
-        label=_("First name"), max_length=255, validators=[validate_charfield_entry]
+        label=_("First name"), max_length=255, validators=[CharFieldValidator()]
     )
     last_name = forms.CharField(
-        label=_("Last name"), max_length=255, validators=[validate_charfield_entry]
+        label=_("Last name"), max_length=255, validators=[CharFieldValidator()]
     )
     email = forms.EmailField(label=_("Email"))
 
@@ -551,51 +545,3 @@ class Meta:
     def __init__(self, users, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["is_for"].queryset = User.objects.filter(pk__in=users)
-
-
-class CaseUploadForm(forms.Form):
-    title = forms.CharField(
-        label=_("Titel document"), max_length=255, validators=[validate_charfield_entry]
-    )
-    type = forms.ModelChoiceField(
-        ZaakTypeInformatieObjectTypeConfig.objects.none(),
-        empty_label=None,
-        label=_("Bestand type"),
-    )
-    file = forms.FileField(label=_("Bestand"))
-
-    def __init__(self, case, **kwargs):
-        super().__init__(**kwargs)
-
-        if case:
-            self.fields[
-                "type"
-            ].queryset = ZaakTypeInformatieObjectTypeConfig.objects.filter_enabled_for_case_type(
-                case.zaaktype
-            )
-
-        choices = self.fields["type"].choices
-
-        if choices and len(choices) == 1:
-            self.fields["type"].initial = list(choices)[0][0].value
-            self.fields["type"].widget = forms.HiddenInput()
-
-    def clean_file(self):
-        file = self.cleaned_data["file"]
-
-        config = OpenZaakConfig.get_solo()
-        max_allowed_size = 1024**2 * config.max_upload_size
-        allowed_extensions = sorted(config.allowed_file_extensions)
-        filename, file_extension = os.path.splitext(file.name)
-
-        if file.size > max_allowed_size:
-            raise ValidationError(
-                f"Een aangeleverd bestand dient maximaal {config.max_upload_size} MB te zijn, uw bestand is te groot."
-            )
-
-        if file_extension.lower().replace(".", "") not in allowed_extensions:
-            raise ValidationError(
-                f"Het type bestand dat u hebt geüpload is ongeldig. Geldige bestandstypen zijn: {', '.join(allowed_extensions)}"
-            )
-
-        return file
diff --git a/src/open_inwoner/accounts/management/commands/deleteinactiveusers.py b/src/open_inwoner/accounts/management/commands/deleteinactiveusers.py
diff --git a/src/open_inwoner/accounts/middleware.py b/src/open_inwoner/accounts/middleware.py
@@ -29,15 +29,21 @@ def __call__(self, request):
             # If the user is currently not editing their information, but it is required
             # redirect to that view.
 
-            # DigiD can be disabled, in which case the digid app isn't available
-            digid_logout = "/digid/logout/"
             try:
                 digid_logout = reverse("digid:logout")
-            except:  # nosec
-                pass
+                digid_slo_redirect = reverse("digid:slo-redirect")
+            except NoReverseMatch:
+                # temporary fix to make tests pass in case reverse fails
+                digid_logout = "/digid/logout/"
+                digid_slo_redirect = "/digid/slo/redirect/"
             if (
                 not request.path.startswith(
-                    (necessary_fields_url, reverse("logout"), digid_logout)
+                    (
+                        necessary_fields_url,
+                        reverse("logout"),
+                        digid_logout,
+                        digid_slo_redirect,
+                    )
                 )
                 and request.user.require_necessary_fields()
             ):