Improve auth process

services/auth/app/models/users.py

@@ -1,19 +1,18 @@
 # services/auth/app/models/users.py - FIXED VERSION
-# ================================================================
 """
 User models for authentication service - FIXED
+Removed tenant relationships to eliminate cross-service dependencies
 """
 
 from sqlalchemy import Column, String, Boolean, DateTime, Text
 from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.orm import relationship # Import relationship
 from datetime import datetime, timezone
 import uuid
 
 from shared.database.base import Base
 
 class User(Base):
-    """User model - FIXED timezone handling"""
+    """User model - FIXED without cross-service relationships"""
     __tablename__ = "users"
     
     id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
@@ -22,22 +21,19 @@ class User(Base):
     full_name = Column(String(255), nullable=False)
     is_active = Column(Boolean, default=True)
     is_verified = Column(Boolean, default=False)
-    # Removed tenant_id and role from User model
     
-    # FIXED: Use timezone-aware datetime for all datetime fields
+    # Timezone-aware datetime fields
     created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
     updated_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
-    last_login = Column(DateTime(timezone=True))  # FIXED: Now timezone-aware
+    last_login = Column(DateTime(timezone=True))
     
     # Profile fields
     phone = Column(String(20))
     language = Column(String(10), default="es")
     timezone = Column(String(50), default="Europe/Madrid")
 
-    # Relationships
-    # Define the many-to-many relationship through TenantMember
-    tenant_memberships = relationship("TenantMember", back_populates="user", cascade="all, delete-orphan") # Changed back_populates to avoid conflict
-    tenants = relationship("Tenant", secondary="tenant_members", back_populates="users")
+    # REMOVED: All tenant relationships - these are handled by tenant service
+    # No tenant_memberships, tenants relationships
     
     def __repr__(self):
         return f"<User(id={self.id}, email={self.email})>"
@@ -50,33 +46,26 @@ class User(Base):
             "full_name": self.full_name,
             "is_active": self.is_active,
             "is_verified": self.is_verified,
-            # Removed tenant_id and role from to_dict
-            "created_at": self.created_at.isoformat() if self.created_at else None,
-            "last_login": self.last_login.isoformat() if self.last_login else None,
             "phone": self.phone,
             "language": self.language,
-            "timezone": self.timezone
+            "timezone": self.timezone,
+            "created_at": self.created_at.isoformat() if self.created_at else None,
+            "updated_at": self.updated_at.isoformat() if self.updated_at else None,
+            "last_login": self.last_login.isoformat() if self.last_login else None
         }
 
-
-class UserSession(Base):
-    """User session model - FIXED timezone handling"""
-    __tablename__ = "user_sessions"
+class RefreshToken(Base):
+    """Refresh token model for JWT authentication"""
+    __tablename__ = "refresh_tokens"
     
     id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
-    user_id = Column(UUID(as_uuid=True), nullable=False, index=True)
-    refresh_token_hash = Column(String(255), nullable=False)
-    is_active = Column(Boolean, default=True)
-    expires_at = Column(DateTime(timezone=True), nullable=False)  # FIXED: timezone-aware
+    user_id = Column(UUID(as_uuid=True), nullable=False, index=True)  # No FK - cross-service
+    token = Column(String(255), unique=True, nullable=False)
+    expires_at = Column(DateTime(timezone=True), nullable=False)
+    is_revoked = Column(Boolean, default=False)
     
-    # Session metadata
-    ip_address = Column(String(45))
-    user_agent = Column(Text)
-    device_info = Column(Text)
-    
-    # FIXED: Use timezone-aware datetime
     created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
+    revoked_at = Column(DateTime(timezone=True))
     
     def __repr__(self):
-        return f"<UserSession(id={self.id}, user_id={self.user_id})>"
+        return f"<RefreshToken(user_id={self.user_id}, expires_at={self.expires_at})>"