minor fix

papermerge · Mar 26, 2024 · c80199c · c80199c
1 parent a3b8d85
commit c80199c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/papermerge/core/auth/__init__.py b/papermerge/core/auth/__init__.py
@@ -87,7 +87,7 @@ def get_current_user(
             total_scopes.extend(
                 db.get_user_scopes_from_groups(
                     engine=engine,
-                    user_id=token_data.user_id,
+                    user_id=UUID(token_data.user_id),
                     groups=token_data.groups
                 )
             )

diff --git a/papermerge/core/db/users.py b/papermerge/core/db/users.py
@@ -221,13 +221,15 @@ def update_user(
 
 def get_user_scopes_from_groups(
     engine: Engine,
-    user_id: str,
+    user_id: UUID,
     groups: list[str]
 ) -> list[str]:
     with Session(engine) as session:
-        db_user = session.scalars(
-            select(User).where(User.id == user_id)
-        ).one()
+        db_user = session.get(User, user_id)
+
+        if db_user is None:
+            return []
+
         db_groups = session.scalars(
             select(Group).where(Group.name.in_(groups))
         ).all()