udata 10.1.3.dev34283__py2.py3-none-any.whl → 10.1.3.dev34313__py2.py3-none-any.whl

udata/core/user/api.py

@@ -275,6 +275,13 @@ delete_parser.add_argument(
     location="args",
     default=False,
 )
+delete_parser.add_argument(
+    "delete_comments",
+    type=bool,
+    help="Delete comments posted by the user upon user deletion",
+    location="args",
+    default=False,
+)
 
 
 @ns.route("/<user:user>/", endpoint="user")
@@ -317,7 +324,7 @@ class UserAPI(API):
                 403, "You cannot delete yourself with this API. " + 'Use the "me" API instead.'
             )
 
-        user.mark_as_deleted(notify=not args["no_mail"])
+        user.mark_as_deleted(notify=not args["no_mail"], delete_comments=args["delete_comments"])
         return "", 204
 
 

udata/core/user/models.py

@@ -82,6 +82,10 @@ class User(WithMetrics, UserMixin, db.Document):
     ext = db.MapField(db.GenericEmbeddedDocumentField())
     extras = db.ExtrasField()
 
+    # Used to track notification for automatic inactive users deletion
+    # when YEARS_OF_INACTIVITY_BEFORE_DEACTIVATION is set
+    inactive_deletion_notified_at = db.DateTimeField()
+
     before_save = Signal()
     after_save = Signal()
     on_create = Signal()
@@ -237,7 +241,7 @@ class User(WithMetrics, UserMixin, db.Document):
         raise NotImplementedError("""This method should not be using directly.
         Use `mark_as_deleted` (or `_delete` if you know what you're doing)""")
 
-    def mark_as_deleted(self, notify: bool = True):
+    def mark_as_deleted(self, notify: bool = True, delete_comments: bool = False):
         if self.avatar.filename is not None:
             storage = storages.avatars
             storage.delete(self.avatar.filename)
@@ -265,16 +269,17 @@ class User(WithMetrics, UserMixin, db.Document):
                 member for member in organization.members if member.user != self
             ]
             organization.save()
-        for discussion in Discussion.objects(discussion__posted_by=self):
-            # Remove all discussions with current user as only participant
-            if all(message.posted_by == self for message in discussion.discussion):
-                discussion.delete()
-                continue
-
-            for message in discussion.discussion:
-                if message.posted_by == self:
-                    message.content = "DELETED"
-            discussion.save()
+        if delete_comments:
+            for discussion in Discussion.objects(discussion__posted_by=self):
+                # Remove all discussions with current user as only participant
+                if all(message.posted_by == self for message in discussion.discussion):
+                    discussion.delete()
+                    continue
+
+                for message in discussion.discussion:
+                    if message.posted_by == self:
+                        message.content = "DELETED"
+                discussion.save()
         Follow.objects(follower=self).delete()
         Follow.objects(following=self).delete()
 

udata/core/user/tasks.py

@@ -1,10 +1,14 @@
 import logging
+from copy import copy
+from datetime import datetime, timedelta
+
+from flask import current_app
 
 from udata import mail
 from udata.i18n import lazy_gettext as _
-from udata.tasks import task
+from udata.tasks import job, task
 
-from .models import datastore
+from .models import User, datastore
 
 log = logging.getLogger(__name__)
 
@@ -13,3 +17,78 @@ log = logging.getLogger(__name__)
 def send_test_mail(email):
     user = datastore.find_user(email=email)
     mail.send(_("Test mail"), user, "test")
