diff --git a/services/auth/app/api/users.py b/services/auth/app/api/users.py index 6336d33f..ba1d795a 100644 --- a/services/auth/app/api/users.py +++ b/services/auth/app/api/users.py @@ -22,7 +22,7 @@ from app.services.admin_delete import AdminUserDeleteService # Import unified authentication from shared library from shared.auth.decorators import ( get_current_user_dep, - require_admin_role + require_admin_role_dep ) logger = structlog.get_logger() @@ -125,8 +125,7 @@ async def update_current_user( async def delete_admin_user( background_tasks: BackgroundTasks, user_id: str = Path(..., description="User ID"), - current_user = Depends(get_current_user_dep), - _admin_check = Depends(require_admin_role), + current_user = Depends(require_admin_role_dep), db: AsyncSession = Depends(get_db) ): """ @@ -238,8 +237,6 @@ async def execute_admin_user_deletion( @router.get("/delete/{user_id}/deletion-preview") async def preview_user_deletion( 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) ): """ diff --git a/services/auth/app/services/auth_service_clients.py b/services/auth/app/services/auth_service_clients.py index 84595cfa..c7ae01ed 100644 --- a/services/auth/app/services/auth_service_clients.py +++ b/services/auth/app/services/auth_service_clients.py @@ -40,7 +40,7 @@ class AuthTenantServiceClient(BaseServiceClient): async def get_user_tenants(self, user_id: str) -> Optional[List[Dict[str, Any]]]: """Get all tenant memberships for a user""" 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 [] except Exception as e: logger.error("Failed to get user tenants", user_id=user_id, error=str(e)) diff --git a/services/tenant/app/api/tenants.py b/services/tenant/app/api/tenants.py index 60a330d1..3500a58e 100644 --- a/services/tenant/app/api/tenants.py +++ b/services/tenant/app/api/tenants.py @@ -313,7 +313,7 @@ async def delete_tenant_complete( 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( user_id: str, current_user = Depends(get_current_user_dep),