Fix token issue

services/data/app/api/sales.py

@@ -10,7 +10,7 @@ import uuid
 from datetime import datetime
 
 from app.core.database import get_db
-from app.core.auth import verify_token
+from app.core.auth import get_current_user, AuthInfo
 from app.services.sales_service import SalesService
 from app.services.data_import_service import DataImportService
 from app.services.messaging import data_publisher
@@ -27,7 +27,7 @@ router = APIRouter()
 async def create_sales_record(
     sales_data: SalesDataCreate,
     db: AsyncSession = Depends(get_db),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Create a new sales record"""
     try:
@@ -49,7 +49,7 @@ async def create_sales_record(
 async def get_sales_data(
     query: SalesDataQuery,
     db: AsyncSession = Depends(get_db),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Get sales data by query parameters"""
     try:
@@ -64,7 +64,7 @@ async def import_sales_data(
     file_format: str = Form(...),
     file: UploadFile = File(...),
     db: AsyncSession = Depends(get_db),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Import sales data from file"""
     try:
@@ -96,7 +96,7 @@ async def import_sales_data(
 async def import_sales_json(
     import_data: SalesDataImport,
     db: AsyncSession = Depends(get_db),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Import sales data from JSON"""
     try:
@@ -123,7 +123,7 @@ async def import_sales_json(
 @router.post("/import/validate")
 async def validate_import_data(
     import_data: SalesDataImport,
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Validate import data before processing"""
     try:
@@ -138,7 +138,7 @@ async def validate_import_data(
 @router.get("/import/template/{format_type}")
 async def get_import_template(
     format_type: str,
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Get import template for specified format"""
     try:
@@ -178,7 +178,7 @@ async def import_sales_data_advanced(
     file: UploadFile = File(...),
     validate_only: bool = Form(False),
     db: AsyncSession = Depends(get_db),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Advanced import with validation and preview options"""
     try:
@@ -239,7 +239,7 @@ async def get_import_history(
     limit: int = Query(10, ge=1, le=100),
     offset: int = Query(0, ge=0),
     db: AsyncSession = Depends(get_db),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Get import history for tenant"""
     try:
@@ -292,7 +292,7 @@ async def delete_import_batch(
     import_date: str,  # Format: YYYY-MM-DD
     source: str = Query(..., description="Import source (csv, excel, json, pos)"),
     db: AsyncSession = Depends(get_db),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Delete an entire import batch"""
     try:
@@ -354,7 +354,7 @@ async def get_sales_statistics(
     start_date: datetime = Query(None, description="Start date for statistics"),
     end_date: datetime = Query(None, description="End date for statistics"),
     db: AsyncSession = Depends(get_db),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Get sales statistics for tenant"""
     try:
@@ -454,7 +454,7 @@ async def export_sales_data(
     end_date: datetime = Query(None, description="End date"),
     products: List[str] = Query(None, description="Filter by products"),
     db: AsyncSession = Depends(get_db),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Export sales data in specified format"""
     try:

services/data/app/api/traffic.py

@@ -9,7 +9,7 @@ from typing import List, Optional
 from datetime import datetime, timedelta
 
 from app.core.database import get_db
-from app.core.auth import verify_token
+from app.core.auth import get_current_user, AuthInfo
 from app.services.traffic_service import TrafficService
 from app.services.messaging import data_publisher
 from app.schemas.external import (
@@ -25,7 +25,7 @@ traffic_service = TrafficService()
 async def get_current_traffic(
     latitude: float = Query(..., description="Latitude"),
     longitude: float = Query(..., description="Longitude"),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Get current traffic data for location"""
     try:
@@ -52,7 +52,7 @@ async def get_historical_traffic(
     start_date: datetime = Query(..., description="Start date"),
     end_date: datetime = Query(..., description="End date"),
     db: AsyncSession = Depends(get_db),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Get historical traffic data"""
     try:

services/data/app/api/weather.py

@@ -9,7 +9,7 @@ from typing import List, Optional
 from datetime import datetime, timedelta
 
 from app.core.database import get_db
-from app.core.auth import verify_token
+from app.core.auth import get_current_user, AuthInfo
 from app.services.weather_service import WeatherService
 from app.services.messaging import data_publisher
 from app.schemas.external import (
@@ -26,7 +26,7 @@ weather_service = WeatherService()
 async def get_current_weather(
     latitude: float = Query(..., description="Latitude"),
     longitude: float = Query(..., description="Longitude"),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Get current weather for location"""
     try:
@@ -43,7 +43,7 @@ async def get_weather_forecast(
     latitude: float = Query(..., description="Latitude"),
     longitude: float = Query(..., description="Longitude"),
     days: int = Query(7, description="Number of forecast days", ge=1, le=14),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Get weather forecast for location"""
     try:
@@ -69,7 +69,7 @@ async def get_historical_weather(
     start_date: datetime = Query(..., description="Start date"),
     end_date: datetime = Query(..., description="End date"),
     db: AsyncSession = Depends(get_db),
-    current_user: dict = Depends(verify_token)
+    current_user: AuthInfo = Depends(get_current_user)
 ):
     """Get historical weather data"""
     try: