Merge branch 'main' into feature/password-validation-790

Author: aarushii25

.gitignore

@@ -6,10 +6,10 @@ mood_analysis/mood_cache.json
 *.cache
 
 # Environment variables
-/.env
-/.env.local
-/.env.production
-/.env.development
+*/.env
+*/.env.local
+*/.env.production
+*/.env.development
 
 # Sensitive local files
 *.token

Dockerfile

@@ -4,7 +4,7 @@ FROM python:3.11-slim
 # Set environment variables
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
-ENV FLASK_APP=app.py
+ENV FLASK_APP=backend/app.py
 ENV FLASK_HOST=0.0.0.0
 ENV PORT=5000
 
@@ -28,4 +28,4 @@ COPY . .
 EXPOSE 5000
 
 # Run the application
-CMD ["python", "app.py"]
+CMD ["python", "backend/app.py"]

Dockerfile.frontend

@@ -0,0 +1,5 @@
+FROM nginx:alpine
+COPY ./nginx.conf /etc/nginx/conf.d/default.conf
+COPY ./frontend /usr/share/nginx/html
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]

README.md

@@ -103,7 +103,48 @@ It feels like:
 | Storage | LocalStorage |
 
 ---
+## 🚀 Backend Deployment & BACKEND_URL Setup
 
