Drop mailing address requirements and fields

Author: sthapa

froide/account/forms.py

@@ -51,60 +51,7 @@ class Meta:
         fields = "__all__"
 
 
-ADDRESS_REQUIRED_HELP_TEXT = _(
-    "Your address will not be displayed "
-    "publicly and is only needed because a public agency "
-    "will likely want to send you paper."
-)
-
-ADDRESS_HELP_TEXT = _(
-    "Your address will not be displayed "
-    "publicly and is only needed in case a public agency "
-    "needs to send you paper."
-)
-
-
-class AddressBaseForm(forms.Form):
-    address = forms.CharField(
-        max_length=300,
-        required=False,
-        label=_("Mailing Address"),
-        help_text=ADDRESS_HELP_TEXT,
-        widget=forms.Textarea(
-            attrs={
-                "rows": "3",
-                "class": "form-control",
-                "placeholder": _("Street address,\nPost Code, City"),
-            }
-        ),
-    )
-
-    ALLOW_BLOCKED_ADDRESS = False
-
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
-        if self.fields["address"].required:
-            self.fields["address"].help_text = ADDRESS_REQUIRED_HELP_TEXT
-
-    def get_user(self):
-        raise NotImplementedError
-
-    def clean_address(self) -> str:
-        address = self.cleaned_data["address"]
-        if not address:
-            return address
-        if self.ALLOW_BLOCKED_ADDRESS:
-            return address
-        user = self.get_user()
-        if user is not None:
-            if user.is_staff or user.is_trusted:
-                return address
-            if AccountBlocklist.objects.should_block_address(address):
-                raise forms.ValidationError(_("This address cannot be used by you."))
-        return address
-
-
-class NewUserBaseForm(AddressBaseForm):
+class NewUserBaseForm(forms.Form):
     first_name = forms.CharField(
         max_length=30,
         label=_("First name"),
@@ -265,26 +212,6 @@ def clean(self):
         return cleaned
 
 
-class AddressForm(JSONMixin, AddressBaseForm):
-    ALLOW_BLOCKED_ADDRESS = False
-
-    def __init__(self, *args, **kwargs) -> None:
-        address_required = kwargs.pop("address_required", False)
-        self.request = kwargs.pop("request", None)
-        super().__init__(*args, **kwargs)
-        self.fields["address"].required = address_required
-
-    def get_user(self):
-        return self.request.user
-
-    def save(self, user: SimpleLazyObject) -> None:
-        address = self.cleaned_data["address"]
-        if address:
-            user.address = address
-            AccountService.check_against_blocklist(user, save=False)
-            user.save()
-
-
 class UserLoginForm(AuthenticationForm):
     username = forms.EmailField(
         widget=forms.EmailInput(

froide/account/templatetags/account_tags.py

@@ -6,7 +6,7 @@
 from mfa.models import MFAKey
 
 from ..auth import requires_recent_auth
-from ..forms import AddressForm, NewUserForm
+from ..forms import NewUserForm
 from ..menu import menu_registry
 from ..models import User
 

froide/foirequest/forms/message.py

@@ -13,7 +13,6 @@
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext_lazy
 
-from froide.account.forms import AddressBaseForm
 from froide.account.services import AccountService
 from froide.foirequest.models.event import FoiEvent
 from froide.helper.fields import MultipleFileField
@@ -220,7 +219,7 @@ def save(self):
         self.message.save()
 
 
-class SendMessageForm(AttachmentSaverMixin, AddressBaseForm, forms.Form):
+class SendMessageForm(AttachmentSaverMixin, forms.Form):
     to = forms.ChoiceField(
         label=_("To"), choices=[], required=True, widget=BootstrapRadioSelect
     )

froide/foirequest/views/make_request.py

@@ -15,7 +15,7 @@
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import DetailView, FormView, TemplateView
 
-from froide.account.forms import AddressForm, NewUserForm
+from froide.account.forms import NewUserForm
 from froide.campaign.models import Campaign
 from froide.georegion.models import GeoRegion
 from froide.helper.auth import get_read_queryset

froide/foirequest/views/request_actions.py

@@ -11,7 +11,7 @@
 from django.views.decorators.http import require_POST
 from django.views.generic import UpdateView
 
-from froide.account.forms import AddressForm, NewUserForm
+from froide.account.forms import NewUserForm
 from froide.foirequest.forms.project import AssignProjectForm
 from froide.foirequest.forms.request import RedactDescriptionForm
 from froide.helper.auth import can_manage_object