table change

core/models.py

@@ -1,49 +1,36 @@
 """
 SQLAlchemy models for the APIGateway application.
+
+Tables:
+- User: Server-side users with credits
+- ClientUser: Client identifiers mapping to server users
+- AuditLog: Unified client/server audit logging
+- GeminiJob: AI job queue
+- PaymentTransaction: Credit purchases
+- Contact: Support tickets
+- ApiKeyUsage: API key load balancing
+- RateLimit: Rate limiting
 """
-from sqlalchemy import Column, Integer, String, Text, DateTime, JSON, Boolean
+from sqlalchemy import Column, Integer, String, Text, DateTime, JSON, Boolean, ForeignKey
+from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
 from core.database import Base
 
 
-class BlinkData(Base):
-    """
-    Model for storing decrypted blink data.
-    
-    Attributes:
-        id: Primary key
-        user_id: User identifier (first 20 chars from URL param)
-        refer_url: Referer URL from request header
-        json_data: Decrypted JSON data
-        created_at: Timestamp of record creation
-    """
-    __tablename__ = "blink_data"
-
-    id = Column(Integer, primary_key=True, autoincrement=True, index=True)
-    user_id = Column(String(20), index=True, nullable=False)
-    refer_url = Column(Text, nullable=True)
-    ip_address = Column(String(45), nullable=True)  # IPv6 can be up to 45 chars
-    ipv4_address = Column(String(15), nullable=True)
-    ipv6_address = Column(String(45), nullable=True)
-    country = Column(String(100), nullable=True)  # Country from IP geolocation
-    region = Column(String(100), nullable=True)   # Region/State from IP geolocation
-    json_data = Column(JSON, nullable=True)
-    created_at = Column(DateTime(timezone=True), server_default=func.now())
-
-    def __repr__(self):
-        return f"<BlinkData(id={self.id}, user_id={self.user_id})>"
-
+# =============================================================================
+# User & Client Tracking
+# =============================================================================
 
 class User(Base):
     """
     User model for credit system.
-    Supports both legacy secret key and Google OAuth authentication.
+    Supports Google OAuth authentication.
+    One User can have many ClientUser mappings.
     """
     __tablename__ = "users"
 
     id = Column(Integer, primary_key=True, autoincrement=True, index=True)
     user_id = Column(String(50), unique=True, index=True, nullable=False)  # Backend generated UUID
-    temp_user_id = Column(String(50), index=True, nullable=True)  # From frontend
     email = Column(String(255), unique=True, index=True, nullable=False)
     
     # Google OAuth fields
@@ -51,11 +38,7 @@ class User(Base):
     name = Column(String(255), nullable=True)  # Display name from Google
     profile_picture = Column(Text, nullable=True)  # Google profile picture URL
     
-    # Legacy field (kept for migration, nullable now)
-    secret_key_hash = Column(String(255), nullable=True)
-    
     # Token versioning for JWT invalidation
-    # Incrementing this invalidates all existing tokens for this user
     token_version = Column(Integer, default=1, nullable=False)
     
     # Credits and status
@@ -65,40 +48,101 @@ class User(Base):
     last_used_at = Column(DateTime(timezone=True), nullable=True)
     is_active = Column(Boolean, default=True)
 
+    # Relationships
+    client_users = relationship("ClientUser", back_populates="user", lazy="dynamic")
+    jobs = relationship("GeminiJob", back_populates="user", lazy="dynamic")
+    payments = relationship("PaymentTransaction", back_populates="user", lazy="dynamic")
+    contacts = relationship("Contact", back_populates="user", lazy="dynamic")
+    audit_logs = relationship("AuditLog", back_populates="user", lazy="dynamic")
+
     def __repr__(self):
         return f"<User(id={self.id}, email={self.email})>"
 
 
-
-class RateLimit(Base):
+class ClientUser(Base):
     """
-    Rate limit tracking table.
+    Map server users to multiple client identifiers.
+    Enables tracking users across devices, IPs, and login states.
+    
+    Use cases:
+    - Track same user across multiple devices
+    - Link anonymous activity to logged-in user
+    - Detect same device before/after login
+    - Track users by network/location
     """
-    __tablename__ = "rate_limits"
+    __tablename__ = "client_users"
 
     id = Column(Integer, primary_key=True, autoincrement=True, index=True)
-    identifier = Column(String(255), index=True, nullable=False)  # IP or email
-    endpoint = Column(String(255), index=True, nullable=False)
-    attempts = Column(Integer, default=0)
-    window_start = Column(DateTime(timezone=True), nullable=False)
-    expires_at = Column(DateTime(timezone=True), nullable=False)
+    user_id = Column(String(50), ForeignKey("users.user_id"), index=True, nullable=False)
+    client_user_id = Column(String(100), index=True, nullable=True)  # Client-side temp identifier
+    
+    # IP tracking for network/location correlation
+    ipv4_address = Column(String(15), nullable=True, index=True)
+    ipv6_address = Column(String(45), nullable=True, index=True)
+    
+    # Device identification
+    device_fingerprint = Column(String(255), nullable=True, index=True)  # Browser fingerprint hash
+    device_info = Column(JSON, nullable=True)  # Browser, OS, screen size, language, etc.
+    
+    # Timestamps
+    created_at = Column(DateTime(timezone=True), server_default=func.now())
+    last_seen_at = Column(DateTime(timezone=True), nullable=True)
+
+    # Relationship
+    user = relationship("User", back_populates="client_users")
+
+    def __repr__(self):
+        return f"<ClientUser(user_id={self.user_id}, client_user_id={self.client_user_id})>"
+
 
