More fixes for address changes

Author: sthapa

froide/account/admin.py

@@ -105,7 +105,6 @@ class UserAdmin(RecentAuthRequiredAdminMixin, DjangoUserAdmin):
             _("Profile info"),
             {
                 "fields": (
-                    "address",
                     "organization_name",
                     "organization_url",
                     "private",

froide/account/api_views.py

@@ -66,7 +66,7 @@ class Meta:
 class UserFullSerializer(UserEmailDetailSerializer):
     class Meta:
         model = User
-        fields = UserEmailDetailSerializer.Meta.fields + ("address",)
+        fields = UserEmailDetailSerializer.Meta.fields
 
 
 class ProfileView(views.APIView):

froide/account/export.py

@@ -181,7 +181,6 @@ def export_user_data(user):
             "first_name",
             "last_name",
             "email",
-            "address",
             "terms",
             "organization",
             "organization_url",

froide/account/factories.py

@@ -21,6 +21,5 @@ class Meta:
     last_login = datetime(2000, 1, 1).replace(tzinfo=timezone.utc)
     date_joined = datetime(1999, 1, 1).replace(tzinfo=timezone.utc)
     private = False
-    address = "Dummystreet5\n12345 Town"
     organization_name = ""
     organization_url = ""

froide/account/forms.py

@@ -25,7 +25,7 @@
 
 from . import account_email_changed
 from .auth import complete_mfa_authenticate_for_method
-from .models import AccountBlocklist, User
+from .models import User
 from .registries import user_extra_registry
 from .services import AccountService, get_user_for_email
 from .widgets import ConfirmationWidget, PinInputWidget
@@ -97,9 +97,8 @@ class NewUserBaseForm(forms.Form):
     field_order = ["first_name", "last_name", "user_email"]
 
     def __init__(self, *args, **kwargs) -> None:
-        address_required = kwargs.pop("address_required", False)
         super().__init__(*args, **kwargs)
-        if ALLOW_PSEUDONYM and not address_required:
+        if ALLOW_PSEUDONYM:
             self.fields["last_name"].help_text = format_html(
                 _(
                     '<a target="_blank" href="{}">You may use a pseudonym if you don\'t need to receive postal messages</a>.'

froide/account/models.py

@@ -175,7 +175,6 @@ class User(AbstractBaseUser, PermissionsMixin):
     )
 
     private = models.BooleanField(_("Private"), default=False)
-    #address = models.TextField(_("Address"), blank=True)
     terms = models.BooleanField(_("Accepted Terms"), default=True)
 
     profile_text = models.TextField(blank=True)
@@ -264,7 +263,6 @@ def export_csv(cls, queryset, fields=None):
                 "private",
                 "date_joined",
                 "is_staff",
-                "address",
                 "terms",
                 "request_count",
                 ("tags", lambda x: ",".join(str(t) for t in x.tags.all())),
@@ -277,7 +275,6 @@ def as_json(self) -> str:
                 "id": self.id,
                 "first_name": self.first_name,
                 "last_name": self.last_name,
-                "address": self.address,
                 "private": self.private,
                 "email": self.email,
                 "organization": self.organization_name,
@@ -419,8 +416,7 @@ def __str__(self):
 
     def match_user(self, user: User) -> bool:
         return (
-            self.match_field(user, "address")
-            or self.match_field(user, "email")
+            self.match_field(user, "email")
             or self.match_content(self.full_name, user.get_full_name())
         )
 

froide/account/services.py

@@ -87,7 +87,7 @@ def create_user(cls, **data):
 
         user.private = data["private"]
 
-        for key in ("address", "organization_name", "organization_url"):
+        for key in ("organization_name", "organization_url"):
             setattr(user, key, data.get(key, ""))
 
         cls.check_against_blocklist(user)
@@ -345,16 +345,10 @@ def get_user_redactions(self, replacements: Optional[Dict[str, str]] = None):
         repl = {
             "name": str(_("<< Name removed >>")),
             "email": str(_("<< Email removed >>")),
-            "address": str(_("<< Address removed >>")),
         }
         if replacements is not None:
             repl.update(replacements)
 
-        if self.user.address:
-            for line in self.user.address.splitlines():
-                if line.strip():
-                    yield (line.strip(), repl["address"])
-
         if self.user.email:
             yield (self.user.email, repl["email"])
 

froide/account/templatetags/account_tags.py

@@ -17,9 +17,7 @@
 def get_user_form(context, address_required=False):
     request = context["request"]
     if request.user.is_authenticated:
-        return AddressForm(
-            initial={"address": request.user.address}, address_required=address_required
-        )
+        return NewUserForm(address_required=address_required, request=request)
     else:
         return NewUserForm(address_required=address_required, request=request)
 

froide/account/tests/test_account.py

@@ -138,7 +138,6 @@ def test_signup(world, client):
     response = client.post(reverse("account-signup"), post)
     assert response.status_code == 200
     post["user_email"] = "horst.porst@example.com"
-    post["address"] = "MyOwnPrivateStree 5\n31415 Pi-Ville"
 
     response = client.post(reverse("account-signup"), post)
 
@@ -149,7 +148,6 @@ def test_signup(world, client):
     user = User.objects.get(email=post["user_email"])
     assert user.first_name == post["first_name"]
     assert user.last_name == post["last_name"]
-    assert user.address == post["address"]
     assert mail.outbox[0].to[0] == post["user_email"]
 
     # sign up with email that is not confirmed
@@ -179,7 +177,6 @@ def test_overlong_name_signup(world, client):
         "last_name": "Porst" * 6,
         "terms": "on",
         "user_email": "horst.porst@example.com",
-        "address": "MyOwnPrivateStree 5\n31415 Pi-Ville",
         "time": (datetime.utcnow() - timedelta(seconds=30)).timestamp(),
     }
     client.logout()
@@ -198,7 +195,6 @@ def test_signup_too_fast(world, client):
         "last_name": "Porst",
         "terms": "on",
         "user_email": "horst.porst@example.com",
-        "address": "MyOwnPrivateStree 5\n31415 Pi-Ville",
         # Signup in less than 5 seconds
         "time": (datetime.utcnow() - timedelta(seconds=3)).timestamp(),
     }
@@ -215,7 +211,6 @@ def test_signup_same_name(world, client):
         "last_name": "Porst",
         "terms": "on",
         "user_email": "horst.porst@example.com",
-        "address": "MyOwnPrivateStree 5\n31415 Pi-Ville",
         "time": (datetime.utcnow() - timedelta(seconds=30)).timestamp(),
     }
     response = client.post(reverse("account-signup"), post)
