fractal-server 2.5.0a0__tar.gz → 2.5.0a1__tar.gz

{fractal_server-2.5.0a0 → fractal_server-2.5.0a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.5.0a0
+Version: 2.5.0a1
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

fractal_server-2.5.0a1/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.5.0a1"

{fractal_server-2.5.0a0 → fractal_server-2.5.0a1}/fractal_server/app/routes/auth/_aux_auth.py

@@ -32,7 +32,11 @@ async def _get_single_user_with_group_names(
     res = await db.execute(stm_groups)
     groups = res.scalars().unique().all()
     group_names = [group.name for group in groups]
-    return UserRead(**user.model_dump(), group_names=group_names)
+    return UserRead(
+        **user.model_dump(),
+        group_names=group_names,
+        oauth_accounts=user.oauth_accounts,
+    )
 
 
 async def _get_single_user_with_group_ids(
@@ -53,7 +57,11 @@ async def _get_single_user_with_group_ids(
     res = await db.execute(stm_links)
     links = res.scalars().unique().all()
     group_ids = [link.group_id for link in links]
-    return UserRead(**user.model_dump(), group_ids=group_ids)
+    return UserRead(
+        **user.model_dump(),
+        group_ids=group_ids,
+        oauth_accounts=user.oauth_accounts,
+    )
 
 
 async def _get_single_group_with_user_ids(
@@ -97,9 +105,7 @@ async def _user_or_404(user_id: int, db: AsyncSession) -> UserOAuth:
         user_id: ID of the user
         db: Async db session
     """
-    stm = select(UserOAuth).where(UserOAuth.id == user_id)
-    res = await db.execute(stm)
-    user = res.scalars().unique().one_or_none()
+    user = await db.get(UserOAuth, user_id, populate_existing=True)
     if user is None:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND, detail="User not found."

{fractal_server-2.5.0a0 → fractal_server-2.5.0a1}/fractal_server/app/routes/auth/current_user.py

@@ -51,9 +51,13 @@ async def patch_current_user(
     # NOTE: here it would be relevant to catch an `InvalidPasswordException`
     # (from `fastapi_users.exceptions`), if we were to allow users change
     # their own password
+
     user = await user_manager.update(update, current_user, safe=True)
-    patched_user = schemas.model_validate(UserOAuth, user)
+    validated_user = schemas.model_validate(UserOAuth, user)
 
+    patched_user = await db.get(
+        UserOAuth, validated_user.id, populate_existing=True
+    )
     patched_user_with_groups = await _get_single_user_with_group_names(
         patched_user, db
     )

{fractal_server-2.5.0a0 → fractal_server-2.5.0a1}/fractal_server/app/routes/auth/users.py

@@ -43,10 +43,8 @@ async def get_user(
 ) -> UserRead:
     user = await _user_or_404(user_id, db)
     if group_ids:
-        user_with_group_ids = await _get_single_user_with_group_ids(user, db)
-        return user_with_group_ids
-    else:
-        return user
+        user = await _get_single_user_with_group_ids(user, db)
+    return user
 
 
 @router_users.patch("/users/{user_id}/", response_model=UserRead)
@@ -127,9 +125,7 @@ async def patch_user(
                 status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
                 detail=error_msg,
             )
-
         patched_user = user_to_patch
-
     elif edit_attributes:
         # Modify user attributes
         try:
@@ -142,7 +138,10 @@ async def patch_user(
                 safe=False,
                 request=None,
             )
-            patched_user = schemas.model_validate(UserOAuth, user)
+            validated_user = schemas.model_validate(UserOAuth, user)
+            patched_user = await db.get(
+                UserOAuth, validated_user.id, populate_existing=True
+            )
         except exceptions.InvalidPasswordException as e:
             raise HTTPException(
                 status_code=status.HTTP_400_BAD_REQUEST,
@@ -189,9 +188,11 @@ async def list_users(
     # https://github.com/fractal-analytics-platform/fractal-server/issues/1742
     for ind, user in enumerate(user_list):
         user_list[ind] = dict(
-            user.model_dump(),
+            **user.model_dump(),
+            oauth_accounts=user.oauth_accounts,
             group_ids=[
                 link.group_id for link in links if link.user_id == user.id
             ],
         )
+
     return user_list

{fractal_server-2.5.0a0 → fractal_server-2.5.0a1}/fractal_server/app/schemas/user.py

@@ -20,6 +20,22 @@ __all__ = (
 )
 
 
+class OAuthAccountRead(BaseModel):
+    """
+    Schema for storing essential `OAuthAccount` information within
+    `UserRead.oauth_accounts`.
+
+    Attributes:
+        id: ID of the row in fractal-owned `oauthaccount` table.
+        account_email: Email associated to OAuth account
+        oauth_name: Name of the OAuth provider (e.g. `github`)
+    """
+
+    id: int
+    account_email: str
+    oauth_name: str
+
+
 class UserRead(schemas.BaseUser[int]):
     """
     Schema for `User` read from database.
@@ -37,6 +53,7 @@ class UserRead(schemas.BaseUser[int]):
     slurm_accounts: list[str]
     group_names: Optional[list[str]] = None
     group_ids: Optional[list[int]] = None
+    oauth_accounts: list[OAuthAccountRead]
 
 
 class UserUpdate(schemas.BaseUserUpdate):

{fractal_server-2.5.0a0 → fractal_server-2.5.0a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fractal-server"
-version = "2.5.0a0"
+version = "2.5.0a1"
 description = "Server component of the Fractal analytics platform"
 authors = [
     "Tommaso Comparin <tommaso.comparin@exact-lab.it>",
@@ -92,7 +92,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.5.0a0"
+current_version = "2.5.0a1"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.5.0a0/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.5.0a0"