From fee5375dc47e3890930e82db63d5c98aea2b9a39 Mon Sep 17 00:00:00 2001
From: Tagada <36127788+Tagadda@users.noreply.github.com>
Date: Sun, 4 Jun 2023 23:50:23 +0200
Subject: [PATCH] more verbose logs for user_group _update fix
 YunoHost/issues#2193

---
 locales/en.json | 4 ++++
 src/user.py     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/locales/en.json b/locales/en.json
index 4dcb00ee6..bfc564afd 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -467,13 +467,17 @@
     "group_creation_failed": "Could not create the group '{group}': {error}",
     "group_deleted": "Group '{group}' deleted",
     "group_deletion_failed": "Could not delete the group '{group}': {error}",
+    "group_mailalias_add": "The email alias '{mail}' will be added to the group '{group}'",
+    "group_mailalias_remove": "The email alias '{mail}' will be removed from the group '{group}'",
     "group_no_change": "Nothing to change for group '{group}'",
     "group_unknown": "The group '{group}' is unknown",
     "group_update_aliases": "Updating aliases for group '{group}'",
     "group_update_failed": "Could not update the group '{group}': {error}",
     "group_updated": "Group '{group}' updated",
+    "group_user_add": "The user '{user}' will be added to the group '{group}'",
     "group_user_already_in_group": "User {user} is already in group {group}",
     "group_user_not_in_group": "User {user} is not in group {group}",
+    "group_user_remove": "The user '{user}' will be removed from the group '{group}'",
     "hook_exec_failed": "Could not run script: {path}",
     "hook_exec_not_terminated": "Script did not finish properly: {path}",
     "hook_json_return_error": "Could not read return from hook {path}. Error: {msg}. Raw content: {raw_content}",
diff --git a/src/user.py b/src/user.py
index f17a60942..3f453f69e 100644
--- a/src/user.py
+++ b/src/user.py
@@ -1189,6 +1189,7 @@ def user_group_update(
                 )
             else:
                 operation_logger.related_to.append(("user", user))
+                logger.info(m18n.n("group_user_add", group=groupname, user=user))
 
         new_group_members += users_to_add
 
@@ -1202,6 +1203,7 @@ def user_group_update(
                 )
             else:
                 operation_logger.related_to.append(("user", user))
+                logger.info(m18n.n("group_user_remove", group=groupname, user=user))
 
         # Remove users_to_remove from new_group_members
         # Kinda like a new_group_members -= users_to_remove
@@ -1237,6 +1239,7 @@ def user_group_update(
                     "mail_domain_unknown", domain=mail[mail.find("@") + 1 :]
                 )
             new_group_mail.append(mail)
+            logger.info(m18n.n("group_mailalias_add", group=groupname, mail=mail))
 
     if remove_mailalias:
         from yunohost.domain import _get_maindomain
@@ -1256,6 +1259,7 @@ def user_group_update(
                 )
             if mail in new_group_mail:
                 new_group_mail.remove(mail)
+                logger.info(m18n.n("group_mailalias_remove", group=groupname, mail=mail))
             else:
                 raise YunohostValidationError("mail_alias_remove_failed", mail=mail)