Update Dockerfile

Dockerfile

@@ -156,111 +156,94 @@ document.addEventListener('DOMContentLoaded', () => {
 });
 EOF
 
-# ===== Fixed Combined Server =====
-COPY <<"EOF" /app/combined_server.py
-from flask import Flask, request, jsonify, render_template, send_from_directory
-from werkzeug.middleware.proxy_fix import ProxyFix
-from werkzeug.security import generate_password_hash
-import os
+# 3. Create the Python server
+COPY <<"EOF" /app/server.py
+from flask import Flask, request, jsonify, render_template
+from waitress import serve
 import sqlite3
-from pathlib import Path
 import subprocess
-import requests
-from waitress import serve
 import threading
-import time
+import os
+from werkzeug.security import generate_password_hash
 
-app = Flask(__name__, 
-           static_url_path='/admin/static',
-           static_folder='/app/admin/static',
-           template_folder='/app/admin/templates')
-app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1, x_proto=1, x_host=1, x_prefix=1)
-app.secret_key = os.getenv("FLASK_SECRET")
+app = Flask(__name__, template_folder='/app/admin/templates')
+app.secret_key = os.getenv("FLASK_SECRET", "secret-key-123")
 
 # Database setup
-DB_PATH = '/app/data/admin.db'
-
 def get_db():
-    Path(DB_PATH).parent.mkdir(exist_ok=True)
-    db = sqlite3.connect(DB_PATH)
-    db.execute('''CREATE TABLE IF NOT EXISTS users
-                 (username TEXT PRIMARY KEY, password TEXT, role TEXT)''')
-    return db
+    conn = sqlite3.connect('/app/data/users.db')
+    conn.execute('''
+        CREATE TABLE IF NOT EXISTS users (
+            username TEXT PRIMARY KEY,
+            password TEXT,
+            role TEXT DEFAULT 'user'
+        )
+    ''')
+    return conn
 
-# ===== Admin Routes =====
-@app.route('/admin')
+# Admin routes
 @app.route('/sudo')
-def admin_home():
+def admin_login():
     return render_template('login.html')
 
-@app.route('/admin/login', methods=['POST'])
 @app.route('/sudo/login', methods=['POST'])
 def login():
     if request.json.get('sudo_secret') == os.getenv("SUDO_SECRET"):
         return jsonify({
-            "status": "success", 
-            "token": os.getenv("SUDO_SECRET"),
-            "redirect": "/admin/dashboard"
+            "status": "success",
+            "token": os.getenv("SUDO_SECRET")
         })
-    return jsonify({"error": "Invalid secret"}), 403
+    return jsonify({"error": "Invalid password"}), 403
 
-@app.route('/admin/dashboard')
 @app.route('/sudo/dashboard')
 def dashboard():
     return render_template('dashboard.html')
 
-# [Keep other admin routes...]
-
-# Serve admin static files
-@app.route('/admin/static/<path:filename>')
-def admin_static(filename):
-    return send_from_directory('/app/admin/static', filename)
-
-# ===== LibreChat Proxy =====
-def is_librechat_ready():
+@app.route('/sudo/add_user', methods=['POST'])
+def add_user():
+    if request.headers.get('X-Sudo-Secret') != os.getenv("SUDO_SECRET"):
+        return jsonify({"error": "Unauthorized"}), 403
+    
+    db = get_db()
     try:
-        return requests.get('http://localhost:3080/api', timeout=1).status_code < 500
-    except:
-        return False
+        db.execute(
+            "INSERT INTO users (username, password) VALUES (?, ?)",
+            [request.json["username"], generate_password_hash(request.json["password"])]
+        )
+        db.commit()
+        return jsonify({"status": "User added"})
+    except sqlite3.IntegrityError:
+        return jsonify({"error": "User exists"}), 400
 
-@app.route('/', defaults={'path': ''})
-@app.route('/<path:path>')
-def proxy(path):
-    # Don't proxy admin routes
-    if path.startswith(('admin/', 'sudo/', 'admin', 'sudo')):
-        return "Route not found", 404
-    
-    # Wait for backend
-    if not is_librechat_ready():
-        return "LibreChat backend starting...", 503
+@app.route('/sudo/list_users', methods=['GET'])
+def list_users():
+    if request.headers.get('X-Sudo-Secret') != os.getenv("SUDO_SECRET"):
+        return jsonify({"error": "Unauthorized"}), 403
     
-    # Forward request
-    resp = requests.request(
-        method=request.method,
-        url=f"http://localhost:3080/{path}",
-        headers={k: v for k, v in request.headers if k.lower() != 'host'},
-        data=request.get_data(),
-        cookies=request.cookies,
-        allow_redirects=False
-    )
+    db = get_db()
+    users = db.execute("SELECT username FROM users").fetchall()
+    return jsonify([{"username": u[0]} for u in users])
+
+@app.route('/sudo/remove_user', methods=['POST'])
+def remove_user():
+    if request.headers.get('X-Sudo-Secret') != os.getenv("SUDO_SECRET"):
+        return jsonify({"error": "Unauthorized"}), 403
     
-    # Build response
-    response = app.make_response((resp.content, resp.status_code))
-    for k, v in resp.headers.items():
-        if k.lower() not in ['content-length', 'transfer-encoding']:
-            response.headers[k] = v
-    return response
+    db = get_db()
+    db.execute("DELETE FROM users WHERE username = ?", [request.json["username"]])
+    db.commit()
+    return jsonify({"status": "User deleted"})
 
+# Start LibreChat in background
 def start_librechat():
-    subprocess.Popen(["npm", "run", "backend"], cwd="/app")
+    subprocess.run(["npm", "run", "backend"], cwd="/app")
+
+threading.Thread(target=start_librechat, daemon=True).start()
 
+# Start server
 if __name__ == "__main__":
-    # Start LibreChat
-    threading.Thread(target=start_librechat, daemon=True).start()
-    
-    # Start server
-    print("Starting combined server on port 7860")
-    serve(app, host='0.0.0.0', port=7860, threads=4)
+    print("Admin panel: http://localhost:7860/sudo")
+    serve(app, host="0.0.0.0", port=7860)
 EOF
 
 # Startup script