+
+
+@job("notify-inactive-users")
+def notify_inactive_users(self):
+    if not current_app.config["YEARS_OF_INACTIVITY_BEFORE_DEACTIVATION"]:
+        logging.warning(
+            "YEARS_OF_INACTIVITY_BEFORE_DEACTIVATION setting is not set, no deletion planned"
+        )
+        return
+    notification_comparison_date = (
+        datetime.utcnow()
+        - timedelta(days=current_app.config["YEARS_OF_INACTIVITY_BEFORE_DEACTIVATION"] * 365)
+        + timedelta(days=current_app.config["DAYS_BEFORE_ACCOUNT_INACTIVITY_NOTIFY_DELAY"])
+    )
+
+    users_to_notify = User.objects(
+        deleted=None,
+        inactive_deletion_notified_at=None,
+        current_login_at__lte=notification_comparison_date,
+    )
+    for i, user in enumerate(users_to_notify):
+        if i >= current_app.config["MAX_NUMBER_OF_USER_INACTIVITY_NOTIFICATIONS"]:
+            logging.warning("MAX_NUMBER_OF_USER_INACTIVITY_NOTIFICATIONS reached, stopping here.")
+            return
+        mail.send(
+            _("Inactivity of your {site} account").format(site=current_app.config["SITE_TITLE"]),
+            user,
+            "account_inactivity",
+            user=user,
+        )
+        logging.debug(f"Notified {user.email} of account inactivity")
+        user.inactive_deletion_notified_at = datetime.utcnow()
+        user.save()
+
+    logging.info(f"Notified {users_to_notify.count()} inactive users")
+
+
+@job("delete-inactive-users")
+def delete_inactive_users(self):
+    if not current_app.config["YEARS_OF_INACTIVITY_BEFORE_DEACTIVATION"]:
+        logging.warning(
+            "YEARS_OF_INACTIVITY_BEFORE_DEACTIVATION setting is not set, no deletion planned"
+        )
+        return
+
+    # Clear inactive_deletion_notified_at field if user has logged in since notification
+    for user in User.objects(deleted=None, inactive_deletion_notified_at__exists=True):
+        if user.current_login_at > user.inactive_deletion_notified_at:
+            user.inactive_deletion_notified_at = None
+            user.save()
+
+    # Delete inactive users upon notification delay if user still hasn't logged in
+    deletion_comparison_date = datetime.utcnow() - timedelta(
+        days=current_app.config["YEARS_OF_INACTIVITY_BEFORE_DEACTIVATION"] * 365
+    )
+    notified_at = datetime.utcnow() - timedelta(
+        days=current_app.config["DAYS_BEFORE_ACCOUNT_INACTIVITY_NOTIFY_DELAY"]
+    )
+    users_to_delete = User.objects(
+        deleted=None,
+        current_login_at__lte=deletion_comparison_date,
+        inactive_deletion_notified_at__lte=notified_at,
+    )
+    for user in users_to_delete:
+        copied_user = copy(user)
+        user.mark_as_deleted(notify=False, delete_comments=False)
+        logging.warning(f"Deleted user {copied_user.email} due to account inactivity")
+        mail.send(
+            _("Deletion of your inactive {site} account").format(
+                site=current_app.config["SITE_TITLE"]
+            ),
+            copied_user,
+            "inactive_account_deleted",
+        )
+    logging.info(f"Deleted {users_to_delete.count()} inactive users")

udata/core/user/tests/test_user_model.py

@@ -18,7 +18,7 @@ class UserModelTest:
         user = UserFactory()
         other_user = UserFactory()
         org = OrganizationFactory(editors=[user])
-        discussion_only_user = DiscussionFactory(
+        discussion = DiscussionFactory(
             user=user,
             subject=org,
             discussion=[
@@ -26,14 +26,6 @@ class UserModelTest:
                 MessageDiscussionFactory(posted_by=user),
             ],
         )
-        discussion_with_other = DiscussionFactory(
-            user=other_user,
-            subject=org,
-            discussion=[
-                MessageDiscussionFactory(posted_by=other_user),
-                MessageDiscussionFactory(posted_by=user),
-            ],
-        )
         user_follow_org = Follow.objects.create(follower=user, following=org)
         user_followed = Follow.objects.create(follower=other_user, following=user)
 
@@ -42,15 +34,40 @@ class UserModelTest:
         org.reload()
         assert len(org.members) == 0
 
-        assert Discussion.objects(id=discussion_only_user.id).first() is None
-        discussion_with_other.reload()
-        assert discussion_with_other.discussion[1].content == "DELETED"
+        # discussions are kept by default
+        discussion.reload()
+        assert len(discussion.discussion) == 2
+        assert discussion.discussion[1].content != "DELETED"
 
         assert Follow.objects(id=user_follow_org.id).first() is None
         assert Follow.objects(id=user_followed.id).first() is None
 
         assert user.slug == "deleted"
 
+    def test_mark_as_deleted_with_comments_deletion(self):
+        user = UserFactory()
+        other_user = UserFactory()
+        discussion_only_user = DiscussionFactory(
+            user=user,
+            discussion=[
+                MessageDiscussionFactory(posted_by=user),
+                MessageDiscussionFactory(posted_by=user),
+            ],
+        )
+        discussion_with_other = DiscussionFactory(
+            user=other_user,
+            discussion=[
+                MessageDiscussionFactory(posted_by=other_user),
+                MessageDiscussionFactory(posted_by=user),
+            ],
+        )
+
+        user.mark_as_deleted(delete_comments=True)
+
+        assert Discussion.objects(id=discussion_only_user.id).first() is None
+        discussion_with_other.reload()
+        assert discussion_with_other.discussion[1].content == "DELETED"
+
     def test_mark_as_deleted_slug_multiple(self):
         user = UserFactory()
         other_user = UserFactory()

udata/settings.py

@@ -115,6 +115,11 @@ class Defaults(object):
 
     SECURITY_RETURN_GENERIC_RESPONSES = False
 
+    # Inactive users settings
+    YEARS_OF_INACTIVITY_BEFORE_DELETION = None
+    DAYS_BEFORE_ACCOUNT_INACTIVITY_NOTIFY_DELAY = 30
+    MAX_NUMBER_OF_USER_INACTIVITY_NOTIFICATIONS = 200
+
     # Sentry configuration
     SENTRY_DSN = None
     SENTRY_TAGS = {}