Revert "fix(auth): corrige fluxo de autenticação"

This reverts commit af6284b.

Author: pedro-fs-garcia

app/domains/auth/routers/auth_router.py

@@ -1,12 +1,9 @@
-from typing import Any
-
 from fastapi import APIRouter, Request, status
 from fastapi.responses import JSONResponse
 
 from app.core.dependencies import ResponseFactoryDep
 from app.core.exceptions import AppHTTPException
 from app.db.exceptions import ResourceAlreadyExistsError
-from app.schemas.response import GenericSuccessContent
 
 from ..dependencies import AuthServiceDep, CurrentUserSessionDep, UserServiceDep
 from ..exceptions import (
@@ -17,37 +14,22 @@
     UserPasswordNotConfiguredError,
 )
 from ..schemas import (
-    LoginResponse,
     RefreshSessionRequest,
     RegisterUserRequest,
-    UserCreatedResponse,
     UserLoginRequest,
 )
+from .swagger_utils import (
+    get_me_swagger,
+    login_swagger,
+    logout_swagger,
+    refresh_swagger,
+    register_swagger,
+)
 
 auth_router = APIRouter()
 
 
-register_responses: dict[int | str, dict[str, Any]] = {
-    status.HTTP_201_CREATED: {
-        "model": UserCreatedResponse,
-        "description": "User created successfully.",
-    }
-}
-
-
-login_responses: dict[str | int, dict[str, Any]] = {
-    status.HTTP_200_OK: {"description": "Login successful"},
-    status.HTTP_404_NOT_FOUND: {"description": "User not found"},
-    status.HTTP_400_BAD_REQUEST: {"description": "Password not configured"},
-    status.HTTP_401_UNAUTHORIZED: {"description": "Invalid password"},
-}
-
-login_response_model = GenericSuccessContent[LoginResponse]
-
-
-@auth_router.post(
-    "/login", tags=["Auth"], response_model=login_response_model, responses=login_responses
-)
+@auth_router.post("/login", tags=["Auth"], **login_swagger)
 async def login(
     dto: UserLoginRequest, service: AuthServiceDep, response: ResponseFactoryDep
 ) -> JSONResponse:
@@ -64,7 +46,7 @@ async def login(
         ) from e
 
 
-@auth_router.post("/register", tags=["Auth"], responses=register_responses)
+@auth_router.post("/register", tags=["Auth"], **register_swagger)
 async def register_common_user(
     dto: RegisterUserRequest, service: AuthServiceDep, response: ResponseFactoryDep
 ) -> JSONResponse:
@@ -82,7 +64,7 @@ async def register_common_user(
         ) from e
 
 
-@auth_router.post("/refresh", tags=["Auth"])
+@auth_router.post("/refresh", tags=["Auth"], **refresh_swagger)
 async def refresh(
     dto: RefreshSessionRequest,
     current_user: CurrentUserSessionDep,
@@ -111,7 +93,7 @@ async def refresh(
         ) from e
 
 
-@auth_router.post("/logout", tags=["Auth"])
+@auth_router.post("/logout", tags=["Auth"], **logout_swagger)
 async def logout(
     user_session: CurrentUserSessionDep,
     response: ResponseFactoryDep,
@@ -125,7 +107,7 @@ async def logout(
     )
 
 
-@auth_router.get("/me", tags=["Auth"])
+@auth_router.get("/me", tags=["Auth"], **get_me_swagger)
 async def get_me(
     user_session: CurrentUserSessionDep, service: UserServiceDep, response: ResponseFactoryDep
 ) -> JSONResponse:

app/domains/auth/routers/permission_router.py

@@ -12,12 +12,23 @@
     ReplacePermissionDTO,
     UpdatePermissionDTO,
 )
+from .swagger_utils import (
+    add_perm_to_roles_swagger,
+    create_perm_swagger,
+    delete_perm_swagger,
+    get_perm_roles_swagger,
+    get_perm_swagger,
+    list_perms_swagger,
+    replace_perm_swagger,
+    update_perm_swagger,
+)
 
 permission_router = APIRouter()
 
 
 @permission_router.post(
-    "/", tags=["Permissions"], dependencies=[require_permission("permission:create")]
+    "/", tags=["Permissions"], dependencies=[require_permission("permission:create")],
+    **create_perm_swagger,
 )
 async def create_permission(
     dto: CreatePermissionDTO,
@@ -36,7 +47,8 @@ async def create_permission(
 
 
 @permission_router.get(
-    "/", tags=["Permissions"], dependencies=[require_permission("permission:list")]
+    "/", tags=["Permissions"], dependencies=[require_permission("permission:list")],
+    **list_perms_swagger,
 )
 async def get_permissions(
     service: PermissionServiceDep,
@@ -47,7 +59,8 @@ async def get_permissions(
 
 
 @permission_router.get(
-    "/{id}", tags=["Permissions"], dependencies=[require_permission("permission:read")]
+    "/{id}", tags=["Permissions"], dependencies=[require_permission("permission:read")],
+    **get_perm_swagger,
 )
 async def get_permission_by_id(
     id: int,
@@ -64,7 +77,8 @@ async def get_permission_by_id(
 
 
 @permission_router.put(
-    "/{id}", tags=["Permissions"], dependencies=[require_permission("permission:replace")]
+    "/{id}", tags=["Permissions"], dependencies=[require_permission("permission:replace")],
+    **replace_perm_swagger,
 )
 async def replace_permission(
     id: int,
@@ -83,7 +97,8 @@ async def replace_permission(
 
 
 @permission_router.patch(
-    "/{id}", tags=["Permissions"], dependencies=[require_permission("permission:update")]
+    "/{id}", tags=["Permissions"], dependencies=[require_permission("permission:update")],
+    **update_perm_swagger,
 )
 async def update_permission(
     id: int,
@@ -102,7 +117,8 @@ async def update_permission(
 
 
 @permission_router.delete(
-    "/{id}", tags=["Permissions"], dependencies=[require_permission("permission:delete")]
+    "/{id}", tags=["Permissions"], dependencies=[require_permission("permission:delete")],
+    **delete_perm_swagger,
 )
 async def delete_permission(
     id: int,
@@ -126,6 +142,7 @@ async def delete_permission(
     "/{id}/roles",
     tags=["Permissions", "Roles"],
     dependencies=[require_permission("permission:read_roles")],
+    **get_perm_roles_swagger,
 )
 async def get_permission_roles(
     id: int,
@@ -145,6 +162,7 @@ async def get_permission_roles(
     "/{id}/roles",
     tags=["Permissions", "Roles"],
     dependencies=[require_permission("permission:add_to_roles")],
+    **add_perm_to_roles_swagger,
 )
 async def add_permission_to_roles(
     id: int,

app/domains/auth/routers/role_router.py

@@ -1,31 +1,31 @@
-from typing import Any
-
 from fastapi import APIRouter, status
 from fastapi.responses import JSONResponse
 
 from app.core.dependencies import ResponseFactoryDep
 from app.core.exceptions import AppHTTPException
 from app.db.exceptions import ResourceAlreadyExistsError
-from app.schemas.response import GenericSuccessContent
 
 from ..dependencies import CurrentUserSessionDep, RoleServiceDep, require_permission
-from ..entities import Role as RoleEntity
 from ..schemas import AddRolePermissionsDTO, CreateRoleDTO, ReplaceRoleDTO, UpdateRoleDTO
+from .swagger_utils import (
+    add_role_perms_swagger,
+    create_role_swagger,
+    delete_role_swagger,
+    get_role_perms_swagger,
+    get_role_swagger,
+    list_roles_swagger,
+    replace_role_swagger,
+    update_role_swagger,
+)
 
 role_router = APIRouter()
 
-post_role_responses: dict[int | str, dict[str, Any]] = {
-    status.HTTP_201_CREATED: {"description": "Role created successfully"},
-    status.HTTP_409_CONFLICT: {"description": "Role with this name already exists"},
-}
-
 
 @role_router.post(
     "/",
     tags=["Roles"],
-    response_model=GenericSuccessContent[RoleEntity],
-    responses=post_role_responses,
     dependencies=[require_permission("role:create")],
+    **create_role_swagger,
 )
 async def create_role(
     dto: CreateRoleDTO,
@@ -49,11 +49,8 @@ async def create_role(
 @role_router.get(
     "/",
     tags=["Roles"],
-    response_model=GenericSuccessContent[list[RoleEntity]],
-    responses={
-        status.HTTP_200_OK: {"description": "List of all roles"},
-    },
     dependencies=[require_permission("role:list")],
+    **list_roles_swagger,
 )
 async def get_roles(
     _auth: CurrentUserSessionDep, service: RoleServiceDep, response: ResponseFactoryDep
@@ -65,7 +62,10 @@ async def get_roles(
     )
 
 
-@role_router.get("/{id}", tags=["Roles"], dependencies=[require_permission("role:read")])
+@role_router.get(
+    "/{id}", tags=["Roles"], dependencies=[require_permission("role:read")],
+    **get_role_swagger,
+)
 async def get_role(
     id: int, _auth: CurrentUserSessionDep, service: RoleServiceDep, response: ResponseFactoryDep
 ) -> JSONResponse:
@@ -80,7 +80,10 @@ async def get_role(
     )
 
 
-@role_router.put("/{id}", tags=["Roles"], dependencies=[require_permission("role:replace")])
+@role_router.put(
+    "/{id}", tags=["Roles"], dependencies=[require_permission("role:replace")],
+    **replace_role_swagger,
+)
 async def replace_role(
     id: int,
     dto: ReplaceRoleDTO,
@@ -99,7 +102,10 @@ async def replace_role(
     )
 
 
-@role_router.patch("/{id}", tags=["Roles"], dependencies=[require_permission("role:update")])
+@role_router.patch(
+    "/{id}", tags=["Roles"], dependencies=[require_permission("role:update")],
+    **update_role_swagger,
+)
 async def update_role(
     id: int,
     dto: UpdateRoleDTO,
@@ -118,7 +124,10 @@ async def update_role(
     )
 
 
-@role_router.delete("/{id}", tags=["Roles"], dependencies=[require_permission("role:delete")])
+@role_router.delete(
+    "/{id}", tags=["Roles"], dependencies=[require_permission("role:delete")],
+    **delete_role_swagger,
+)
 async def delete_role(
     id: int,
     _auth: CurrentUserSessionDep,
@@ -140,6 +149,7 @@ async def delete_role(
     "/{id}/permissions",
     tags=["Roles", "Permissions"],
     dependencies=[require_permission("role:read_permissions")],
+    **get_role_perms_swagger,
 )
 async def get_role_permissions(
     id: int,
@@ -159,6 +169,7 @@ async def get_role_permissions(
     "/{id}/permissions",
     tags=["Roles", "Permissions"],
     dependencies=[require_permission("role:add_permissions")],
+    **add_role_perms_swagger,
 )
 async def add_role_permissions(
     id: int,

app/domains/auth/routers/user_router.py

@@ -7,19 +7,25 @@
 from app.core.exceptions import AppHTTPException
 from app.db.exceptions import ResourceAlreadyExistsError, ResourceNotFoundError
 from app.domains.auth.dependencies import CurrentUserSessionDep, UserServiceDep, require_permission
-from app.schemas.response import GenericSuccessContent
 
-from ..entities import User
 from ..schemas import AddUserRolesDTO, CreateUserDTO, ReplaceUserDTO, UpdateUserDTO
+from .swagger_utils import (
+    add_user_roles_swagger,
+    create_user_swagger,
+    get_user_swagger,
+    list_users_swagger,
+    replace_user_swagger,
+    update_user_swagger,
+)
 
 user_router = APIRouter()
 
 
 @user_router.post(
     "/",
     tags=["Users"],
-    response_model=GenericSuccessContent[User],
     dependencies=[require_permission("user:create")],
+    **create_user_swagger,
 )
 async def create_user(
     dto: CreateUserDTO,
@@ -40,8 +46,8 @@ async def create_user(
 @user_router.get(
     "/",
     tags=["Users"],
-    response_model=GenericSuccessContent[list[User]],
     dependencies=[require_permission("user:list")],
+    **list_users_swagger,
 )
 async def get_users(
     _auth: CurrentUserSessionDep, service: UserServiceDep, response: ResponseFactoryDep
@@ -52,7 +58,10 @@ async def get_users(
     )
 
 
-@user_router.get("/{id}", tags=["Users"], dependencies=[require_permission("user:read")])
+@user_router.get(
+    "/{id}", tags=["Users"], dependencies=[require_permission("user:read")],
+    **get_user_swagger,
+)
 async def get_user(
     id: UUID, _auth: CurrentUserSessionDep, service: UserServiceDep, response: ResponseFactoryDep
 ) -> JSONResponse:
@@ -64,7 +73,10 @@ async def get_user(
     return response.success(data=user.to_response_dict(), status_code=status.HTTP_200_OK)
 
 
-@user_router.put("/{id}", tags=["Users"], dependencies=[require_permission("user:replace")])
+@user_router.put(
+    "/{id}", tags=["Users"], dependencies=[require_permission("user:replace")],
+    **replace_user_swagger,
+)
 async def replace_user(
     id: UUID,
     dto: ReplaceUserDTO,
@@ -83,7 +95,10 @@ async def replace_user(
     )
 
 
-@user_router.patch("/{id}", tags=["Users"], dependencies=[require_permission("user:update")])
+@user_router.patch(
+    "/{id}", tags=["Users"], dependencies=[require_permission("user:update")],
+    **update_user_swagger,
+)
 async def update_user(
     id: UUID,
     dto: UpdateUserDTO,
@@ -103,7 +118,8 @@ async def update_user(
 
 
 @user_router.post(
-    "/{id}/roles", tags=["users", "Roles"], dependencies=[require_permission("user:add_roles")]
+    "/{id}/roles", tags=["users", "Roles"], dependencies=[require_permission("user:add_roles")],
+    **add_user_roles_swagger,
 )
 async def add_user_roles(
     id: UUID,