Imporve gateway auth for all services

services/tenant/app/api/tenants.py

@@ -14,24 +14,26 @@ from app.schemas.tenants import (
     TenantUpdate, TenantMemberResponse
 )
 from app.services.tenant_service import TenantService
-from shared.auth.decorators import require_authentication, get_current_user, get_current_tenant_id
+# Import unified authentication
+from shared.auth.decorators import (
+    get_current_user_dep,
+    get_current_tenant_id_dep,
+    require_role
+)
 
 logger = structlog.get_logger()
 router = APIRouter()
 
 @router.post("/tenants/register", response_model=TenantResponse)
-@require_authentication
 async def register_bakery(
     bakery_data: BakeryRegistration,
-    request: Request,
+    current_user: Dict[str, Any] = Depends(get_current_user_dep),
     db: AsyncSession = Depends(get_db)
 ):
-    """Register a new bakery/tenant"""
-    user = get_current_user(request)
     
     try:
-        result = await TenantService.create_bakery(bakery_data, user["user_id"], db)
-        logger.info(f"Bakery registered: {bakery_data.name} by {user['email']}")
+        result = await TenantService.create_bakery(bakery_data, current_user["user_id"], db)
+        logger.info(f"Bakery registered: {bakery_data.name} by {current_user['email']}")
         return result
         
     except Exception as e:
@@ -64,12 +66,10 @@ async def verify_tenant_access(
 @require_authentication  
 async def get_user_tenants(
     user_id: str,
-    request: Request,
+    current_user: Dict[str, Any] = Depends(get_current_user_dep),
     db: AsyncSession = Depends(get_db)
 ):
-    """Get all tenants accessible by user"""
-    current_user = get_current_user(request)
-    
+
     # Users can only see their own tenants
     if current_user["user_id"] != user_id:
         raise HTTPException(
@@ -92,14 +92,12 @@ async def get_user_tenants(
 @require_authentication
 async def get_tenant(
     tenant_id: str,
-    request: Request,
+    current_user: Dict[str, Any] = Depends(get_current_user_dep),
     db: AsyncSession = Depends(get_db)
 ):
-    """Get tenant details"""
-    user = get_current_user(request)
-    
+
     # Verify user has access to tenant
-    access = await TenantService.verify_user_access(user["user_id"], tenant_id, db)
+    access = await TenantService.verify_user_access(current_user["user_id"], tenant_id, db)
     if not access.has_access:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
@@ -120,14 +118,12 @@ async def get_tenant(
 async def update_tenant(
     tenant_id: str,
     update_data: TenantUpdate,
-    request: Request,
+    current_user: Dict[str, Any] = Depends(get_current_user_dep),
     db: AsyncSession = Depends(get_db)
 ):
-    """Update tenant information"""
-    user = get_current_user(request)
-    
+
     try:
-        result = await TenantService.update_tenant(tenant_id, update_data, user["user_id"], db)
+        result = await TenantService.update_tenant(tenant_id, update_data, current_user["user_id"], db)
         return result
         
     except HTTPException:
@@ -145,12 +141,10 @@ async def add_team_member(
     tenant_id: str,
     user_id: str,
     role: str,
-    request: Request,
+    current_user: Dict[str, Any] = Depends(get_current_user_dep),
     db: AsyncSession = Depends(get_db)
 ):
-    """Add a team member to tenant"""
-    current_user = get_current_user(request)
-    
+
     try:
         result = await TenantService.add_team_member(
             tenant_id, user_id, role, current_user["user_id"], db