+# =============================================================================
+# Audit Logging
+# =============================================================================
 
 class AuditLog(Base):
     """
-    Audit log for security events.
+    Unified audit log for client and server events.
+    Replaces BlinkData - captures all trackable events.
+    
+    log_type:
+    - "client": Login attempts, page views, API calls from client
+    - "server": Job processing, credit changes, internal operations
     """
     __tablename__ = "audit_logs"
 
     id = Column(Integer, primary_key=True, autoincrement=True, index=True)
-    user_id = Column(String(50), nullable=True)
-    action = Column(String(50), nullable=False)
-    ip_address = Column(String(45), nullable=False)
-    user_agent = Column(String(255), nullable=True)
-    status = Column(String(20), nullable=False)
+    log_type = Column(String(20), index=True, nullable=False)  # "client" or "server"
+    
+    # User tracking
+    user_id = Column(String(50), ForeignKey("users.user_id"), nullable=True, index=True)
+    client_user_id = Column(String(100), nullable=True, index=True)  # For anonymous client logs
+    
+    # Event details
+    action = Column(String(50), index=True, nullable=False)  # login, page_view, job_created, etc.
+    details = Column(JSON, nullable=True)  # Flexible data storage
+    
+    # Request context
+    ip_address = Column(String(45), nullable=True)
+    user_agent = Column(String(500), nullable=True)
+    refer_url = Column(Text, nullable=True)
+    
+    # Outcome
+    status = Column(String(20), nullable=False)  # success, failure, error
     error_message = Column(Text, nullable=True)
-    timestamp = Column(DateTime(timezone=True), server_default=func.now())
+    
+    # Timestamp
+    timestamp = Column(DateTime(timezone=True), server_default=func.now(), index=True)
+
+    # Relationship
+    user = relationship("User", back_populates="audit_logs")
+
+    def __repr__(self):
+        return f"<AuditLog(type={self.log_type}, action={self.action}, status={self.status})>"
+
 
+# =============================================================================
+# Job Queue
+# =============================================================================
 
 class GeminiJob(Base):
     """
@@ -109,7 +153,7 @@ class GeminiJob(Base):
 
     id = Column(Integer, primary_key=True, autoincrement=True, index=True)
     job_id = Column(String(100), unique=True, index=True, nullable=False)  # Our ID for client
-    user_id = Column(String(50), index=True, nullable=False)  # User who requested
+    user_id = Column(String(50), ForeignKey("users.user_id"), index=True, nullable=False)
     job_type = Column(String(20), index=True, nullable=False)  # video, image, text, analyze
     third_party_id = Column(String(255), nullable=True)  # Gemini operation name (for video)
     status = Column(String(20), default="queued", index=True)  # queued, processing, completed, failed, cancelled
@@ -130,29 +174,16 @@ class GeminiJob(Base):
     credits_reserved = Column(Integer, default=0)  # Credits reserved for this job
     credits_refunded = Column(Boolean, default=False)  # Whether credits were refunded
 
+    # Relationship
+    user = relationship("User", back_populates="jobs")
+
     def __repr__(self):
         return f"<GeminiJob(job_id={self.job_id}, type={self.job_type}, status={self.status}, priority={self.priority})>"
 
 
-class ApiKeyUsage(Base):
-    """
-    Track API key usage for round-robin load balancing.
-    Only stores the key index, not the actual key for security.
-    """
-    __tablename__ = "api_key_usage"
-
-    id = Column(Integer, primary_key=True, autoincrement=True)
-    key_index = Column(Integer, unique=True, index=True, nullable=False)  # Index of key in GEMINI_API_KEYS
-    total_requests = Column(Integer, default=0)
-    success_count = Column(Integer, default=0)
-    failure_count = Column(Integer, default=0)
-    last_error = Column(Text, nullable=True)  # Stores the last error message for review
-    last_used_at = Column(DateTime(timezone=True), nullable=True)
-    created_at = Column(DateTime(timezone=True), server_default=func.now())
-
-    def __repr__(self):
-        return f"<ApiKeyUsage(index={self.key_index}, total={self.total_requests}, success={self.success_count}, failed={self.failure_count})>"
-
+# =============================================================================
+# Payments
+# =============================================================================
 
 class PaymentTransaction(Base):
     """
@@ -163,7 +194,7 @@ class PaymentTransaction(Base):
 
     id = Column(Integer, primary_key=True, autoincrement=True, index=True)
     transaction_id = Column(String(50), unique=True, index=True, nullable=False)  # Our internal ID
-    user_id = Column(String(50), index=True, nullable=False)  # Links to User.user_id
+    user_id = Column(String(50), ForeignKey("users.user_id"), index=True, nullable=False)
     
     # Order details
     gateway = Column(String(20), nullable=False)  # razorpay, stripe
@@ -187,12 +218,19 @@ class PaymentTransaction(Base):
     # Metadata
     razorpay_signature = Column(String(255), nullable=True)  # For verification audit
     error_message = Column(Text, nullable=True)
-    extra_data = Column(JSON, nullable=True)  # Additional gateway-specific data (renamed from 'metadata' - reserved)
+    extra_data = Column(JSON, nullable=True)  # Additional gateway-specific data
+
+    # Relationship
+    user = relationship("User", back_populates="payments")
 
     def __repr__(self):
         return f"<PaymentTransaction(id={self.transaction_id}, status={self.status}, amount={self.amount_paise})>"
 
 