@@ -233,7 +228,6 @@ def test_confirmation_process(world, client):
         first_name="Stefan",
         last_name="Wehrmeyer",
         user_email="sw@example.com",
-        address="SomeRandomAddress\n11234 Bern",
         private=True,
     )
     AccountService(user).send_confirmation_mail()
@@ -307,7 +301,6 @@ def test_next_link_signup(world, client):
         "last_name": "Porst",
         "terms": "on",
         "user_email": "horst.porst@example.com",
-        "address": "MyOwnPrivateStree 5\n31415 Pi-Ville",
         "next": url,
         "time": (datetime.utcnow() - timedelta(seconds=30)).timestamp(),
     }
@@ -466,14 +459,10 @@ def test_change_user(world, client):
     assert ok
     response = client.post(reverse("account-change_user"), data)
     assert response.status_code == 302
-    data["address"] = ""
     response = client.post(reverse("account-change_user"), data)
     assert response.status_code == 302
-    data["address"] = "Some Value"
     response = client.post(reverse("account-change_user"), data)
     assert response.status_code == 302
-    user = User.objects.get(username="sw")
-    assert user.address == data["address"]
 
 
 @pytest.mark.django_db
@@ -582,7 +571,6 @@ def test_change_email(world, client):
     response = client.post(
         reverse("account-change_user"),
         {
-            "address": "Test",
             "email": "not-email",
         },
     )
@@ -596,22 +584,20 @@ def test_change_email(world, client):
     response = client.post(
         reverse("account-change_user"),
         {
-            "address": "Test",
             "email": "not-email",
         },
     )
     assert response.status_code == 400
     assert len(mail.outbox) == 0
 
     response = client.post(
-        reverse("account-change_user"), {"address": "Test", "email": user.email}
+        reverse("account-change_user"), {"email": user.email}
     )
     assert response.status_code == 302
     assert len(mail.outbox) == 0
     response = client.post(
         reverse("account-change_user"),
         {
-            "address": "Test",
             "email": new_email,
         },
     )
@@ -697,7 +683,6 @@ def test_account_delete(world, client):
     assert user.last_name == ""
     assert user.email is None
     assert user.username == "u%s" % user.pk
-    assert user.address == ""
     assert user.organization_name == ""
     assert user.organization_url == ""
     assert user.private

froide/account/utils.py

@@ -274,7 +274,7 @@ def delete_undeleted_left_users():
     for user in canceled_but_undeleted:
         start_cancel_account_process(user)
 
-
+# shouldn't be used since we don't store addresses for users
 def parse_address(address):
     match = POSTCODE_RE.search(address)
     if match is None: