Update app/routes.py

app/routes.py

@@ -4,14 +4,22 @@ from flask import Blueprint, render_template, request, redirect, url_for, flash,
 from .email_utils import send_verification_email
 from .code_generator import generate_ranker_code
 from .utils import rank_resumes_by_similarity
-import requests 
 from werkzeug.utils import secure_filename
 from .ranker import rank_resumes_by_semantic_similarity
 import traceback
 from werkzeug.security import generate_password_hash, check_password_hash
 from .supabase_client import get_user_by_email, create_user
-import os
+import os, requests
 import uuid
+from .supabase_config import SUPABASE_URL, SUPABASE_API_KEY
+
+SUPABASE_URL = os.getenv("SUPABASE_URL")
+SUPABASE_API_KEY = os.getenv("SUPABASE_API_KEY")
+HEADERS = {
+    "apikey": SUPABASE_API_KEY,
+    "Authorization": f"Bearer {SUPABASE_API_KEY}",
+    "Content-Type": "application/json"
+}
 
 
 auth = Blueprint('auth', __name__)
@@ -28,17 +36,30 @@ def embed():
 
 
     
+
+
 @auth.route('/rank-resumes', methods=['POST'])
 def rank_resumes():
     auth_header = request.headers.get('Authorization')
     if not auth_header or not auth_header.startswith('Bearer '):
         return jsonify({"error": "Missing or invalid Authorization header"}), 401
 
-    api_key = auth_header.split(" ")[1]
-    user = User.query.filter_by(api_key=api_key).first()
-    if not user:
+    api_key = auth_header.split(" ")[1].strip()
+
+    #  Supabase: Check user by API key
+    headers = {
+        "apikey": SUPABASE_API_KEY,
+        "Authorization": f"Bearer {SUPABASE_API_KEY}"
+    }
+    user_check = requests.get(
+        f"{SUPABASE_URL}/rest/v1/users?api_key=eq.{api_key}",
+        headers=headers
+    )
+
+    if user_check.status_code != 200 or not user_check.json():
         return jsonify({"error": "Invalid API key"}), 403
 
+    # Proceed to ranking
     resumes = request.files.getlist('resumes')
     job_description = request.form.get('job_description')
 
@@ -55,6 +76,7 @@ def rank_resumes():
 
 
 
+
 auth = Blueprint('auth', __name__)
 
 
@@ -104,21 +126,39 @@ def login():
     if request.method == 'POST':
         email = request.form['email']
         password = request.form['password']
-        user = User.query.filter_by(email=email).first()
 
-        if user and user.check_password(password):
-            if not user.is_verified:
-                flash('Please verify your email before logging in.')
-                return redirect(url_for('auth.login'))
+        # Query Supabase for user by email
+        headers = {
+            "apikey": SUPABASE_API_KEY,
+            "Authorization": f"Bearer {SUPABASE_API_KEY}"
+        }
+        response = requests.get(
+            f"{SUPABASE_URL}/rest/v1/users?email=eq.{email}",
+            headers=headers
+        )
 
-            session['user_id'] = user.id
-            session['username'] = user.username
-            flash('Logged in successfully.')
-            return redirect(url_for('auth.dashboard'))
-        else:
+        if response.status_code != 200 or not response.json():
+            flash('Invalid email or password.')
+            return redirect(url_for('auth.login'))
+
+        user_data = response.json()[0]
+
+        # Check password
+        if not check_password_hash(user_data['password'], password):
             flash('Invalid email or password.')
             return redirect(url_for('auth.login'))
 
+        # Check if user is verified
+        if not user_data.get('is_verified', False):
+            flash('Please verify your email before logging in.')
+            return redirect(url_for('auth.login'))
+
+        # Login successful
+        session['user_id'] = user_data['id']
+        session['username'] = user_data['username']
+        flash('Logged in successfully.')
+        return redirect(url_for('auth.dashboard'))
+
     return render_template('login.html')
 
 @auth.route('/resend-verification', methods=['GET', 'POST'])
@@ -126,43 +166,79 @@ def resend_verification():
     if request.method == 'POST':
         try:
             email = request.form['email']
-            user = User.query.filter_by(email=email).first()
-
-            if user:
-                if user.is_verified:
-                    flash('Your email is already verified. You can log in.')
-                    return redirect(url_for('auth.login'))
-
-                user.generate_verification_token()
-                db.session.commit()
-
-                result = send_verification_email(user.email, user.username, user.verification_token)
-                if result is True:
-                    flash('Verification email resent. Please check your inbox.')
-                else:
-                    print(" Email error from resend:", result)
-                    return jsonify(result), 500  # Shows JSON error in browser
-            else:
+
+            # 🔍 Fetch user by email
+            headers = {
+                "apikey": SUPABASE_API_KEY,
+                "Authorization": f"Bearer {SUPABASE_API_KEY}"
+            }
+            res = requests.get(
+                f"{SUPABASE_URL}/rest/v1/users?email=eq.{email}&select=*",
+                headers=headers
+            )
+
+            if res.status_code != 200 or not res.json():
                 flash('No account found with that email.')
