Merge pull request #34 from bugout-dev/fix-app-users-query

fixed app id check for get user action

Author: zomglings

brood/actions.py

@@ -483,7 +483,7 @@ def get_user(
             "In order to get user, at least one of username, email, or user_id must be specified"
         )
 
-    query = session.query(User)
+    query = session.query(User).filter(User.application_id == application_id)
 
     if username is not None:
         username = cast(str, username)
@@ -498,16 +498,17 @@ def get_user(
     if user_id is not None:
         query = query.filter(User.id == user_id)
 
-    if application_id is not None:
-        query = query.filter(User.application_id == application_id)
-
-    user = query.first()
-    if user is None:
+    users = query.all()
+    if len(users) == 0:
         raise UserNotFound(
-            f"Did not find user with filters username={username}, normalized_email={normalized_email}"
+            f"Did not find user with filters username={username}, normalized_email={normalized_email}, id={user_id} and application_id={application_id}"
+        )
+    if len(users) > 1:
+        raise Exception(
+            f"Too many results for user with filters username={username}, normalized_email={normalized_email}, id={user_id} and application_id={application_id}"
         )
 
-    return user
+    return users[0]
 
 
 def update_user(

brood/api.py

@@ -371,8 +371,17 @@ async def get_user_handler(
     """
     Get current user.
     """
-    user_id = current_user.id
-    user = actions.get_user(session=db_session, user_id=user_id)
+    try:
+        user = actions.get_user(
+            session=db_session,
+            user_id=current_user.id,
+            application_id=current_user.application_id,
+        )
+    except actions.UserNotFound:
+        raise HTTPException(status_code=404, detail="User not found")
+    except Exception:
+        logger.error("Unhandled error")
+        raise HTTPException(status_code=500)
 
     return user
 

brood/version.py

@@ -2,4 +2,4 @@
 Brood library and API version.
 """
 
-BROOD_VERSION = "0.2.2"
+BROOD_VERSION = "0.2.3"