Refactor code for improved readability and consistency

- Cleaned up whitespace and formatting across multiple files for better readability.
This commit is contained in:
JSC
2025-07-02 10:37:48 +02:00
parent e63c7a0767
commit 171dbb9b63
19 changed files with 361 additions and 260 deletions

View File

@@ -12,14 +12,14 @@ def get_user_from_jwt() -> dict[str, Any] | None:
try:
# Try to verify JWT token in request - this sets up the context
verify_jwt_in_request()
current_user_id = get_jwt_identity()
if not current_user_id:
return None
# Query database for user data instead of using JWT claims
from app.models.user import User
user = User.query.get(int(current_user_id))
if not user or not user.is_active:
return None
@@ -70,7 +70,7 @@ def get_user_from_api_token() -> dict[str, Any] | None:
providers.append("password")
if user.api_token:
providers.append("api_token")
return {
"id": str(user.id),
"email": user.email,
@@ -148,22 +148,23 @@ def require_role(required_role: str):
def require_credits(credits_needed: int):
"""Decorator to require and deduct credits for routes."""
def decorator(f):
@wraps(f)
def wrapper(*args, **kwargs):
from app.models.user import User
from app.database import db
# First check authentication
user_data = get_current_user()
if not user_data:
return jsonify({"error": "Authentication required"}), 401
# Get the actual user from database to check/update credits
user = User.query.get(int(user_data["id"]))
if not user or not user.is_active:
return jsonify({"error": "User not found or inactive"}), 401
# Check if user has enough credits
if user.credits < credits_needed:
return (
@@ -174,15 +175,16 @@ def require_credits(credits_needed: int):
),
402, # Payment Required status code
)
# Deduct credits
user.credits -= credits_needed
db.session.commit()
# Execute the function
result = f(*args, **kwargs)
return result
return wrapper
return decorator