+                return redirect(url_for('auth.login'))
+
+            user = res.json()[0]
+
+            if user.get("is_verified") == True:
+                flash('Your email is already verified. You can log in.')
+                return redirect(url_for('auth.login'))
+
+            # Generate new token
+            new_token = str(uuid.uuid4())
+
+            # Update `email_token` in Supabase
+            patch_res = requests.patch(
+                f"{SUPABASE_URL}/rest/v1/users?email=eq.{email}",
+                headers={**headers, "Content-Type": "application/json"},
+                json={"email_token": new_token}
+            )
+
+            if patch_res.status_code != 204:
+                print("Failed to update token:", patch_res.text)
+                return jsonify({"error": "Failed to update verification token."}), 500
+
+            # Send the verification email
+            result = send_verification_email(user['email'], user['username'], new_token)
+            if result is True:
+                flash('Verification email resent. Please check your inbox.')
+            else:
+                print("Email error from resend:", result)
+                return jsonify(result), 500
 
             return redirect(url_for('auth.login'))
 
         except Exception as e:
-            print(" Resend error:", e)
+            print("Resend error:", e)
             traceback.print_exc()
             return jsonify({"error": str(e)}), 500
 
     return render_template('resend_verification.html')
 
+
 @auth.route('/dashboard')
 def dashboard():
     if 'user_id' not in session:
         flash('Please log in to access the dashboard.')
         return redirect(url_for('auth.login'))
 
-    user = User.query.get(session['user_id'])
+    user_id = session['user_id']
+    res = requests.get(
+        f"{SUPABASE_URL}/rest/v1/users?id=eq.{user_id}&select=*",
+        headers=HEADERS
+    )
+
+    if res.status_code != 200 or not res.json():
+        flash('User not found.')
+        return redirect(url_for('auth.login'))
+
+    user = res.json()[0]
     return render_template('dashboard.html', user=user)
 
+
 @auth.route('/generate-api', methods=['GET', 'POST'])
 def generate_api():
     if 'user_id' not in session:
@@ -181,10 +257,21 @@ def regenerate_api_key():
         flash('Please log in.')
         return redirect(url_for('auth.login'))
 
-    user = User.query.get(session['user_id'])
-    user.generate_api_key()
-    db.session.commit()
-    flash('API key regenerated.')
+    new_api_key = str(uuid.uuid4())
+    user_id = session['user_id']
+
+    patch = requests.patch(
+        f"{SUPABASE_URL}/rest/v1/users?id=eq.{user_id}",
+        headers=HEADERS,
+        json={"api_key": new_api_key}
+    )
+
+    if patch.status_code == 204:
+        flash('API key regenerated.')
+    else:
+        print(" Failed to update API key:", patch.text)
+        flash('Failed to regenerate API key.')
+
     return redirect(url_for('auth.dashboard'))
 
 @auth.route('/logout')
@@ -195,26 +282,37 @@ def logout():
 
 @auth.route('/verify/<token>')
 def verify_email(token):
-    user = User.query.filter_by(verification_token=token).first()
-    if user:
-        user.is_verified = True
-        user.verification_token = None
-        db.session.commit()
+    res = requests.get(
+        f"{SUPABASE_URL}/rest/v1/users?email_token=eq.{token}&select=*",
+        headers=HEADERS
+    )
+
+    if res.status_code != 200 or not res.json():
+        flash('Invalid or expired verification link.')
+        return redirect(url_for('auth.register'))
+
+    user = res.json()[0]
+    email = user["email"]
+
+    patch = requests.patch(
+        f"{SUPABASE_URL}/rest/v1/users?email=eq.{email}",
+        headers=HEADERS,
+        json={"is_verified": True, "email_token": None}
+    )
+
+    if patch.status_code == 204:
         flash('Email verified! You can now log in.')
         return redirect(url_for('auth.login'))
     else:
-        flash('Invalid or expired verification link.')
+        flash('Verification failed.')
         return redirect(url_for('auth.register'))
 
+        
+
 @auth.route('/docs')
 def docs():
     return render_template('docs.html', response=None)
 
-# Inside your auth.py or views.py
-
-from flask import request, render_template, redirect, url_for, flash
-from .models import User
-from .utils import rank_resumes_by_similarity  # import your real function
 
 @auth.route('/try-api', methods=['POST'])
 def try_api():
@@ -226,19 +324,18 @@ def try_api():
         flash("All fields are required.")
         return redirect(url_for('auth.docs'))
 
-    user = User.query.filter_by(api_key=api_key).first()
-    if not user:
+    # Validate API key from Supabase
+    res = requests.get(
+        f"{SUPABASE_URL}/rest/v1/users?api_key=eq.{api_key}&select=id",
+        headers=HEADERS
+    )
+
+    if res.status_code != 200 or not res.json():
         return render_template('docs.html', response=" Invalid API key.")
 
     try:
-        # Use the actual ranking logic
-        results = rank_resumes_by_semantic_similarity(resumes, job_description)
-
-        return render_template(
-            'docs.html',
-            response=results,
-            job_description=job_description
-        )
+        results = rank_resumes_by_similarity(resumes, job_description)
+        return render_template('docs.html', response=results, job_description=job_description)
     except Exception as e:
         return render_template('docs.html', response=f" Error: {str(e)}")
 
@@ -248,9 +345,15 @@ def try_api():
 @auth.route('/ping-db')
 def ping_db():
     try:
-        # Try to count users in the database
-        count = User.query.count()
-        return f" Connected to DB. Users count: {count}"
+        res = requests.get(
+            f"{SUPABASE_URL}/rest/v1/users?select=id",
+            headers=HEADERS
+        )
+        if res.status_code == 200:
+            count = len(res.json())
+            return f" Connected to Supabase. Users count: {count}"
+        else:
+            return f" Failed to fetch users: {res.text}"
     except Exception as e:
         return f" DB Error: {e}"