+# =============================================================================
+# Support & Utilities
+# =============================================================================
+
 class Contact(Base):
     """
     Contact form submissions from authenticated users.
@@ -201,12 +239,49 @@ class Contact(Base):
     __tablename__ = "contacts"
 
     id = Column(Integer, primary_key=True, autoincrement=True, index=True)
-    user_id = Column(String(50), index=True, nullable=False)  # Links to User.user_id
+    user_id = Column(String(50), ForeignKey("users.user_id"), index=True, nullable=False)
     email = Column(String(255), nullable=False, index=True)  # User's email
     subject = Column(String(500), nullable=True)
     message = Column(Text, nullable=False)
     ip_address = Column(String(45), nullable=True)  # IPv6 can be up to 45 chars
     created_at = Column(DateTime(timezone=True), server_default=func.now())
 
+    # Relationship
+    user = relationship("User", back_populates="contacts")
+
     def __repr__(self):
         return f"<Contact(id={self.id}, user_id={self.user_id}, email={self.email})>"
+
+
+class RateLimit(Base):
+    """
+    Rate limit tracking table.
+    """
+    __tablename__ = "rate_limits"
+
+    id = Column(Integer, primary_key=True, autoincrement=True, index=True)
+    identifier = Column(String(255), index=True, nullable=False)  # IP or email
+    endpoint = Column(String(255), index=True, nullable=False)
+    attempts = Column(Integer, default=0)
+    window_start = Column(DateTime(timezone=True), nullable=False)
+    expires_at = Column(DateTime(timezone=True), nullable=False)
+
+
+class ApiKeyUsage(Base):
+    """
+    Track API key usage for round-robin load balancing.
+    Only stores the key index, not the actual key for security.
+    """
+    __tablename__ = "api_key_usage"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    key_index = Column(Integer, unique=True, index=True, nullable=False)  # Index of key in GEMINI_API_KEYS
+    total_requests = Column(Integer, default=0)
+    success_count = Column(Integer, default=0)
+    failure_count = Column(Integer, default=0)
+    last_error = Column(Text, nullable=True)  # Stores the last error message for review
+    last_used_at = Column(DateTime(timezone=True), nullable=True)
+    created_at = Column(DateTime(timezone=True), server_default=func.now())
+
+    def __repr__(self):
+        return f"<ApiKeyUsage(index={self.key_index}, total={self.total_requests}, success={self.success_count}, failed={self.failure_count})>"

routers/auth.py

@@ -13,7 +13,7 @@ import uuid
 import logging
 
 from core.database import get_db
-from core.models import User, AuditLog
+from core.models import User, AuditLog, ClientUser
 from core.schemas import (
     CheckRegistrationRequest,
     GoogleAuthRequest,
@@ -58,11 +58,12 @@ async def check_registration(
     if not await check_rate_limit(db, ip, "/auth/check-registration", 10, 1):
         raise HTTPException(status_code=status.HTTP_429_TOO_MANY_REQUESTS, detail="Too many requests")
 
-    query = select(User).where(User.temp_user_id == request.user_id)
+    # Check if this client_user_id has been linked to a server user
+    query = select(ClientUser).where(ClientUser.client_user_id == request.user_id)
     result = await db.execute(query)
-    user = result.scalar_one_or_none()
+    client_user = result.scalar_one_or_none()
 
-    return {"is_registered": user is not None}
+    return {"is_registered": client_user is not None}
 
 
 @router.post("/google", response_model=AuthResponse)
@@ -108,6 +109,7 @@ async def google_auth(
         
         # Log failed attempt
         audit_log = AuditLog(
+            log_type="server",
             user_id=None,
             action="google_auth",
             ip_address=ip,
@@ -139,15 +141,34 @@ async def google_auth(
         user.profile_picture = google_info.picture
         user.last_used_at = datetime.utcnow()
         
-        # Link temp_user_id if provided and not already set
-        if request.temp_user_id and not user.temp_user_id:
-            user.temp_user_id = request.temp_user_id
+        # Link client_user_id if provided
+        if request.temp_user_id:
+            # Check if this client mapping exists
+            client_query = select(ClientUser).where(
+                ClientUser.user_id == user.user_id,
+                ClientUser.client_user_id == request.temp_user_id
+            )
+            client_result = await db.execute(client_query)
+            existing_client = client_result.scalar_one_or_none()
+            
+            if not existing_client:
+                # Create new client user mapping
+                client_user = ClientUser(
+                    user_id=user.user_id,
+                    client_user_id=request.temp_user_id,
+                    ipv4_address=ip if ":" not in ip else None,
+                    ipv6_address=ip if ":" in ip else None,
+                    last_seen_at=datetime.utcnow()
+                )
+                db.add(client_user)
+            else:
+                # Update last seen
+                existing_client.last_seen_at = datetime.utcnow()
     else:
         # New user - create account
         is_new_user = True
         user = User(
             user_id="usr_" + str(uuid.uuid4()),
-            temp_user_id=request.temp_user_id,
             email=google_info.email,
             google_id=google_info.google_id,
             name=google_info.name,
@@ -156,10 +177,23 @@ async def google_auth(
         )
         db.add(user)
         logger.info(f"New user created via Google: {google_info.email}")
+        
+        # Create client user mapping if temp_user_id provided
+        if request.temp_user_id:
+            client_user = ClientUser(
+                user_id=user.user_id,
+                client_user_id=request.temp_user_id,
+                ipv4_address=ip if ":" not in ip else None,
+                ipv6_address=ip if ":" in ip else None,
+                last_seen_at=datetime.utcnow()
+            )
+            db.add(client_user)
     
     # Log successful auth
     audit_log = AuditLog(
+        log_type="server",
         user_id=user.user_id,
+        client_user_id=request.temp_user_id,
         action="google_auth",
         ip_address=ip,
         status="success"
@@ -297,6 +331,7 @@ async def logout(
     
     # Log logout
     audit_log = AuditLog(
+        log_type="server",
         user_id=user.user_id,
         action="logout",
         ip_address=ip,

routers/blink.py

@@ -1,3 +1,7 @@
+"""
+Blink Router - Admin endpoints for viewing and tracking data.
+Uses AuditLog for unified client/server event tracking.
+"""
 from fastapi import APIRouter, Depends, HTTPException, status, Query, Request
 from fastapi.responses import JSONResponse
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -6,7 +10,7 @@ import ipaddress
 import logging
 
 from core.database import get_db
-from core.models import BlinkData, User, AuditLog, GeminiJob, Contact
+from core.models import User, AuditLog, GeminiJob, Contact, ClientUser
 from services.encryption_service import decrypt_multiple_blocks
 from dependencies import get_geolocation
 
@@ -17,28 +21,45 @@ router = APIRouter()
 # User ID length constant
 USER_ID_LENGTH = 20
 
+
+# =============================================================================
+# Admin Data Endpoints
+# =============================================================================
+
 @router.get("/api/data")
 async def get_data(
     page: int = Query(1, ge=1, description="Page number"),
     limit: int = Query(100, ge=1, le=500, description="Items per page"),
+    log_type: str = Query(None, description="Filter by log type: client, server"),
     db: AsyncSession = Depends(get_db)
 ):
     """
