fractal-server 2.17.0a4__py3-none-any.whl → 2.17.0a6__py3-none-any.whl

fractal_server/app/routes/api/v2/task_collection_custom.py

@@ -17,7 +17,7 @@ from ._aux_functions_tasks import _verify_non_duplication_user_constraint
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
-from fractal_server.app.routes.auth import current_active_verified_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.app.schemas.v2 import ResourceType
 from fractal_server.app.schemas.v2 import TaskCollectCustomV2
 from fractal_server.app.schemas.v2 import TaskCreateV2
@@ -45,7 +45,7 @@ async def collect_task_custom(
     task_collect: TaskCollectCustomV2,
     private: bool = False,
     user_group_id: int | None = None,
-    user: UserOAuth = Depends(current_active_verified_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskReadV2]:
     # Get validated resource and profile
@@ -156,6 +156,7 @@ async def collect_task_custom(
         user_id=user.id,
         user_group_id=user_group_id,
         version=task_collect.version,
+        resource_id=resource_id,
     )
     TaskGroupCreateV2(**task_group_attrs)
 
@@ -173,7 +174,7 @@ async def collect_task_custom(
         db=db,
     )
 
-    task_group = TaskGroupV2(**task_group_attrs, resource_id=resource_id)
+    task_group = TaskGroupV2(**task_group_attrs)
     db.add(task_group)
     await db.commit()
     await db.refresh(task_group)

fractal_server/app/routes/api/v2/task_collection_pixi.py

@@ -28,7 +28,7 @@ from fractal_server.app.routes.api.v2._aux_functions_tasks import (
 from fractal_server.app.routes.api.v2._aux_functions_tasks import (
     _verify_non_duplication_user_constraint,
 )
-from fractal_server.app.routes.auth import current_active_verified_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.app.routes.aux.validate_user_profile import (
     validate_user_profile,
 )
@@ -85,7 +85,7 @@ async def collect_task_pixi(
     pixi_version: NonEmptyStr | None = Form(None),
     private: bool = False,
     user_group_id: int | None = None,
-    user: UserOAuth = Depends(current_active_verified_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityV2Read:
     # Get validated resource and profile

fractal_server/app/routes/api/v2/task_group.py

@@ -21,7 +21,7 @@ from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupActivityV2
 from fractal_server.app.models.v2 import TaskGroupV2
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.app.routes.auth._aux_auth import _get_default_usergroup_id
 from fractal_server.app.routes.auth._aux_auth import (
     _verify_user_belongs_to_group,
@@ -66,7 +66,7 @@ async def get_task_group_activity_list(
     status: TaskGroupActivityStatusV2 | None = None,
     action: TaskGroupActivityActionV2 | None = None,
     timestamp_started_min: AwareDatetime | None = None,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupActivityV2Read]:
     stm = select(TaskGroupActivityV2).where(
@@ -98,7 +98,7 @@ async def get_task_group_activity_list(
 )
 async def get_task_group_activity(
     task_group_activity_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityV2Read:
     activity = await db.get(TaskGroupActivityV2, task_group_activity_id)
@@ -122,7 +122,7 @@ async def get_task_group_activity(
 
 @router.get("/", response_model=list[tuple[str, list[TaskGroupReadV2]]])
 async def get_task_group_list(
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
     only_active: bool = False,
     only_owner: bool = False,
@@ -182,7 +182,7 @@ async def get_task_group_list(
 @router.get("/{task_group_id}/", response_model=TaskGroupReadV2)
 async def get_task_group(
     task_group_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupReadV2:
     """
@@ -200,7 +200,7 @@ async def get_task_group(
 async def patch_task_group(
     task_group_id: int,
     task_group_update: TaskGroupUpdateV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupReadV2:
     """

fractal_server/app/routes/api/v2/task_group_lifecycle.py

@@ -13,7 +13,7 @@ from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupActivityV2
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.app.routes.aux.validate_user_profile import (
     validate_user_profile,
 )
@@ -50,7 +50,7 @@ async def deactivate_task_group(
     task_group_id: int,
     background_tasks: BackgroundTasks,
     response: Response,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityV2Read:
     """
@@ -154,7 +154,7 @@ async def reactivate_task_group(
     task_group_id: int,
     background_tasks: BackgroundTasks,
     response: Response,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupReadV2:
     """
@@ -263,7 +263,7 @@ async def delete_task_group(
     task_group_id: int,
     background_tasks: BackgroundTasks,
     response: Response,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityV2Read:
     """

fractal_server/app/routes/api/v2/task_version_update.py

@@ -23,7 +23,7 @@ from ._aux_functions_tasks import _get_task_group_or_404
 from ._aux_functions_tasks import _get_task_read_access
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.app.schemas.v2 import WorkflowTaskReadV2
 from fractal_server.app.schemas.v2 import WorkflowTaskReplaceV2
@@ -75,7 +75,7 @@ class TaskVersionRead(BaseModel):
 async def get_workflow_version_update_candidates(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[list[TaskVersionRead]]:
     workflow = await _get_workflow_check_owner(
@@ -177,7 +177,7 @@ async def replace_workflowtask(
     workflow_task_id: int,
     task_id: int,
     replace: WorkflowTaskReplaceV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowTaskReadV2:
     # Get objects from database

fractal_server/app/routes/api/v2/workflow.py

@@ -26,7 +26,7 @@ from ._aux_functions import _workflow_has_submitted_job
 from ._aux_functions_tasks import _add_warnings_to_workflow_tasks
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.images.tools import merge_type_filters
 
 router = APIRouter()
@@ -38,7 +38,7 @@ router = APIRouter()
 )
 async def get_workflow_list(
     project_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[WorkflowReadV2] | None:
     """
@@ -65,7 +65,7 @@ async def get_workflow_list(
 async def create_workflow(
     project_id: int,
     workflow: WorkflowCreateV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowReadV2 | None:
     """
@@ -93,7 +93,7 @@ async def create_workflow(
 async def read_workflow(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowReadV2WithWarnings | None:
     """
@@ -127,7 +127,7 @@ async def update_workflow(
     project_id: int,
     workflow_id: int,
     patch: WorkflowUpdateV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowReadV2WithWarnings | None:
     """
@@ -201,7 +201,7 @@ async def update_workflow(
 async def delete_workflow(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -246,7 +246,7 @@ async def delete_workflow(
 async def export_workflow(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowExportV2 | None:
     """
@@ -277,7 +277,7 @@ async def export_workflow(
 
 @router.get("/workflow/", response_model=list[WorkflowReadV2])
 async def get_user_workflows(
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[WorkflowReadV2]:
     """
@@ -303,7 +303,7 @@ class WorkflowTaskTypeFiltersInfo(BaseModel):
 async def get_workflow_type_filters(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[WorkflowTaskTypeFiltersInfo]:
     """

fractal_server/app/routes/api/v2/workflow_import.py

@@ -24,7 +24,7 @@ from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.routes.api.v2._aux_task_group_disambiguation import (
     _disambiguate_task_groups,
 )
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.app.routes.auth._aux_auth import _get_default_usergroup_id
 from fractal_server.app.schemas.v2 import TaskImportV2
 from fractal_server.logger import set_logger
@@ -205,7 +205,7 @@ async def _get_task_by_taskimport(
 async def import_workflow(
     project_id: int,
     workflow_import: WorkflowImportV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowReadV2WithWarnings:
     """

fractal_server/app/routes/api/v2/workflowtask.py

@@ -15,7 +15,7 @@ from ._aux_functions import _workflow_insert_task
 from ._aux_functions_tasks import _check_type_filters_compatibility
 from ._aux_functions_tasks import _get_task_read_access
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.app.schemas.v2 import WorkflowTaskCreateV2
 from fractal_server.app.schemas.v2 import WorkflowTaskReadV2
@@ -34,7 +34,7 @@ async def create_workflowtask(
     workflow_id: int,
     task_id: int,
     wftask: WorkflowTaskCreateV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowTaskReadV2 | None:
     """
@@ -103,7 +103,7 @@ async def read_workflowtask(
     project_id: int,
     workflow_id: int,
     workflow_task_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ):
     workflow_task, _ = await _get_workflow_task_check_owner(
@@ -125,7 +125,7 @@ async def update_workflowtask(
     workflow_id: int,
     workflow_task_id: int,
     workflow_task_update: WorkflowTaskUpdateV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowTaskReadV2 | None:
     """
@@ -210,7 +210,7 @@ async def delete_workflowtask(
     project_id: int,
     workflow_id: int,
     workflow_task_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """

fractal_server/app/routes/auth/__init__.py

@@ -1,3 +1,6 @@
+from fastapi import Depends
+from fastapi import HTTPException
+from fastapi import status
 from fastapi_users import FastAPIUsers
 from fastapi_users.authentication import AuthenticationBackend
 from fastapi_users.authentication import BearerTransport
@@ -46,10 +49,36 @@ fastapi_users = FastAPIUsers[UserOAuth, int](
     get_user_manager,
     [token_backend, cookie_backend],
 )
-current_active_user = fastapi_users.current_user(active=True)
-current_active_verified_user = fastapi_users.current_user(
-    active=True, verified=True
+
+# 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_active_superuser = fastapi_users.current_user(
-    active=True, superuser=True
+
+
+async def current_user_act_ver_prof(
+    user: UserOAuth = Depends(current_user_act_ver),
+) -> UserOAuth:
+    """
+    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=(
+                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

@@ -5,7 +5,6 @@ import os
 
 from fastapi import APIRouter
 from fastapi import Depends
-from fastapi_users import schemas
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import select
 
@@ -15,23 +14,18 @@ from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
 from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.models import UserSettings
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act
 from fractal_server.app.routes.auth._aux_auth import (
     _get_single_user_with_groups,
 )
-from fractal_server.app.routes.aux.validate_user_settings import (
-    verify_user_has_settings,
-)
 from fractal_server.app.schemas import UserProfileInfo
-from fractal_server.app.schemas import UserSettingsReadStrict
-from fractal_server.app.schemas import UserSettingsUpdateStrict
 from fractal_server.app.schemas.user import UserRead
 from fractal_server.app.schemas.user import UserUpdate
 from fractal_server.app.schemas.user import UserUpdateStrict
 from fractal_server.app.security import get_user_manager
 from fractal_server.app.security import UserManager
-from fractal_server.config import get_settings
+from fractal_server.config import DataAuthScheme
+from fractal_server.config import get_data_settings
 from fractal_server.syringe import Inject
 
 router_current_user = APIRouter()
@@ -40,7 +34,7 @@ router_current_user = APIRouter()
 @router_current_user.get("/current-user/", response_model=UserRead)
 async def get_current_user(
     group_ids_names: bool = False,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act),
     db: AsyncSession = Depends(get_async_db),
 ):
     """
@@ -56,7 +50,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_active_user),
+    current_user: UserOAuth = Depends(current_user_act),
     user_manager: UserManager = Depends(get_user_manager),
     db: AsyncSession = Depends(get_async_db),
 ):
@@ -71,7 +65,7 @@ async def patch_current_user(
     # their own password
 
     user = await user_manager.update(update, current_user, safe=True)
-    validated_user = schemas.model_validate(UserOAuth, user.model_dump())
+    validated_user = UserOAuth.model_validate(user.model_dump())
 
     patched_user = await db.get(
         UserOAuth, validated_user.id, populate_existing=True
@@ -82,47 +76,12 @@ async def patch_current_user(
     return patched_user_with_groups
 
 
-@router_current_user.get(
-    "/current-user/settings/", response_model=UserSettingsReadStrict
-)
-async def get_current_user_settings(
-    current_user: UserOAuth = Depends(current_active_user),
-    db: AsyncSession = Depends(get_async_db),
-) -> UserSettingsReadStrict:
-    verify_user_has_settings(current_user)
-    user_settings = await db.get(UserSettings, current_user.user_settings_id)
-    return user_settings
-
-
-@router_current_user.patch(
-    "/current-user/settings/", response_model=UserSettingsReadStrict
-)
-async def patch_current_user_settings(
-    settings_update: UserSettingsUpdateStrict,
-    current_user: UserOAuth = Depends(current_active_user),
-    db: AsyncSession = Depends(get_async_db),
-) -> UserSettingsReadStrict:
-    verify_user_has_settings(current_user)
-    current_user_settings = await db.get(
-        UserSettings, current_user.user_settings_id
-    )
-
-    for k, v in settings_update.model_dump(exclude_unset=True).items():
-        setattr(current_user_settings, k, v)
-
-    db.add(current_user_settings)
-    await db.commit()
-    await db.refresh(current_user_settings)
-
-    return current_user_settings
-
-
 @router_current_user.get(
     "/current-user/profile-info/",
     response_model=UserProfileInfo,
 )
 async def get_current_user_profile_info(
-    current_user: UserOAuth = Depends(current_active_user),
+    current_user: UserOAuth = Depends(current_user_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserProfileInfo:
     stm = (
@@ -152,45 +111,37 @@ async def get_current_user_profile_info(
     "/current-user/allowed-viewer-paths/", response_model=list[str]
 )
 async def get_current_user_allowed_viewer_paths(
-    current_user: UserOAuth = Depends(current_active_user),
+    current_user: UserOAuth = Depends(current_user_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[str]:
     """
     Returns the allowed viewer paths for current user, according to the
-    selected FRACTAL_VIEWER_AUTHORIZATION_SCHEME
+    selected FRACTAL_DATA_AUTH_SCHEME
     """
 
-    settings = Inject(get_settings)
-
-    if settings.FRACTAL_VIEWER_AUTHORIZATION_SCHEME == "none":
-        return []
+    data_settings = Inject(get_data_settings)
 
     authorized_paths = []
 
-    # Respond with 422 error if user has no settings
-    verify_user_has_settings(current_user)
+    if data_settings.FRACTAL_DATA_AUTH_SCHEME == DataAuthScheme.NONE:
+        return authorized_paths
 
-    # Load current user settings
-    current_user_settings = await db.get(
-        UserSettings, current_user.user_settings_id
-    )
-    # If project_dir is set, append it to the list of authorized paths
-    if current_user_settings.project_dir is not None:
-        authorized_paths.append(current_user_settings.project_dir)
+    # Append `project_dir` to the list of authorized paths
+    authorized_paths.append(current_user.project_dir)
 
     # If auth scheme is "users-folders" and `slurm_user` is set,
     # build and append the user folder
     if (
-        settings.FRACTAL_VIEWER_AUTHORIZATION_SCHEME == "users-folders"
-        and current_user_settings.slurm_user is not None
+        data_settings.FRACTAL_DATA_AUTH_SCHEME == DataAuthScheme.USERS_FOLDERS
+        and current_user.profile_id is not None
     ):
-        base_folder = settings.FRACTAL_VIEWER_BASE_FOLDER
-        user_folder = os.path.join(
-            base_folder, current_user_settings.slurm_user
-        )
-        authorized_paths.append(user_folder)
+        profile = await db.get(Profile, current_user.profile_id)
+        if profile is not None and profile.username is not None:
+            base_folder = data_settings.FRACTAL_DATA_BASE_FOLDER
+            user_folder = os.path.join(base_folder, profile.username)
+            authorized_paths.append(user_folder)
 
-    if settings.FRACTAL_VIEWER_AUTHORIZATION_SCHEME == "viewer-paths":
+    if data_settings.FRACTAL_DATA_AUTH_SCHEME == DataAuthScheme.VIEWER_PATHS:
         # Returns the union of `viewer_paths` for all user's groups
         cmd = (
             select(UserGroup.viewer_paths)
@@ -207,7 +158,6 @@ async def get_current_user_allowed_viewer_paths(
             for _viewer_paths in viewer_paths_nested
             for path in _viewer_paths
         }
-
         authorized_paths.extend(all_viewer_paths_set)
 
     return authorized_paths

fractal_server/app/routes/auth/group.py

@@ -9,7 +9,7 @@ from fastapi import status
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import select
 
-from . import current_active_superuser
+from . import current_superuser_act
 from ._aux_auth import _get_default_usergroup_id
 from ._aux_auth import _get_single_usergroup_with_user_ids
 from ._aux_auth import _user_or_404
@@ -18,11 +18,9 @@ from fractal_server.app.db import get_async_db
 from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.models import UserSettings
 from fractal_server.app.schemas.user_group import UserGroupCreate
 from fractal_server.app.schemas.user_group import UserGroupRead
 from fractal_server.app.schemas.user_group import UserGroupUpdate
-from fractal_server.app.schemas.user_settings import UserSettingsUpdate
 from fractal_server.app.security import FRACTAL_DEFAULT_GROUP_NAME
 from fractal_server.logger import set_logger
 
@@ -36,7 +34,7 @@ router_group = APIRouter()
 )
 async def get_list_user_groups(
     user_ids: bool = False,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[UserGroupRead]:
     # Get all groups
@@ -70,7 +68,7 @@ async def get_list_user_groups(
 )
 async def get_single_user_group(
     group_id: int,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserGroupRead:
     group = await _get_single_usergroup_with_user_ids(group_id=group_id, db=db)
@@ -84,7 +82,7 @@ async def get_single_user_group(
 )
 async def create_single_group(
     group_create: UserGroupCreate,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserGroupRead:
     # Check that name is not already in use
@@ -116,7 +114,7 @@ async def create_single_group(
 async def update_single_group(
     group_id: int,
     group_update: UserGroupUpdate,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserGroupRead:
     group = await _usergroup_or_404(group_id, db)
@@ -137,7 +135,7 @@ async def update_single_group(
 @router_group.delete("/group/{group_id}/", status_code=204)
 async def delete_single_group(
     group_id: int,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     group = await _usergroup_or_404(group_id, db)
@@ -159,36 +157,11 @@ async def delete_single_group(
     return Response(status_code=status.HTTP_204_NO_CONTENT)
 
 
-@router_group.patch("/group/{group_id}/user-settings/", status_code=200)
-async def patch_user_settings_bulk(
-    group_id: int,
-    settings_update: UserSettingsUpdate,
-    superuser: UserOAuth = Depends(current_active_superuser),
-    db: AsyncSession = Depends(get_async_db),
-):
-    await _usergroup_or_404(group_id, db)
-    res = await db.execute(
-        select(UserSettings)
-        .join(UserOAuth)
-        .where(LinkUserGroup.user_id == UserOAuth.id)
-        .where(LinkUserGroup.group_id == group_id)
-    )
-    settings_list = res.scalars().all()
-    update = settings_update.model_dump(exclude_unset=True)
-    for settings in settings_list:
-        for k, v in update.items():
-            setattr(settings, k, v)
-        db.add(settings)
-    await db.commit()
-
-    return Response(status_code=status.HTTP_200_OK)
-
-
 @router_group.post("/group/{group_id}/add-user/{user_id}/", status_code=200)
 async def add_user_to_group(
     group_id: int,
     user_id: int,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserGroupRead:
     await _usergroup_or_404(group_id, db)
@@ -212,7 +185,7 @@ async def add_user_to_group(
 async def remove_user_from_group(
     group_id: int,
     user_id: int,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserGroupRead:
     # Check that user and group exist

fractal_server/app/routes/auth/oauth.py

@@ -29,7 +29,7 @@ def _create_client_oidc(cfg: OAuthSettings) -> OpenID:
     return OpenID(
         client_id=cfg.OAUTH_CLIENT_ID.get_secret_value(),
         client_secret=cfg.OAUTH_CLIENT_SECRET.get_secret_value(),
-        openid_configuration_endpoint=cfg.OAUTH_OIDC_CONFIG_ENDPOINT,
+        openid_configuration_endpoint=cfg.OAUTH_OIDC_CONFIG_ENDPOINT.get_secret_value(),  # noqa
     )
 
 

fractal_server/app/routes/auth/register.py

@@ -4,7 +4,7 @@ Definition of `/auth/register/` routes.
 from fastapi import APIRouter
 from fastapi import Depends
 
-from . import current_active_superuser
+from . import current_superuser_act
 from . import fastapi_users
 from ...schemas.user import UserCreate
 from ...schemas.user import UserRead
@@ -13,7 +13,7 @@ router_register = APIRouter()
 
 router_register.include_router(
     fastapi_users.get_register_router(UserRead, UserCreate),
-    dependencies=[Depends(current_active_superuser)],
+    dependencies=[Depends(current_superuser_act)],
 )