Fixed major bugs that didn't allow things

Author: DefinetlyNotAI

api/admin.py

@@ -644,8 +644,6 @@ def api_admin_sql():
         except Exception as e:
             print(f"Error executing SQL query: {e}")
             return jsonify({"error": f"Query failed: {str(e)}"}), 500
-        finally:
-            sync_admin_wallet()
 
     @app.route('/api/admin/delete-record', methods=['POST'])
     @admin_required

api/get.py

@@ -3,7 +3,6 @@
 from bank_lib.database import execute_query_dict, check_db_connection
 from bank_lib.decorator import admin_required, login_required
 from bank_lib.get_data import get_settings, get_total_currency, get_server_health, get_user_by_wallet_name
-from bank_lib.validate import validate_wallet_name
 
 
 def register_get_api_routes(app):
@@ -17,9 +16,6 @@ def api_server_health():
     def api_get_wallet():
         wallet_name = request.args.get('wallet_name')
 
-        if not validate_wallet_name(wallet_name):
-            return jsonify({"error": "Invalid wallet name format"}), 400
-
         # Get user
         user = get_user_by_wallet_name(wallet_name)
 

api/requests.py

@@ -9,7 +9,6 @@
 from bank_lib.form_validators import ResetPasswordForm
 from bank_lib.get_data import get_settings, get_client_ip, get_user_by_wallet_name
 from bank_lib.log_module import create_log
-from bank_lib.validate import validate_wallet_name
 
 
 def register_request_api_routes(app):
@@ -22,9 +21,6 @@ def api_request_wallet():
         reason = data.get('reason')
         FORBIDDEN_REASON_CHARS = re.compile(r"[|\'\"`;]")
 
-        if not validate_wallet_name(wallet_name):
-            return jsonify({"error": "Wallet name can only contain letters, numbers, and underscores"}), 400
-
         if not password or len(password) < 8:
             return jsonify({"error": "Password must be at least 8 characters long"}), 400
 

api/transfer.py

@@ -1,131 +1,16 @@
 import uuid
 
-from flask import jsonify, request, session
+from flask import jsonify, request
 
 from bank_lib.database import execute_query
-from bank_lib.decorator import admin_required, login_required
-from bank_lib.form_validators import TransferForm, BankTransferForm
+from bank_lib.decorator import admin_required
+from bank_lib.form_validators import BankTransferForm
 from bank_lib.get_data import get_settings, get_client_ip, get_total_currency, get_user_by_wallet_name, \
     update_admin_balance
 from bank_lib.log_module import create_log
 
 
 def register_transfer_api_routes(app):
-    @app.route('/api/transfer/toWallet', methods=['POST'])
-    @login_required
-    def api_transfer_to_wallet():
-        data = request.json
-        form = TransferForm(data=data)
-
-        if not form.validate():
-            errors = {field: errors[0] for field, errors in form.errors.items()}
-            return jsonify(
-                {"error": errors.get(next(iter(errors), "error"), "Validation failed"), "details": errors}), 400
-
-        from_wallet = session['wallet_name']
-        to_wallet = data.get('to_wallet')
-        category = data.get('category')
-        reason = data.get('reason')
-        amount = float(data.get('amount', 0))
-
-        # Additional validation
-        if from_wallet == to_wallet:
-            return jsonify({"error": "Cannot transfer to your own wallet"}), 400
-
-        # Get users
-        from_user = get_user_by_wallet_name(from_wallet)
-        to_user = get_user_by_wallet_name(to_wallet)
-
-        if not to_user:
-            return jsonify({"error": "Recipient wallet not found"}), 404
-
-        if from_user['is_frozen']:
-            return jsonify({"error": "Your wallet is frozen"}), 403
-
-        if to_user['is_frozen']:
-            return jsonify({"error": "Recipient wallet is frozen"}), 403
-
-        settings = get_settings()
-
-        if from_user['current_currency'] < amount and not settings['allow_debts']:
-            return jsonify({"error": "Insufficient funds and debts are not allowed"}), 400
-
-        # For Penalty or Invoice categories, create a request instead of direct transfer
-        if category in ["Penalty", "Invoice"]:
-            try:
-                ticket_uuid = str(uuid.uuid4())
-
-                # Create request record
-                execute_query(
-                    """
-                    INSERT INTO requests
-                    (request_type, ticket_uuid, wallet_name, category, status, reason, ip_address)
-                    VALUES (%s, %s, %s, %s, %s, %s, %s)
-                    """,
-                    ("Transfer", ticket_uuid, from_wallet, category, "Pending", reason, get_client_ip()),
-                    commit=True
-                )
-
-                create_log("Transfer Request",
-                           f"{from_wallet} requested a transfer of {amount} {settings['currency_name']} to {to_wallet} for {category}: {reason}",
-                           "Private")
-
-                return jsonify({
-                    "message": "Transfer request submitted for approval",
-                    "transfer_ticket_uuid": ticket_uuid
-                })
-            except Exception as e:
-                print(f"Error creating transfer request: {e}")
-                return jsonify({"error": f"Transfer request failed: {str(e)}"}), 500
-        else:
-            try:
-                # Update balances
-                execute_query(
-                    "UPDATE users SET current_currency = current_currency - %s WHERE wallet_name = %s",
-                    (amount, from_wallet),
-                    commit=True
-                )
-
-                execute_query(
-                    "UPDATE users SET current_currency = current_currency + %s WHERE wallet_name = %s",
-                    (amount, to_wallet),
-                    commit=True
-                )
-
-                # Update admin balance
-                update_admin_balance()
-
-                ticket_uuid = str(uuid.uuid4())
-
-                # Create request record
-                execute_query(
-                    """
-                    INSERT INTO requests
-                    (request_type, ticket_uuid, wallet_name, category, status, reason, ip_address)
-                    VALUES (%s, %s, %s, %s, %s, %s, %s)
-                    """,
-                    ("Transfer", ticket_uuid, from_wallet, category, "Complete", reason, get_client_ip()),
-                    commit=True
-                )
-
-                create_log("Transfer",
-                           f"{from_wallet} transferred {amount} {settings['currency_name']} to {to_wallet} for {category}: {reason} (transfer ticket uuid: {ticket_uuid})",
-                           "Private")
-
-                # Add public log for large transfers
-                if amount >= 100:
-                    create_log("Large Transfer",
-                               f"User {from_wallet} transferred {amount} {settings['currency_name']} to {to_wallet}",
-                               "Global")
-
-                return jsonify({
-                    "message": "Transfer completed successfully",
-                    "transfer_ticket_uuid": ticket_uuid
-                })
-            except Exception as e:
-                print(f"Error during transfer: {e}")
-                return jsonify({"error": f"Transfer failed: {str(e)}"}), 500
-
     # noinspection DuplicatedCode
     @app.route('/api/transfer/bank', methods=['POST'])
     @admin_required
@@ -145,7 +30,6 @@ def api_transfer_bank():
 
         # Get user
         user = get_user_by_wallet_name(wallet_name)
-
         if not user:
             return jsonify({"error": "Wallet not found"}), 404
 

app.py

@@ -11,7 +11,6 @@
 from flask_wtf.csrf import CSRFError
 from werkzeug.exceptions import BadRequest, HTTPException
 from werkzeug.security import check_password_hash
-from waitress import serve
 
 from api import register_request_api_routes, register_get_api_routes, \
     register_setup_api_routes, register_transfer_api_routes, register_admin_api_routes
@@ -26,7 +25,6 @@
 from bank_lib.get_data import get_settings, get_total_currency, get_user_by_wallet_name
 from bank_lib.global_vars import DB_POOL
 from bank_lib.log_module import create_log, rotate_logs
-from bank_lib.validate import validate_wallet_name
 
 # Set up logging once in your app setup code (if not already done)
 logging.basicConfig(
@@ -38,7 +36,7 @@
 )
 
 # Configuration
-secret_key = os.environ.get("SECRET_KEY", None)
+secret_key = os.environ.get("SECRET_KEY", "yay")
 if secret_key is None:
     secret_key = secrets.token_hex(32)
     logging.warning("SECRET_KEY environment variable not set - Using random value")
@@ -186,14 +184,6 @@ def login():
         wallet_name = request.form.get('wallet_name')
         password = request.form.get('password')
 
-        # Input validation
-        if not validate_wallet_name(wallet_name):
-            return render_template('login.html', error="Invalid wallet name format",
-                                   settings=settings,
-                                   is_admin='admin' in session and session['admin'],
-                                   is_logged_in='wallet_name' in session, loginForm=loginForm,
-                                   requestWalletForm=requestWalletForm)
-
         user = get_user_by_wallet_name(wallet_name)
 
         if user and check_password_hash(user['password'], password):
@@ -237,9 +227,6 @@ def logout():
 def wallet_page(wallet_name):
     settings = get_settings()
 
-    if not validate_wallet_name(wallet_name):
-        return render_template('error.html', message="Invalid wallet name format")
-
     user = get_user_by_wallet_name(wallet_name)
 
     if not user:
