Fix user delete flow 3
This commit is contained in:
@@ -22,7 +22,7 @@ from app.services.admin_delete import AdminUserDeleteService
|
|||||||
# Import unified authentication from shared library
|
# Import unified authentication from shared library
|
||||||
from shared.auth.decorators import (
|
from shared.auth.decorators import (
|
||||||
get_current_user_dep,
|
get_current_user_dep,
|
||||||
require_admin_role
|
require_admin_role_dep
|
||||||
)
|
)
|
||||||
|
|
||||||
logger = structlog.get_logger()
|
logger = structlog.get_logger()
|
||||||
@@ -125,8 +125,7 @@ async def update_current_user(
|
|||||||
async def delete_admin_user(
|
async def delete_admin_user(
|
||||||
background_tasks: BackgroundTasks,
|
background_tasks: BackgroundTasks,
|
||||||
user_id: str = Path(..., description="User ID"),
|
user_id: str = Path(..., description="User ID"),
|
||||||
current_user = Depends(get_current_user_dep),
|
current_user = Depends(require_admin_role_dep),
|
||||||
_admin_check = Depends(require_admin_role),
|
|
||||||
db: AsyncSession = Depends(get_db)
|
db: AsyncSession = Depends(get_db)
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
@@ -238,8 +237,6 @@ async def execute_admin_user_deletion(
|
|||||||
@router.get("/delete/{user_id}/deletion-preview")
|
@router.get("/delete/{user_id}/deletion-preview")
|
||||||
async def preview_user_deletion(
|
async def preview_user_deletion(
|
||||||
user_id: str = Path(..., description="User ID"),
|
user_id: str = Path(..., description="User ID"),
|
||||||
current_user = Depends(get_current_user_dep),
|
|
||||||
_admin_check = Depends(require_admin_role),
|
|
||||||
db: AsyncSession = Depends(get_db)
|
db: AsyncSession = Depends(get_db)
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ class AuthTenantServiceClient(BaseServiceClient):
|
|||||||
async def get_user_tenants(self, user_id: str) -> Optional[List[Dict[str, Any]]]:
|
async def get_user_tenants(self, user_id: str) -> Optional[List[Dict[str, Any]]]:
|
||||||
"""Get all tenant memberships for a user"""
|
"""Get all tenant memberships for a user"""
|
||||||
try:
|
try:
|
||||||
result = await self.get(f"users/{user_id}/tenants")
|
result = await self.get(f"tenants/memberships/{user_id}")
|
||||||
return result.get("memberships", []) if result else []
|
return result.get("memberships", []) if result else []
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error("Failed to get user tenants", user_id=user_id, error=str(e))
|
logger.error("Failed to get user tenants", user_id=user_id, error=str(e))
|
||||||
|
|||||||
@@ -313,7 +313,7 @@ async def delete_tenant_complete(
|
|||||||
detail=f"Failed to delete tenant: {str(e)}"
|
detail=f"Failed to delete tenant: {str(e)}"
|
||||||
)
|
)
|
||||||
|
|
||||||
@router.get("/users/{user_id}/tenants")
|
@router.get("/tenants/memberships/{user_id}")
|
||||||
async def get_user_tenants(
|
async def get_user_tenants(
|
||||||
user_id: str,
|
user_id: str,
|
||||||
current_user = Depends(get_current_user_dep),
|
current_user = Depends(get_current_user_dep),
|
||||||
|
|||||||
Reference in New Issue
Block a user