refactor

app.py

@@ -11,9 +11,9 @@ from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 
-from database import init_db
+from core.database import init_db
 from routers import auth, blink, general
-from drive_service import DriveService
+from services.drive_service import DriveService
 
 # Configure logging
 logging.basicConfig(

auth_utils.py

@@ -1,89 +0,0 @@
-import secrets
-import smtplib
-import ssl
-from email.mime.text import MIMEText
-from email.mime.multipart import MIMEMultipart
-import bcrypt
-import logging
-import os
-
-# Configure logging
-logger = logging.getLogger(__name__)
-
-# Email configuration
-# Email configuration
-SMTP_SERVER = os.getenv("SMTP_SERVER", "127.0.0.1")
-SMTP_PORT = int(os.getenv("SMTP_PORT", "1025"))
-# Prioritize EMAIL_ID and EMAIL_PASSWORD if available
-SMTP_USERNAME = os.getenv("EMAIL_ID") or os.getenv("SMTP_USERNAME", "sender@domain.com")
-SMTP_PASSWORD = os.getenv("EMAIL_PASSWORD") or os.getenv("SMTP_PASSWORD", "yourpassword")
-
-# Auto-configure for Gmail if using defaults and gmail address
-if SMTP_SERVER == "127.0.0.1" and "gmail.com" in SMTP_USERNAME:
-    SMTP_SERVER = "smtp.gmail.com"
-    SMTP_PORT = 465
-
-SMTP_SENDER = os.getenv("SMTP_SENDER", SMTP_USERNAME)
-
-from gmail_service import GmailService
-
-# Initialize Gmail Service
-gmail_service = GmailService()
-
-def verify_password(plain_password: str, hashed_password: str) -> bool:
-    """
-    Verify a password against a hash.
-    """
-    if isinstance(hashed_password, str):
-        hashed_password = hashed_password.encode('utf-8')
-    return bcrypt.checkpw(plain_password.encode('utf-8'), hashed_password)
-
-def get_password_hash(password: str) -> str:
-    """
-    Hash a password using bcrypt.
-    """
-    # rounds=12 as per spec
-    salt = bcrypt.gensalt(rounds=12)
-    hashed = bcrypt.hashpw(password.encode('utf-8'), salt)
-    return hashed.decode('utf-8')
-
-def generate_secret_key() -> str:
-    """
-    Generate a secure secret key starting with 'sk_'.
-    """
-    return "sk_" + secrets.token_urlsafe(32)
-
-def send_email(to_email: str, subject: str, body: str):
-    """
-    Send an email using Gmail API.
-    This function is blocking and should be run in a background task.
-    """
-    # Try Gmail API first
-    if gmail_service.authenticate():
-        return gmail_service.send_email(to_email, subject, body)
-    
-    logger.warning("Gmail API credentials not found or invalid. Falling back to SMTP (may fail on some platforms).")
-    
-    # Fallback to SMTP (Original Implementation)
-    try:
-        message = MIMEMultipart()
-        message["From"] = SMTP_SENDER
-        message["To"] = to_email
-        message["Subject"] = subject
-        
-        message.attach(MIMEText(body, "plain"))
-        
-        # Create a secure SSL context
-        context = ssl.create_default_context()
-        context.check_hostname = False
-        context.verify_mode = ssl.CERT_NONE
-
-        with smtplib.SMTP_SSL(SMTP_SERVER, SMTP_PORT, context=context) as server:
-            server.login(SMTP_USERNAME, SMTP_PASSWORD)
-            server.sendmail(SMTP_SENDER, to_email, message.as_string())
-            
-        logger.info(f"Email sent successfully to {to_email} via SMTP")
-        return True
-    except Exception as e:
-        logger.error(f"Failed to send email to {to_email}: {e}")
-        return False

models.py → core/models.py

@@ -1,9 +1,9 @@
 """
-SQLAlchemy models for the URL Blink application.
+SQLAlchemy models for the APIGateway application.
 """
 from sqlalchemy import Column, Integer, String, Text, DateTime, JSON, Boolean
 from sqlalchemy.sql import func
-from database import Base
+from core.database import Base
 
 
 class BlinkData(Base):

core/security.py

@@ -0,0 +1,25 @@
+import secrets
+import bcrypt
+
+def verify_password(plain_password: str, hashed_password: str) -> bool:
+    """
+    Verify a password against a hash.
+    """
+    if isinstance(hashed_password, str):
+        hashed_password = hashed_password.encode('utf-8')
+    return bcrypt.checkpw(plain_password.encode('utf-8'), hashed_password)
+
+def get_password_hash(password: str) -> str:
+    """
+    Hash a password using bcrypt.
+    """
+    # rounds=12 as per spec
+    salt = bcrypt.gensalt(rounds=12)
+    hashed = bcrypt.hashpw(password.encode('utf-8'), salt)
+    return hashed.decode('utf-8')
+
+def generate_secret_key() -> str:
+    """
+    Generate a secure secret key starting with 'sk_'.
+    """
+    return "sk_" + secrets.token_urlsafe(32)

dependencies.py

@@ -7,9 +7,9 @@ from fastapi import Request, Depends, HTTPException, status
 from sqlalchemy import select, and_
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from database import get_db
-from models import User, RateLimit
-from auth_utils import verify_password
+from core.database import get_db
+from core.models import User, RateLimit
+from core.security import verify_password
 
 logger = logging.getLogger(__name__)
 

routers/auth.py

@@ -5,12 +5,13 @@ from sqlalchemy import select
 from datetime import datetime
 import uuid
 
-from database import get_db
-from models import User, AuditLog
-from schemas import CheckRegistrationRequest, RegisterRequest, ValidateRequest, ResetRequest
-from auth_utils import get_password_hash, verify_password, generate_secret_key, send_email
+from core.database import get_db
+from core.models import User, AuditLog
+from core.schemas import CheckRegistrationRequest, RegisterRequest, ValidateRequest, ResetRequest
+from core.security import get_password_hash, verify_password, generate_secret_key
+from services.email_service import send_email
 from dependencies import check_rate_limit
-from drive_service import DriveService
+from services.drive_service import DriveService
 
 router = APIRouter(prefix="/auth", tags=["auth"])
 drive_service = DriveService()

routers/blink.py

@@ -5,9 +5,9 @@ from sqlalchemy import select, func
 import ipaddress
 import logging
 
-from database import get_db
-from models import BlinkData
-from encryption import decrypt_multiple_blocks
+from core.database import get_db
+from core.models import BlinkData
+from services.encryption_service import decrypt_multiple_blocks
 from dependencies import get_geolocation
 
 logger = logging.getLogger(__name__)

gmail_service.py → services/email_service.py

@@ -1,16 +1,31 @@
 import os
 import base64
 import logging
+import smtplib
+import ssl
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
-from google_auth_oauthlib.flow import InstalledAppFlow
 from googleapiclient.discovery import build
 from googleapiclient.errors import HttpError
 
 logger = logging.getLogger(__name__)
 
+# Email configuration
+SMTP_SERVER = os.getenv("SMTP_SERVER", "127.0.0.1")
+SMTP_PORT = int(os.getenv("SMTP_PORT", "1025"))
+# Prioritize EMAIL_ID and EMAIL_PASSWORD if available
+SMTP_USERNAME = os.getenv("EMAIL_ID") or os.getenv("SMTP_USERNAME", "sender@domain.com")
+SMTP_PASSWORD = os.getenv("EMAIL_PASSWORD") or os.getenv("SMTP_PASSWORD", "yourpassword")
+
+# Auto-configure for Gmail if using defaults and gmail address
+if SMTP_SERVER == "127.0.0.1" and "gmail.com" in SMTP_USERNAME:
+    SMTP_SERVER = "smtp.gmail.com"
+    SMTP_PORT = 465
+
+SMTP_SENDER = os.getenv("SMTP_SENDER", SMTP_USERNAME)
+
 class GmailService:
     SCOPES = ['https://www.googleapis.com/auth/gmail.send']
 
@@ -25,7 +40,7 @@ class GmailService:
     def authenticate(self):
         """Authenticate using the refresh token."""
         if not all([self.client_id, self.client_secret, self.refresh_token]):
-            logger.error("Missing Google API credentials (CLIENT_ID, CLIENT_SECRET, REFRESH_TOKEN)")
+            # logger.error("Missing Google API credentials (CLIENT_ID, CLIENT_SECRET, REFRESH_TOKEN)")
             return False
 
         try:
@@ -60,10 +75,10 @@ class GmailService:
             message['to'] = to_email
             # Format sender with display name
             sender_name = "AnimateImage"
-            if "<" not in self.sender_email:
+            if self.sender_email and "<" not in self.sender_email:
                 message['from'] = f"{sender_name} <{self.sender_email}>"
             else:
-                message['from'] = self.sender_email
+                message['from'] = self.sender_email or "unknown@example.com"
             message['subject'] = subject
             message.attach(MIMEText(body, 'plain'))
 
@@ -80,3 +95,42 @@ class GmailService:
         except Exception as e:
             logger.error(f"Unexpected error sending email: {e}")
             return False
+
+# Initialize global instance
+gmail_service = GmailService()
+
+def send_email(to_email: str, subject: str, body: str):
+    """
+    Send an email using Gmail API with SMTP fallback.
+    This function is blocking and should be run in a background task.
+    """
+    # Try Gmail API first
+    if gmail_service.authenticate():
+        if gmail_service.send_email(to_email, subject, body):
+            return True
+    
+    logger.warning("Gmail API credentials not found or invalid. Falling back to SMTP.")
+    
+    # Fallback to SMTP (Original Implementation)
+    try:
+        message = MIMEMultipart()
+        message["From"] = SMTP_SENDER
+        message["To"] = to_email
+        message["Subject"] = subject
+        
+        message.attach(MIMEText(body, "plain"))
+        
+        # Create a secure SSL context
+        context = ssl.create_default_context()
+        context.check_hostname = False
+        context.verify_mode = ssl.CERT_NONE
+
+        with smtplib.SMTP_SSL(SMTP_SERVER, SMTP_PORT, context=context) as server:
+            server.login(SMTP_USERNAME, SMTP_PASSWORD)
+            server.sendmail(SMTP_SENDER, to_email, message.as_string())
+            
+        logger.info(f"Email sent successfully to {to_email} via SMTP")
+        return True
+    except Exception as e:
+        logger.error(f"Failed to send email to {to_email}: {e}")
+        return False

tests/conftest.py

@@ -8,7 +8,7 @@ from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker, Asyn
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 
 from app import app
-from database import get_db, Base
+from core.database import get_db, Base
 
 # Use a file-based SQLite database for testing to ensure persistence
 TEST_DATABASE_URL = "sqlite+aiosqlite:///./test_blink_data.db"

test_email_env.py → tests/debug_email_env.py

@@ -5,7 +5,7 @@ from dotenv import load_dotenv
 # Load environment variables from .env file immediately
 load_dotenv()
 
-from auth_utils import send_email
+from services.email_service import send_email
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
@@ -20,7 +20,7 @@ def test_email_sending():
     logger.info(f"Testing email sending to {email_id}...")
     
     # Debug config
-    from auth_utils import SMTP_SERVER, SMTP_PORT
+    from services.email_service import SMTP_SERVER, SMTP_PORT
     logger.info(f"Using SMTP Server: {SMTP_SERVER}:{SMTP_PORT}")
 
     subject = "Test Email from API Gateway"

test_gmail_service.py → tests/test_gmail_service.py

@@ -1,11 +1,11 @@
 import unittest
 from unittest.mock import MagicMock, patch
-from gmail_service import GmailService
+from services.email_service import GmailService
 
 class TestGmailService(unittest.TestCase):
 
-    @patch('gmail_service.build')
-    @patch('gmail_service.Credentials')
+    @patch('services.email_service.build')
+    @patch('services.email_service.Credentials')
     def test_send_email_success(self, mock_credentials, mock_build):
         # Mock the service and its methods
         mock_service = MagicMock()

tests/test_integration.py

@@ -27,7 +27,7 @@ async def clear_tables(db_session):
         await db_session.execute(text("DELETE FROM blink_data"))
     await db_session.commit()
 
-@patch("routers.auth.send_email")
+@patch("services.email_service.send_email")
 def test_credit_system_flow(mock_send_email, client):
     mock_send_email.return_value = True
     
@@ -79,7 +79,7 @@ def test_blink_flow(client):
     assert len(items) > 0
     assert items[0]["user_id"] == user_id
 
-@patch("routers.auth.send_email")
+@patch("services.email_service.send_email")
 def test_rate_limiting(mock_send_email, client):
     # 10 requests should succeed
     for _ in range(10):