@@ -381,9 +368,6 @@ def admin_wallets_page():
 def admin_wallet_detail_page(wallet_name):
     settings = get_settings()
 
-    if not validate_wallet_name(wallet_name):
-        return render_template('error.html', message="Invalid wallet name format")
-
     user = get_user_by_wallet_name(wallet_name)
 
     if not user:
@@ -514,4 +498,5 @@ def serve_static(filename):
         logging.warning("Database pool is not initialized due to the error.")
     finally:
         logging.info("Server Started!")
-        serve(app, host='0.0.0.0', port=5000)
+        app.run(debug=True)
+        # serve(app, host='0.0.0.0', port=5000)

bank_lib/__init__.py

@@ -6,4 +6,4 @@
     update_admin_balance
 from .global_vars import DB_POOL
 from .log_module import create_log, rotate_logs
-from .validate import validate_wallet_name, validate_uuid, validate_amount
+from .validate import validate_uuid, validate_amount

bank_lib/form_validators.py

@@ -24,7 +24,6 @@ class WalletForm(FlaskForm):
     username = StringField('Username', [
         Length(min=3, max=100, message="Username must be between 3 and 100 characters"),
         DataRequired(message="Username is required"),
-        Regexp(r'^[a-zA-Z0-9_]+$', message="Wallet name can only contain letters, numbers, and underscores")
     ])
     password = PasswordField('Password', [
         Length(min=8, message="Password must be at least 8 characters long"),
@@ -48,7 +47,6 @@ class TransferForm(FlaskForm):
     to_wallet = StringField('To Wallet', [
         Length(min=3, max=100, message="Wallet name must be between 3 and 100 characters"),
         DataRequired(message="Wallet name is required"),
-        Regexp(r'^[a-zA-Z0-9_]+$', message="Wallet name can only contain letters, numbers, and underscores")
     ])
     amount = FloatField('Amount', [DataRequired(message="Amount is required")])
     category = SelectField('Category', [DataRequired(
@@ -98,7 +96,6 @@ class AdminActionForm(FlaskForm):
     wallet_name = StringField('Wallet Name', [
         Length(min=3, max=100, message="Wallet name must be between 3 and 100 characters"),
         DataRequired(message="Wallet name is required"),
-        Regexp(r'^[a-zA-Z0-9_]+$', message="Wallet name can only contain letters, numbers, and underscores")
     ])
     reason = TextAreaField('Reason', [
         Length(min=3, max=500, message="Reason must be between 3 and 500 characters"),
@@ -125,7 +122,6 @@ class BankTransferForm(FlaskForm):
     wallet_name = StringField('Wallet Name', [
         Length(min=3, max=100, message="Wallet name must be between 3 and 100 characters"),
         DataRequired(message="Wallet name is required"),
-        Regexp(r'^[a-zA-Z0-9_]+$', message="Wallet name can only contain letters, numbers, and underscores")
     ])
     amount = FloatField('Amount', [
         DataRequired(message="Amount is required")

bank_lib/get_data.py

@@ -34,22 +34,16 @@ def get_settings():
 
 # Get user info by the wallet name
 def get_user_by_wallet_name(wallet_name):
-    """Get user by wallet name"""
-    if 'user_cache' not in g:
-        g.user_cache = {}
-
-    if wallet_name not in g.user_cache:
-        try:
-            users = execute_query_dict(
-                "SELECT * FROM users WHERE wallet_name = %s",
-                (wallet_name,)
-            )
-            g.user_cache[wallet_name] = users[0] if users else None
-        except Exception as e:
-            print(f"Error getting user by wallet name: {e}")
-            g.user_cache[wallet_name] = None
-
-    return g.user_cache[wallet_name]
+    """Always get user by wallet name directly from the database"""
+    try:
+        users = execute_query_dict(
+            "SELECT * FROM users WHERE wallet_name = %s",
+            (wallet_name,)
+        )
+        return users[0] if users else None
+    except Exception as e:
+        print(f"Error getting user by wallet name: {e}")
+        return None
 
 
 # Get server health metrics

bank_lib/validate.py

@@ -1,14 +1,6 @@
-import re
 import uuid
 
 
-def validate_wallet_name(wallet_name):
-    """Validate wallet name format"""
-    if not wallet_name or not re.match(r'^[a-zA-Z0-9_]{3,100}$', wallet_name):
-        return False
-    return True
-
-
 def validate_amount(amount):
     """Validate that amount is a positive number"""
     try: