In single-tree setup, send owner notification also for empty tree ID (#694)

Author: DavidMStraub

gramps_webapi/api/resources/user.py

@@ -592,6 +592,8 @@ def get(self):
                 tree=tree,
                 # for single-tree setups, send e-mail also to admins
                 include_admins=not is_multi,
+                # for single-tree setups, send e-mail to users with empty tree ID
+                include_treeless=not is_multi,
             )
         title = _("E-mail address confirmation")
         message = _(

gramps_webapi/api/tasks.py

@@ -121,15 +121,22 @@ def send_email_confirm_email(email: str, user_name: str, token: str):
 
 @shared_task()
 def send_email_new_user(
-    username: str, fullname: str, email: str, tree: str, include_admins: bool
+    username: str,
+    fullname: str,
+    email: str,
+    tree: str,
+    include_admins: bool,
+    include_treeless: bool,
 ):
     """Send an email to owners to notify of a new registered user."""
     base_url = get_config("BASE_URL").rstrip("/")
     body = email_new_user(
         base_url=base_url, username=username, fullname=fullname, email=email
     )
     subject = _("New registered user")
-    emails = get_owner_emails(tree=tree, include_admins=include_admins)
+    emails = get_owner_emails(
+        tree=tree, include_admins=include_admins, include_treeless=include_treeless
+    )
     if emails:
         send_email(subject=subject, body=body, to=emails)
 

gramps_webapi/auth/__init__.py

@@ -40,6 +40,7 @@
 
 user_db = SQLAlchemy()
 
+
 def add_user(
     name: str,
     password: str,
@@ -261,17 +262,20 @@ def get_permissions(username: str, tree: str) -> Set[str]:
     return permissions
 
 
-def get_owner_emails(tree: str, include_admins: bool = False) -> List[str]:
+def get_owner_emails(
+    tree: str, include_admins: bool = False, include_treeless: bool = False
+) -> List[str]:
     """Get e-mail addresses of all tree owners (and optionally include site admins)."""
     query = user_db.session.query(User)  # pylint: disable=no-member
+    if include_treeless:
+        query = query.filter(sa.or_(User.tree == tree, User.tree.is_(None)))
+    else:
+        query = query.filter(User.tree == tree)
     if include_admins:
-        users = (
-            query.filter_by(tree=tree)
-            .filter(sa.or_(User.role == ROLE_OWNER, User.role == ROLE_ADMIN))
-            .all()
-        )
+        query = query.filter(sa.or_(User.role == ROLE_OWNER, User.role == ROLE_ADMIN))
     else:
-        users = query.filter_by(tree=tree, role=ROLE_OWNER).all()
+        query = query.filter_by(role=ROLE_OWNER)
+    users = query.all()
     return [user.email for user in users if user.email]