+> ⚠️ The frontend is deployed on Netlify, but the Flask backend is **not yet deployed**.
+> Google Sign-In and all AI features require the backend to be running.
+
+### Why is this needed?
+When a user clicks "Sign in with Google", the browser sends a request to `/api/v1/auth/google`.
+Netlify needs to know where to forward that request, that's what `BACKEND_URL` is for.
+Without it, Netlify has no rule for `/api/v1/*` and shows a 404 error.
+
+### Step 1 — Deploy the Flask backend
+
+You can deploy the backend (located in the `/backend` folder) to either:
+
+| Platform | Free Tier | Docs |
+|---|---|---|
+| [Render](https://render.com) | ✅ Yes | [Render Python Docs](https://render.com/docs/deploy-flask) |
+| [Railway](https://railway.app) | ✅ Yes | [Railway Docs](https://docs.railway.app) |
+
+After deploying, you'll get a public URL like:
+https://your-app.onrender.com
+
+### Step 2 — Set BACKEND_URL in Netlify
+
+1. Go to [Netlify Dashboard](https://app.netlify.com)
+2. Open your site → **Site Configuration → Environment Variables**
+3. Click **Add a variable**
+4. Set:
+   - **Key:** `BACKEND_URL`
+   - **Value:** `https://your-app.onrender.com` *(no trailing slash)*
+5. Click **Save**
+
+### Step 3 — Redeploy the Netlify site
+
+After setting the variable:
+1. Go to **Deploys** tab in your Netlify dashboard
+2. Click **Trigger deploy → Deploy site**
+3. This reruns `build_netlify.py`, which picks up `BACKEND_URL` and adds the proxy rule to `_redirects`
+
+After this, "Sign in with Google" will correctly reach the Flask backend. ✅
+
+---
 ## 🧠 System Architecture
 
 ```mermaid

backend/app.py

@@ -1,6 +1,11 @@
 # Flask backend application with GoodReads mood analysis integration
 # Initialize Flask app, configure CORS, and setup mood analysis endpoints
 
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
 from flask import Flask, request, jsonify, redirect, url_for
 from flask_cors import CORS
 from flask_jwt_extended import (
@@ -25,11 +30,8 @@
 
 import logging
 from datetime import datetime, timedelta, timezone
-import sys
-import os
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from backend.sanitizer import sanitize_payload
-from backend.reader_identity.routes import reader_identity_bp
+from sanitizer import sanitize_payload
+from reader_identity.routes import reader_identity_bp
 
 # Load environment variables from config directory based on APP_ENV
 env = os.getenv('APP_ENV', 'development')
@@ -79,20 +81,27 @@
     validate_jwt_secret,
     is_production_mode
 )
-<<<<<<< HEAD
 
-=======
-from middleware import require_strong_password  # Issue #790
+
+
+
 from password_reset_service import (
     FORGOT_PASSWORD_MESSAGE,
     request_password_reset,
     reset_password_with_token,
 )
->>>>>>> 040197406bf60becce17486e4b203a59814834f0
+
+
+
+from email_service import (
+    build_password_reset_url,
+    is_email_configured,
+    send_password_reset_email,
+)
+
 from collections import defaultdict, deque
 from math import ceil
 from time import time
-from urllib.parse import quote
 from error_responses import (
     ErrorCodes, error_response, success_response,
     validation_error, missing_fields_error, invalid_json_error,
@@ -778,13 +787,55 @@ def _validate_jwt_secret_startup():
 
 _validate_jwt_secret_startup()
 
-@app.route('/api/v1/config', methods=['GET'])
-def get_config():
-    """Serve public configuration values like Google Books API Key."""
-    return jsonify({
-        "google_books_key": os.getenv('GOOGLE_BOOKS_API_KEY', ''),
-        "google_books_key_secondary": os.getenv('GOOGLE_BOOKS_API_KEY_SECONDARY', '')
-    })
+
+@app.route('/api/v1/content/live-shelves', methods=['GET'])
+def get_live_shelves():
+    """Return the configuration for live discovery shelves on the frontend."""
+    discovery_shelves = [
+        {
+            "type": "query",
+            "query": "subject:mystery atmosphere",
+            "elementId": "row-rainy",
+            "title": "Rainy Evening Reads",
+            "subtitle": "Mystery & Melancholy",
+            "icon": "fa-cloud-rain"
+        },
+        {
+            "type": "query",
+            "query": "authors:arundhati roy|subject:india",
+            "elementId": "row-indian",
+            "title": "Indian Authors",
+            "subtitle": "Subcontinent Voices",
+            "icon": "fa-feather"
+        },
+        {
+            "type": "query",
+            "query": "subject:classic fiction",
+            "elementId": "row-classics",
+            "title": "Forgotten Classics",
+            "subtitle": "Timeless & Dust-free",
+            "icon": "fa-hourglass"
+        },
+        {
+            "type": "query",
+            "query": "subject:gothic fiction subject:dark academia subject:campus",
+            "elementId": "row-dark-academia",
+            "title": "Dark Academia",
+            "subtitle": "Gothic, cerebral, candlelit",
+            "icon": "fa-feather-pointed",
+            "vibeDescription": "gothic, intellectual, melancholic, and candlelit",
+            "fallbackQuery": "subject:gothic fiction subject:campus"
+        },
+        {
+            "type": "query",
+            "query": "subject:fiction",
+            "elementId": "row-fiction",
+            "title": "General Fiction",
+            "subtitle": "Stories for everyone",
+            "icon": "fa-book-open"
+        }
+    ]
+    return success_response(data={"shelves": discovery_shelves})
 
 # =====================================================================
 # ENDPOINT: CSRF Token Retrieval
@@ -1261,26 +1312,6 @@ def handle_chat(validated_data):
         logger.error(f"Unexpected error in handle_chat: {type(e).__name__}: {e}", exc_info=True)
         return handle_exception(e, "handle_chat")
 
-@app.route('/api/v1/health', methods=['GET'])
-def health_check():
-    """Health check endpoint with cache statistics."""
-    cache_stats = cache_service.get_stats()
-    
-    return jsonify({
-        "status": "healthy",
-        "service": "BiblioDrift AI Service",
-        "version": "2.0.0",
-        "features": {
-            "mood_analysis_available": MOOD_ANALYSIS_AVAILABLE,
-            "llm_service_available": llm_service.is_available(),
-            "openai_configured": llm_service.openai_client is not None,
-            "groq_configured": llm_service.groq_client is not None,
-            "gemini_configured": llm_service.gemini_client is not None,
-            "preferred_llm": llm_service.preferred_llm,
-            "caching_enabled": cache_stats.get('cache_type') != 'null'
-        },
-        "cache": cache_stats
-    })
 
 
 # =========================================================================
@@ -1688,15 +1719,15 @@ def sync_library(validated_data):
 # immediately responds with an active session ready to go.
 # =========================================================================
 @app.route('/api/v1/register', methods=['POST'])
-<<<<<<< HEAD
-@limiter.limit("5 per minute")
+
+
 
 def register():
-=======
+
 @limiter.limit("5 per 10 seconds")
 @validate_schema(RegisterRequest)
 def register(validated_data):
->>>>>>> 040197406bf60becce17486e4b203a59814834f0
+
     """Register a new user and return JWT token."""
     try:
 
@@ -2006,20 +2037,36 @@ def forgot_password(validated_data):
             logger.error("forgot-password database error: %s", e, exc_info=True)
 
         response_data = {"message": FORGOT_PASSWORD_MESSAGE}
-
-        if plain_token and app_config.is_development():
-            frontend_base = os.getenv(
-                'FRONTEND_ORIGIN',
-                'http://127.0.0.1:5500',
-            ).rstrip('/')
-            response_data["reset_url"] = (
-                f"{frontend_base}/pages/auth.html?token={quote(plain_token)}"
-            )
-            logger.info(
-                "Dev password reset link for %s: %s",
-                validated_data.email,
-                response_data["reset_url"],
-            )
+        frontend_base = os.getenv('FRONTEND_ORIGIN', 'http://127.0.0.1:5500').rstrip('/')
+        email_config = app_config.email
+
+        if plain_token:
+            reset_url = build_password_reset_url(plain_token, frontend_base)
+            if is_email_configured(email_config):
+                send_result = send_password_reset_email(
+                    validated_data.email,
+                    reset_url,
+                    email_config,
+                )
+                if not send_result.ok:
+                    logger.error(
+                        "Password reset email not sent for %s: %s",
+                        validated_data.email,
+                        send_result.detail,
+                    )
+            elif app_config.is_development():
+                response_data["reset_url"] = reset_url
+                logger.info(
+                    "Dev password reset link for %s (email not configured): %s",
+                    validated_data.email,
+                    reset_url,
+                )
+            elif app_config.is_production():
+                logger.warning(
+                    "Password reset token created but EMAIL_* is not configured; "
+                    "user %s will not receive mail.",
+                    validated_data.email,
+                )
 
         return success_response(data=response_data)
     except Exception as e:

backend/config.py

@@ -170,18 +170,28 @@ def from_env(cls) -> 'GoogleOAuthConfig':
 
 @dataclass
 class EmailConfig:
-    """Email service configuration (e.g., SendGrid, Mailgun)."""
+    """Email service configuration (SendGrid API or SMTP)."""
     api_key: Optional[str]
     from_email: Optional[str]
     service_provider: str = 'sendgrid'
-    
+    smtp_host: Optional[str] = None
+    smtp_port: int = 587
+    smtp_username: Optional[str] = None
+    smtp_password: Optional[str] = None
+    smtp_use_tls: bool = True
+
     @classmethod
     def from_env(cls) -> 'EmailConfig':
         """Create email config from environment variables."""
         return cls(
             api_key=os.getenv('EMAIL_API_KEY'),
             from_email=os.getenv('EMAIL_FROM'),
-            service_provider=os.getenv('EMAIL_SERVICE', 'sendgrid')
+            service_provider=os.getenv('EMAIL_SERVICE', 'sendgrid'),
+            smtp_host=os.getenv('EMAIL_SMTP_HOST'),
+            smtp_port=int(os.getenv('EMAIL_SMTP_PORT', '587')),
+            smtp_username=os.getenv('EMAIL_SMTP_USER'),
+            smtp_password=os.getenv('EMAIL_SMTP_PASSWORD'),
+            smtp_use_tls=os.getenv('EMAIL_SMTP_USE_TLS', 'true').lower() == 'true',
         )