-    Get paginated blink data.
+    Get paginated audit log data.
+    Replaces old BlinkData endpoint - now uses unified AuditLog.
     """
     try:
         offset = (page - 1) * limit
         
+        # Build query with optional filter
+        base_query = select(AuditLog)
+        count_query = select(func.count(AuditLog.id))
+        
+        if log_type:
+            base_query = base_query.where(AuditLog.log_type == log_type)
+            count_query = count_query.where(AuditLog.log_type == log_type)
+        
         # Get total count
-        total_result = await db.execute(select(func.count(BlinkData.id)))
+        total_result = await db.execute(count_query)
         total = total_result.scalar() or 0
         
         # Get unique users count
-        unique_result = await db.execute(select(func.count(func.distinct(BlinkData.user_id))))
+        unique_result = await db.execute(
+            select(func.count(func.distinct(AuditLog.user_id)))
+        )
         unique_users = unique_result.scalar() or 0
         
         # Get paginated items
-        query = select(BlinkData).order_by(BlinkData.id.desc()).offset(offset).limit(limit)
+        query = base_query.order_by(AuditLog.timestamp.desc()).offset(offset).limit(limit)
         result = await db.execute(query)
         items = result.scalars().all()
         
@@ -46,15 +67,16 @@ async def get_data(
             "items": [
                 {
                     "id": item.id,
+                    "log_type": item.log_type,
                     "user_id": item.user_id,
-                    "refer_url": item.refer_url,
+                    "client_user_id": item.client_user_id,
+                    "action": item.action,
+                    "details": item.details,
                     "ip_address": item.ip_address,
-                    "ipv4_address": item.ipv4_address,
-                    "ipv6_address": item.ipv6_address,
-                    "country": item.country,
-                    "region": item.region,
-                    "json_data": item.json_data,
-                    "created_at": item.created_at.isoformat() if item.created_at else None
+                    "refer_url": item.refer_url,
+                    "status": item.status,
+                    "error_message": item.error_message,
+                    "timestamp": item.timestamp.isoformat() if item.timestamp else None
                 }
                 for item in items
             ],
@@ -119,24 +141,96 @@ async def get_users(
         )
 
 
+@router.get("/api/client-users")
+async def get_client_users(
+    page: int = Query(1, ge=1, description="Page number"),
+    limit: int = Query(50, ge=1, le=500, description="Items per page"),
+    user_id: str = Query(None, description="Filter by server user_id"),
+    db: AsyncSession = Depends(get_db)
+):
+    """
+    Get paginated client user mappings.
+    Shows how server users map to multiple client identifiers.
+    """
+    try:
+        offset = (page - 1) * limit
+        
+        # Build query with optional filter
+        base_query = select(ClientUser)
+        count_query = select(func.count(ClientUser.id))
+        
+        if user_id:
+            base_query = base_query.where(ClientUser.user_id == user_id)
+            count_query = count_query.where(ClientUser.user_id == user_id)
+        
+        # Get total count
+        total_result = await db.execute(count_query)
+        total = total_result.scalar() or 0
+        
+        # Get paginated items
+        query = base_query.order_by(ClientUser.id.desc()).offset(offset).limit(limit)
+        result = await db.execute(query)
+        items = result.scalars().all()
+        
+        return {
+            "items": [
+                {
+                    "id": item.id,
+                    "user_id": item.user_id,
+                    "client_user_id": item.client_user_id,
+                    "ipv4_address": item.ipv4_address,
+                    "ipv6_address": item.ipv6_address,
+                    "device_fingerprint": item.device_fingerprint,
+                    "device_info": item.device_info,
+                    "created_at": item.created_at.isoformat() if item.created_at else None,
+                    "last_seen_at": item.last_seen_at.isoformat() if item.last_seen_at else None
+                }
+                for item in items
+            ],
+            "total": total,
+            "page": page,
+            "limit": limit
+        }
+    except Exception as e:
+        logger.error(f"Error fetching client users: {e}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail="Error fetching client users"
+        )
+
+
 @router.get("/api/audit-logs")
 async def get_audit_logs(
     page: int = Query(1, ge=1, description="Page number"),
     limit: int = Query(50, ge=1, le=500, description="Items per page"),
+    log_type: str = Query(None, description="Filter by log type: client, server"),
+    action: str = Query(None, description="Filter by action"),
     db: AsyncSession = Depends(get_db)
 ):
     """
