Clean up current-user dependencies

Author: tcompa

fractal_server/app/routes/auth/__init__.py

@@ -49,31 +49,36 @@ def get_jwt_cookie_strategy() -> JWTStrategy:
     get_user_manager,
     [token_backend, cookie_backend],
 )
+
+# Current-user dependencies
 current_user_act = fastapi_users.current_user(active=True)
 current_user_act_ver = fastapi_users.current_user(
     active=True,
     verified=True,
 )
-current_superuser_act = fastapi_users.current_user(
-    active=True,
-    superuser=True,
-)
-
-current_user = fastapi_users.current_user()
 
 
 async def current_user_act_ver_prof(
-    user: UserOAuth = Depends(current_user),
+    user: UserOAuth = Depends(current_user_act_ver),
 ) -> UserOAuth:
-    if any(
-        (
-            not user.is_active,
-            not user.is_verified,
-            user.profile_id is None,
-        )
-    ):
+    """
+    Require a active&verified user, with a non-null `profile_id`.
+
+    Raises 401 if user does not exist or is not active.
+    Raises 403 if user is not verified or has null `profile_id`.
+    """
+    if user.profile_id is None:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
-            detail="Forbidden access.",
+            detail=(
+                f"Forbidden access "
+                f"({user.is_verified=} {user.profile_id=})."
+            ),
         )
     return user
+
+
+current_superuser_act = fastapi_users.current_user(
+    active=True,
+    superuser=True,
+)

fractal_server/app/routes/auth/current_user.py

@@ -16,7 +16,6 @@
 from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth import current_user_act
-from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.app.routes.auth._aux_auth import (
     _get_single_user_with_groups,
 )
@@ -52,7 +51,7 @@ async def get_current_user(
 @router_current_user.patch("/current-user/", response_model=UserRead)
 async def patch_current_user(
     user_update: UserUpdateStrict,
-    current_user: UserOAuth = Depends(current_user_act_ver_prof),
+    current_user: UserOAuth = Depends(current_user_act),
     user_manager: UserManager = Depends(get_user_manager),
     db: AsyncSession = Depends(get_async_db),
 ):