Update app/auth.py

app/auth.py

@@ -1,23 +1,23 @@
 import os
+import bcrypt
 from datetime import datetime, timedelta, timezone
 from typing import Optional
 
 from fastapi import Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordBearer
 from jose import JWTError, jwt
-from passlib.context import CryptContext
 from cryptography.fernet import Fernet
 from sqlalchemy.orm import Session
 
 from .database import get_db
 from . import models
 
+# ── JWT ────────────────────────────────────────────────────────────────────────
 SECRET_KEY = os.getenv("SECRET_KEY", "CHANGE_ME_super_secret_key_32bytes!")
 ALGORITHM  = "HS256"
 ACCESS_TOKEN_EXPIRE_MINUTES = int(os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES", 60 * 24 * 7))
 
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-
+# ── Fernet encryption for API keys ─────────────────────────────────────────────
 _raw_fernet_key = os.getenv("FERNET_KEY", "")
 if not _raw_fernet_key:
     _raw_fernet_key = Fernet.generate_key().decode()
@@ -28,14 +28,19 @@ fernet = Fernet(_raw_fernet_key.encode() if isinstance(_raw_fernet_key, str) els
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/auth/login")
 
 
-def verify_password(plain: str, hashed: str) -> bool:
-    return pwd_context.verify(plain, hashed)
+# ── Password hashing (pure bcrypt — passlib nahi) ──────────────────────────────
+def hash_password(plain: str) -> str:
+    # bcrypt max 72 bytes — safely truncate
+    secret = plain.encode("utf-8")[:72]
+    return bcrypt.hashpw(secret, bcrypt.gensalt()).decode("utf-8")
 
 
-def hash_password(plain: str) -> str:
-    return pwd_context.hash(plain)
+def verify_password(plain: str, hashed: str) -> bool:
+    secret = plain.encode("utf-8")[:72]
+    return bcrypt.checkpw(secret, hashed.encode("utf-8"))
 
 
+# ── Fernet helpers ─────────────────────────────────────────────────────────────
 def encrypt_api_key(api_key: str) -> str:
     return fernet.encrypt(api_key.encode()).decode()
 
@@ -44,9 +49,12 @@ def decrypt_api_key(encrypted: str) -> str:
     return fernet.decrypt(encrypted.encode()).decode()
 
 
+# ── JWT helpers ────────────────────────────────────────────────────────────────
 def create_access_token(data: dict, expires_delta: Optional[timedelta] = None) -> str:
     to_encode = data.copy()
-    expire = datetime.now(timezone.utc) + (expires_delta or timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES))
+    expire = datetime.now(timezone.utc) + (
+        expires_delta or timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
+    )
     to_encode["exp"] = expire
     return jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
 
@@ -71,4 +79,4 @@ def get_current_user(
     user = db.query(models.User).filter(models.User.username == username).first()
     if not user:
         raise exc
-    return user
+    return user