-    Get paginated audit logs.
+    Get paginated audit logs with optional filters.
     """
     try:
         offset = (page - 1) * limit
         
+        # Build query with filters
+        base_query = select(AuditLog)
+        count_query = select(func.count(AuditLog.id))
+        
+        if log_type:
+            base_query = base_query.where(AuditLog.log_type == log_type)
+            count_query = count_query.where(AuditLog.log_type == log_type)
+        
+        if action:
+            base_query = base_query.where(AuditLog.action == action)
+            count_query = count_query.where(AuditLog.action == action)
+        
         # Get total count
-        total_result = await db.execute(select(func.count(AuditLog.id)))
+        total_result = await db.execute(count_query)
         total = total_result.scalar() or 0
         
         # Get paginated items
-        query = select(AuditLog).order_by(AuditLog.id.desc()).offset(offset).limit(limit)
+        query = base_query.order_by(AuditLog.timestamp.desc()).offset(offset).limit(limit)
         result = await db.execute(query)
         items = result.scalars().all()
         
@@ -144,8 +238,11 @@ async def get_audit_logs(
             "items": [
                 {
                     "id": item.id,
+                    "log_type": item.log_type,
                     "user_id": item.user_id,
+                    "client_user_id": item.client_user_id,
                     "action": item.action,
+                    "details": item.details,
                     "ip_address": item.ip_address,
                     "status": item.status,
                     "error_message": item.error_message,
@@ -198,7 +295,7 @@ async def get_gemini_jobs(
                     "created_at": item.created_at.isoformat() if item.created_at else None,
                     "completed_at": item.completed_at.isoformat() if item.completed_at else None
                 }
-        for item in items
+                for item in items
             ],
             "total": total,
             "page": page,
@@ -324,6 +421,11 @@ async def get_contacts(
             detail="Error fetching contacts"
         )
 
+
+# =============================================================================
+# Client Tracking Endpoint
+# =============================================================================
+
 @router.get("/blink")
 async def blink(
     request: Request,
@@ -332,6 +434,7 @@ async def blink(
 ):
     """
     Process blink request with encrypted user data.
