Update auth.py

auth.py

@@ -16,15 +16,15 @@ from pymongo import MongoClient
 import gridfs
 
 from models import User, UserUpdate, Token, LoginResponse
+from config import CONNECTION_STRING, SECRET_KEY, ACCESS_TOKEN_EXPIRE_MINUTES, REFRESH_TOKEN_EXPIRE_DAYS
 
 load_dotenv()
 
 logger = logging.getLogger("uvicorn")
 logger.setLevel(logging.INFO)
 
-# MongoDB setup for user management
-MONGO_URL = os.getenv("CONNECTION_STRING")
-client = MongoClient(MONGO_URL)
+# Updated MongoDB initialization: now using CONNECTION_STRING from config.py
+client = MongoClient(CONNECTION_STRING)
 db = client.users_database
 users_collection = db.users
 # GridFS instance for storing avatars
@@ -32,7 +32,6 @@ fs = gridfs.GridFS(db, collection="avatars")
 
 # OAuth2 setup
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
-
 router = APIRouter(prefix="/auth", tags=["auth"])
 
 # Password hashing
@@ -57,20 +56,18 @@ def create_token(data: dict, expires_delta: timedelta = None) -> str:
     to_encode = data.copy()
     expire = datetime.utcnow() + (expires_delta or timedelta(minutes=15))
     to_encode.update({"exp": expire})
-    secret_key = os.getenv("SECRET_KEY")
     algorithm = "HS256"
-    return jwt.encode(to_encode, secret_key, algorithm=algorithm)
+    return jwt.encode(to_encode, SECRET_KEY, algorithm=algorithm)
 
 def create_access_token(email: str) -> str:
-    return create_token({"sub": email}, timedelta(minutes=int(os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES", "90"))))
+    return create_token({"sub": email}, timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES))
 
 def create_refresh_token(email: str) -> str:
-    return create_token({"sub": email}, timedelta(days=int(os.getenv("REFRESH_TOKEN_EXPIRE_DAYS", "7"))))
+    return create_token({"sub": email}, timedelta(days=REFRESH_TOKEN_EXPIRE_DAYS))
 
 def get_current_user(token: str = Depends(oauth2_scheme)) -> dict:
-    secret_key = os.getenv("SECRET_KEY")
     try:
-        payload = jwt.decode(token, secret_key, algorithms=["HS256"])
+        payload = jwt.decode(token, SECRET_KEY, algorithms=["HS256"])
         email: str = payload.get("sub")
         if not email:
             raise HTTPException(status_code=401, detail="Invalid credentials")