Some more minor fixes for 1.1.1 (#395)

* Forward logging properly

* Handle tree=None properly

Author: DavidMStraub

gramps_webapi/api/resources/token.py

@@ -153,7 +153,11 @@ def post(self, args):
             abort_with_message(403, "Not allowed in single-tree setup")
         if tree and not tree_exists(tree):
             abort(404)
-        if get_all_user_details(tree=tree):
+        if get_all_user_details(
+            # only include treeless users in single-tree setup
+            tree=tree,
+            include_treeless=current_app.config["TREE"] != TREE_MULTI,
+        ):
             # users already exist!
             abort_with_message(405, "Users already exist")
         if tree:

gramps_webapi/api/resources/user.py

@@ -125,7 +125,13 @@ def get(self):
         require_permissions([PERM_VIEW_OTHER_USER])
         tree = get_tree_from_jwt()
         # return only this tree's users
-        return jsonify(get_all_user_details(tree=tree)), 200
+        # only include treeless users in single-tree setup
+        is_single = current_app.config["TREE"] != TREE_MULTI
+        details = get_all_user_details(tree=tree, include_treeless=is_single)
+        return (
+            jsonify(details),
+            200,
+        )
 
     def post(self):
         """Add one or more users."""

gramps_webapi/app.py

@@ -80,11 +80,6 @@ def create_app(config: Optional[Dict[str, Any]] = None):
 
     app.logger.setLevel(logging.INFO)
 
-    # when using gunicorn, make sure flask log messages are shown
-    gunicorn_logger = logging.getLogger("gunicorn.error")
-    app.logger.handlers = gunicorn_logger.handlers
-    app.logger.setLevel(gunicorn_logger.level)
-
     # load default config
     app.config.from_object(DefaultConfig)
 

gramps_webapi/auth/__init__.py

@@ -213,15 +213,22 @@ def get_user_details(username: str) -> Optional[Dict[str, Any]]:
     return _get_user_detail(user)
 
 
-def get_all_user_details(tree: Optional[str]) -> List[Dict[str, Any]]:
+def get_all_user_details(
+    tree: Optional[str], include_treeless=False
+) -> List[Dict[str, Any]]:
     """Return details about all users.
 
     If tree is None, return all users regardless of tree.
     If tree is not None, only return users of given tree.
+
+    If include_treeless is True, include also users with empty tree ID.
     """
     query = user_db.session.query(User)  # pylint: disable=no-member
     if tree:
-        query = query.filter(sa.or_(User.tree == tree, User.tree.is_(None)))
+        if include_treeless:
+            query = query.filter(sa.or_(User.tree == tree, User.tree.is_(None)))
+        else:
+            query = query.filter(User.tree == tree)
     users = query.all()
     return [_get_user_detail(user) for user in users]
 

gramps_webapi/wsgi.py

@@ -1,7 +1,7 @@
 #
 # Gramps Web API - A RESTful API for the Gramps genealogy program
 #
-# Copyright (C) 2020      David Straub
+# Copyright (C) 2020-2023      David Straub
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -17,6 +17,13 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 
+import logging
+
 from .app import create_app
 
 app = create_app()
+
+# when using gunicorn, make sure flask log messages are shown
+gunicorn_logger = logging.getLogger("gunicorn.error")
+app.logger.handlers = gunicorn_logger.handlers
+app.logger.setLevel(gunicorn_logger.level)