+    Logs to AuditLog with log_type='client'.
     """
     try:
         # Validate minimum length
@@ -341,96 +444,85 @@ async def blink(
                 detail=f"Parameter 'userid' must be at least {USER_ID_LENGTH} characters"
             )
         
-        # Extract user_id (first 20 characters)
-        user_id = userid[:USER_ID_LENGTH]
+        # Extract client_user_id (first 20 characters)
+        client_user_id = userid[:USER_ID_LENGTH]
         
         # Extract encrypted data (remaining characters)
         encrypted_data = userid[USER_ID_LENGTH:]
         
         if not encrypted_data:
-            logger.warning(f"No encrypted data received for user: {user_id}")
-            # Still store the record with empty json_data
+            logger.warning(f"No encrypted data received for client: {client_user_id}")
             decrypted_results = []
         else:
-            # Try to decrypt - might be single or multiple blocks
             try:
                 decrypted_results = decrypt_multiple_blocks(encrypted_data)
             except Exception as e:
-                logger.error(f"Decryption failed for user {user_id}: {e}")
-                # Store with error information
+                logger.error(f"Decryption failed for client {client_user_id}: {e}")
                 decrypted_results = [{"error": str(e), "raw_encrypted": encrypted_data[:100]}]
         
-        # Get referer URL from headers (full URL, not just origin)
+        # Get referer URL from headers
         refer_url = request.headers.get("referer")
+        user_agent = request.headers.get("user-agent")
         
         # Get client IP address
-        # Check X-Forwarded-For header first (for proxies/load balancers)
         forwarded_for = request.headers.get("x-forwarded-for")
         if forwarded_for:
-            # X-Forwarded-For can contain multiple IPs, take the first one
             ip_address = forwarded_for.split(",")[0].strip()
         else:
-            # Fall back to direct client IP
             ip_address = request.client.host if request.client else None
         
         # Get geolocation from IP address
         country, region = await get_geolocation(ip_address)
         
-        # Determine IPv4 vs IPv6
-        ipv4_address = None
-        ipv6_address = None
-        
-        if ip_address:
-            try:
-                ip_obj = ipaddress.ip_address(ip_address)
-                if isinstance(ip_obj, ipaddress.IPv4Address):
-                    ipv4_address = ip_address
-                elif isinstance(ip_obj, ipaddress.IPv6Address):
-                    ipv6_address = ip_address
-            except ValueError:
-                # Invalid IP address format, just keep it in ip_address
-                pass
-        
-        # Store each decrypted result as separate records
+        # Store each decrypted result as separate audit log entries
         records_created = 0
         for json_data in decrypted_results:
-            blink_record = BlinkData(
-                user_id=user_id,
-                refer_url=refer_url,
+            # Add geolocation to details
+            details = {
+                "data": json_data,
+                "country": country,
+                "region": region
+            }
+            
+            audit_log = AuditLog(
+                log_type="client",
+                user_id=None,  # Anonymous until linked
+                client_user_id=client_user_id,
+                action="blink",
+                details=details,
                 ip_address=ip_address,
-                ipv4_address=ipv4_address,
-                ipv6_address=ipv6_address,
-                country=country,
-                region=region,
-                json_data=json_data
+                user_agent=user_agent,
+                refer_url=refer_url,
+                status="success"
             )
-            db.add(blink_record)
+            db.add(audit_log)
             records_created += 1
         
-        # If no results but we have encrypted data, store a record with the raw data reference
+        # If no results but we have encrypted data, store a record
         if not decrypted_results and encrypted_data:
-            blink_record = BlinkData(
-                user_id=user_id,
-                refer_url=refer_url,
+            audit_log = AuditLog(
+                log_type="client",
+                user_id=None,
+                client_user_id=client_user_id,
+                action="blink",
+                details={"encrypted_length": len(encrypted_data), "country": country, "region": region},
                 ip_address=ip_address,
-                ipv4_address=ipv4_address,
-                ipv6_address=ipv6_address,
-                country=country,
-                region=region,
-                json_data={"encrypted_length": len(encrypted_data)}
+                user_agent=user_agent,
+                refer_url=refer_url,
+                status="success"
             )
-            db.add(blink_record)
+            db.add(audit_log)
             records_created = 1
         
         await db.commit()
         
-        logger.info(f"Successfully processed blink for user: {user_id}, records: {records_created}")
+        logger.info(f"Successfully processed blink for client: {client_user_id}, records: {records_created}")
         
         return JSONResponse(
             status_code=status.HTTP_200_OK,
             content={
                 "status": "success",
-                "user_id": user_id,
+                "client_user_id": client_user_id,
                 "records_created": records_created
             }
         )

templates/index.html

@@ -295,9 +295,9 @@
         </header>
 
         <div class="tabs">
-            <button class="tab-btn active" onclick="switchTab('blink')">📊 Blink Data</button>
+            <button class="tab-btn active" onclick="switchTab('audit')">📝 Audit Logs</button>
+            <button class="tab-btn" onclick="switchTab('clients')">🔗 Client Users</button>
             <button class="tab-btn" onclick="switchTab('users')">👥 Users</button>
-            <button class="tab-btn" onclick="switchTab('audit')">📝 Audit Logs</button>
             <button class="tab-btn" onclick="switchTab('jobs')">⚡ Gemini Jobs</button>
             <button class="tab-btn" onclick="switchTab('payments')">💳 Payments</button>
             <button class="tab-btn" onclick="switchTab('contacts')">📧 Contacts</button>
@@ -315,25 +315,29 @@
             </div>
         </div>
 
-        <!-- Blink Data Table -->
-        <div class="table-container" id="blinkTable">
+        <!-- Audit Logs Table -->
+        <div class="table-container" id="auditMainTable">
             <div class="table-wrapper">
                 <table>
                     <thead>
                         <tr>
                             <th>ID</th>
+                            <th>Log Type</th>
                             <th>User ID</th>
+                            <th>Client User ID</th>
+                            <th>Action</th>
+                            <th>Details (JSON)</th>
+                            <th>IP Address</th>
+                            <th>User Agent</th>
                             <th>Refer URL</th>
-                            <th>IPv4</th>
-                            <th>Country</th>
-                            <th>Region</th>
-                            <th>JSON Data</th>
-                            <th>Created At</th>
+                            <th>Status</th>
+                            <th>Error</th>
+                            <th>Timestamp</th>
                         </tr>
                     </thead>
-                    <tbody id="blinkBody">
+                    <tbody id="auditMainBody">
                         <tr>
-                            <td colspan="8">
+                            <td colspan="12">
                                 <div class="loading">
                                     <div class="spinner"></div>Loading...
                                 </div>
@@ -343,10 +347,10 @@
                 </table>
             </div>
             <div class="pagination">
-                <button onclick="prevPage('blink')" id="blinkPrev" disabled>← Previous</button>
-                <span class="page-info">Page <span id="blinkCurrentPage">1</span> of <span
-                        id="blinkTotalPages">1</span></span>
-                <button onclick="nextPage('blink')" id="blinkNext">Next →</button>
+                <button onclick="prevPage('audit')" id="auditPrev" disabled>← Previous</button>
+                <span class="page-info">Page <span id="auditCurrentPage">1</span> of <span
+                        id="auditTotalPages">1</span></span>
+                <button onclick="nextPage('audit')" id="auditNext">Next →</button>
             </div>
         </div>
 
@@ -359,16 +363,20 @@
                             <th>ID</th>
                             <th>User ID</th>
                             <th>Email</th>
+                            <th>Google ID</th>
                             <th>Name</th>
+                            <th>Profile Picture</th>
+                            <th>Token Version</th>
                             <th>Credits</th>
                             <th>Active</th>
                             <th>Created At</th>
+                            <th>Updated At</th>
                             <th>Last Used</th>
                         </tr>
                     </thead>
                     <tbody id="usersBody">
                         <tr>
-                            <td colspan="8">
+                            <td colspan="12">
                                 <div class="loading">
                                     <div class="spinner"></div>Loading...
                                 </div>
@@ -385,24 +393,26 @@
             </div>
         </div>
 
-        <!-- Audit Logs Table -->
-        <div class="table-container hidden" id="auditTable">
+        <!-- Client Users Table -->
+        <div class="table-container hidden" id="clientsTable">
             <div class="table-wrapper">
                 <table>
                     <thead>
                         <tr>
                             <th>ID</th>
-                            <th>User ID</th>
-                            <th>Action</th>
-                            <th>IP Address</th>
-                            <th>Status</th>
-                            <th>Error</th>
-                            <th>Timestamp</th>
+                            <th>User ID (Server)</th>
+                            <th>Client User ID</th>
+                            <th>IPv4 Address</th>
+                            <th>IPv6 Address</th>
+                            <th>Device Fingerprint</th>
+                            <th>Device Info (JSON)</th>
+                            <th>Created At</th>
+                            <th>Last Seen At</th>
                         </tr>
                     </thead>
-                    <tbody id="auditBody">
+                    <tbody id="clientsBody">
                         <tr>
-                            <td colspan="7">
+                            <td colspan="9">
                                 <div class="loading">
                                     <div class="spinner"></div>Loading...
                                 </div>
@@ -412,13 +422,12 @@
                 </table>
             </div>
             <div class="pagination">
-                <button onclick="prevPage('audit')" id="auditPrev" disabled>← Previous</button>
-                <span class="page-info">Page <span id="auditCurrentPage">1</span> of <span
-                        id="auditTotalPages">1</span></span>
-                <button onclick="nextPage('audit')" id="auditNext">Next →</button>
+                <button onclick="prevPage('clients')" id="clientsPrev" disabled>← Previous</button>
+                <span class="page-info">Page <span id="clientsCurrentPage">1</span> of <span
+                        id="clientsTotalPages">1</span></span>
+                <button onclick="nextPage('clients')" id="clientsNext">Next →</button>
             </div>
         </div>
-
         <!-- Gemini Jobs Table -->
         <div class="table-container hidden" id="jobsTable">
             <div class="table-wrapper">
@@ -564,19 +573,19 @@
     <script>
         const PAGE_SIZE = 50;
         const state = {
-            blink: { page: 1, total: 0 },
-            users: { page: 1, total: 0 },
             audit: { page: 1, total: 0 },
+            clients: { page: 1, total: 0 },
+            users: { page: 1, total: 0 },
             jobs: { page: 1, total: 0 },
             payments: { page: 1, total: 0, revenue: 0 },
             contacts: { page: 1, total: 0 }
         };
-        let currentTab = 'blink';
+        let currentTab = 'audit';
 
         const endpoints = {
-            blink: '/api/data',
-            users: '/api/users',
             audit: '/api/audit-logs',
+            clients: '/api/client-users',
+            users: '/api/users',
             jobs: '/api/gemini-jobs',
             payments: '/api/payment-transactions',
             contacts: '/api/contacts'
@@ -590,16 +599,16 @@
             event.target.classList.add('active');
 
             // Show/hide tables
-            document.getElementById('blinkTable').classList.toggle('hidden', tab !== 'blink');
+            document.getElementById('auditMainTable').classList.toggle('hidden', tab !== 'audit');
+            document.getElementById('clientsTable').classList.toggle('hidden', tab !== 'clients');
             document.getElementById('usersTable').classList.toggle('hidden', tab !== 'users');
-            document.getElementById('auditTable').classList.toggle('hidden', tab !== 'audit');
             document.getElementById('jobsTable').classList.toggle('hidden', tab !== 'jobs');
             document.getElementById('paymentsTable').classList.toggle('hidden', tab !== 'payments');
             document.getElementById('contactsTable').classList.toggle('hidden', tab !== 'contacts');
             document.getElementById('keysTable').classList.toggle('hidden', tab !== 'keys');
 
-            // Show/hide unique users stat (for blink and payments)
-            document.getElementById('uniqueUsersCard').classList.toggle('hidden', tab !== 'blink' && tab !== 'payments');
+            // Show/hide unique users stat (only for audit and payments)
+            document.getElementById('uniqueUsersCard').classList.toggle('hidden', tab !== 'audit' && tab !== 'payments');
 
             // Load data
             if (tab === 'keys') {
@@ -619,61 +628,71 @@
             }
         }
 
-        function renderBlinkTable(items) {
-            const tbody = document.getElementById('blinkBody');
+        function renderAuditTable(items) {
+            const tbody = document.getElementById('auditMainBody');
             if (items.length === 0) {
-                tbody.innerHTML = '<tr><td colspan="8"><div class="empty-state">No data available</div></td></tr>';
+                tbody.innerHTML = '<tr><td colspan="12"><div class="empty-state">No audit logs found</div></td></tr>';
                 return;
             }
             tbody.innerHTML = items.map(item => `
                 <tr>
                     <td>${item.id}</td>
-                    <td class="user-id">${item.user_id}</td>
+                    <td><span class="status-badge" style="background: rgba(0, 212, 255, 0.2); color: #00d4ff;">${item.log_type}</span></td>
+                    <td class="user-id">${item.user_id || '-'}</td>
+                    <td class="user-id">${item.client_user_id || '-'}</td>
+                    <td>${item.action}</td>
+                    <td><pre class="json-data">${JSON.stringify(item.details, null, 2)}</pre></td>
+                    <td>${item.ip_address || '-'}</td>
+                    <td class="truncate" title="${item.user_agent || ''}">${item.user_agent || '-'}</td>
                     <td class="truncate" title="${item.refer_url || ''}">${item.refer_url || '-'}</td>
-                    <td>${item.ipv4_address || item.ip_address || '-'}</td>
-                    <td>${item.country || '-'}</td>
-                    <td>${item.region || '-'}</td>
-                    <td><pre class="json-data">${JSON.stringify(item.json_data, null, 2)}</pre></td>
-                    <td class="timestamp">${item.created_at ? new Date(item.created_at).toLocaleString() : '-'}</td>
+                    <td><span class="status-badge status-${item.status}">${item.status}</span></td>
+                    <td class="truncate" title="${item.error_message || ''}">${item.error_message || '-'}</td>
+                    <td class="timestamp">${item.timestamp ? new Date(item.timestamp).toLocaleString() : '-'}</td>
                 </tr>
             `).join('');
         }
 
-        function renderUsersTable(items) {
-            const tbody = document.getElementById('usersBody');
+        function renderClientsTable(items) {
+            const tbody = document.getElementById('clientsBody');
             if (items.length === 0) {
-                tbody.innerHTML = '<tr><td colspan="8"><div class="empty-state">No users found</div></td></tr>';
+                tbody.innerHTML = '<tr><td colspan="9"><div class="empty-state">No client users found</div></td></tr>';
                 return;
             }
             tbody.innerHTML = items.map(item => `
                 <tr>
                     <td>${item.id}</td>
                     <td class="user-id">${item.user_id}</td>
-                    <td>${item.email}</td>
-                    <td>${item.name || '-'}</td>
-                    <td><span class="credits-badge">${item.credits}</span></td>
-                    <td><span class="status-badge ${item.is_active ? 'status-success' : 'status-failed'}">${item.is_active ? 'Active' : 'Inactive'}</span></td>
+                    <td class="user-id">${item.client_user_id || '-'}</td>
+                    <td>${item.ipv4_address || '-'}</td>
+                    <td>${item.ipv6_address || '-'}</td>
+                    <td class="truncate" title="${item.device_fingerprint || ''}">${item.device_fingerprint || '-'}</td>
+                    <td><pre class="json-data">${JSON.stringify(item.device_info, null, 2)}</pre></td>
                     <td class="timestamp">${item.created_at ? new Date(item.created_at).toLocaleString() : '-'}</td>
-                    <td class="timestamp">${item.last_used_at ? new Date(item.last_used_at).toLocaleString() : '-'}</td>
+                    <td class="timestamp">${item.last_seen_at ? new Date(item.last_seen_at).toLocaleString() : '-'}</td>
                 </tr>
             `).join('');
         }
 
-        function renderAuditTable(items) {
-            const tbody = document.getElementById('auditBody');
+        function renderUsersTable(items) {
+            const tbody = document.getElementById('usersBody');
             if (items.length === 0) {
-                tbody.innerHTML = '<tr><td colspan="7"><div class="empty-state">No audit logs found</div></td></tr>';
+                tbody.innerHTML = '<tr><td colspan="12"><div class="empty-state">No users found</div></td></tr>';
                 return;
             }
             tbody.innerHTML = items.map(item => `
                 <tr>
                     <td>${item.id}</td>
-                    <td class="user-id">${item.user_id || '-'}</td>
-                    <td>${item.action}</td>
-                    <td>${item.ip_address}</td>
-                    <td><span class="status-badge status-${item.status}">${item.status}</span></td>
-                    <td class="truncate" title="${item.error_message || ''}">${item.error_message || '-'}</td>
-                    <td class="timestamp">${item.timestamp ? new Date(item.timestamp).toLocaleString() : '-'}</td>
+                    <td class="user-id">${item.user_id}</td>
+                    <td>${item.email}</td>
+                    <td class="truncate" title="${item.google_id || ''}">${item.google_id || '-'}</td>
+                    <td>${item.name || '-'}</td>
+                    <td class="truncate" title="${item.profile_picture || ''}"><img src="${item.profile_picture || ''}" width="40" height="40" style="border-radius: 50%;" onerror="this.style.display='none'" /></td>
+                    <td>${item.token_version || 1}</td>
+                    <td><span class="credits-badge">${item.credits}</span></td>
+                    <td><span class="status-badge ${item.is_active ? 'status-success' : 'status-failed'}">${item.is_active ? 'Active' : 'Inactive'}</span></td>
+                    <td class="timestamp">${item.created_at ? new Date(item.created_at).toLocaleString() : '-'}</td>
+                    <td class="timestamp">${item.updated_at ? new Date(item.updated_at).toLocaleString() : '-'}</td>
+                    <td class="timestamp">${item.last_used_at ? new Date(item.last_used_at).toLocaleString() : '-'}</td>
                 </tr>
             `).join('');
         }
@@ -736,9 +755,9 @@
         }
 
         const renderers = {
-            blink: renderBlinkTable,
-            users: renderUsersTable,
             audit: renderAuditTable,
+            clients: renderClientsTable,
+            users: renderUsersTable,
             jobs: renderJobsTable,
             payments: renderPaymentsTable,
             contacts: renderContactsTable
@@ -767,7 +786,7 @@
                 state.payments.revenue = data.total_revenue_rupees;
                 document.getElementById('uniqueUsers').textContent = '₹' + data.total_revenue_rupees.toLocaleString();
                 document.getElementById('uniqueUsersCard').querySelector('.stat-label').textContent = 'Total Revenue';
-            } else if (tab === 'blink') {
+            } else if (tab === 'audit') {
                 document.getElementById('uniqueUsersCard').querySelector('.stat-label').textContent = 'Unique Users';
             }
 
@@ -851,7 +870,7 @@
         }, 10000);
 
         // Initial load
-        loadPage('blink', 1);
+        loadPage('audit', 1);
     </script>
 </body>
 

tests/test_integration.py

@@ -25,9 +25,9 @@ async def clear_tables(db_session):
     """Truncate all tables between tests."""
     async with db_session.begin():
         await db_session.execute(text("DELETE FROM users"))
+        await db_session.execute(text("DELETE FROM client_users"))
         await db_session.execute(text("DELETE FROM rate_limits"))
         await db_session.execute(text("DELETE FROM audit_logs"))
-        await db_session.execute(text("DELETE FROM blink_data"))
     await db_session.commit()
 
 
@@ -183,14 +183,15 @@ class TestBlinkFlow:
         assert response.status_code == 200
         data = response.json()
         assert data["status"] == "success"
-        assert data["user_id"] == user_id
+        assert data["client_user_id"] == user_id  # Changed from user_id
         
-        # Verify data stored
+        # Verify data stored in audit_logs
         response = client.get("/api/data")
         assert response.status_code == 200
         items = response.json()["items"]
         assert len(items) > 0
-        assert items[0]["user_id"] == user_id
+        assert items[0]["client_user_id"] == user_id  # Changed from user_id
+        assert items[0]["log_type"] == "client"  # New field
 
 
 class TestRateLimiting: