Update app.py

app.py

@@ -34,38 +34,85 @@ async def index():
 
 @app.get("/api/accounts")
 async def get_accounts():
-    return [{k:v for k,v in a.items() if k!='token'} for a in load_accounts()]
+    # Never return token or password to the frontend
+    safe_keys = {"username", "host", "last_renewed", "next_renewal", "last_results", "auth_method"}
+    return [{k: v for k, v in a.items() if k in safe_keys} for a in load_accounts()]
 
 @app.post("/api/accounts")
 async def add_account(request: Request):
-    body = await request.json()
-    username = body.get("username","").strip()
-    token    = body.get("token","").strip()
-    if not username or not token:
-        return JSONResponse({"ok":False,"message":"❌ بيانات ناقصة"})
+    body     = await request.json()
+    username = body.get("username", "").strip()
+    token    = body.get("token", "").strip()
+    password = body.get("password", "").strip()
+
+    if not username:
+        return JSONResponse({"ok": False, "message": "❌ أدخل اسم المستخدم"})
+    if not token and not password:
+        return JSONResponse({"ok": False, "message": "❌ أدخل API Token أو كلمة المرور"})
+
     accounts = load_accounts()
-    if any(a["username"]==username for a in accounts):
-        return JSONResponse({"ok":False,"message":f"⚠️ الحساب {username} موجود مسبقاً"})
+    if any(a["username"] == username for a in accounts):
+        return JSONResponse({"ok": False, "message": f"⚠️ الحساب {username} موجود مسبقاً"})
+
     add_log(f"🔍 جاري التحقق من {username}...")
-    host = get_host(username, token)
+
+    # Detect host
+    host = None
+    auth_method = ""
+
+    if token:
+        host = get_host(username, token)
+        auth_method = "token"
+        if not host:
+            add_log(f"❌ فشل الاتصال بـ {username} عبر Token")
+            if not password:
+                return JSONResponse({"ok": False, "message": "❌ فشل الاتصال. تحقق من Token."})
+            add_log(f"🔄 سأحاول عبر كلمة المرور...")
+
+    if not host and password:
+        # Try to detect host via simple HTTP check
+        import requests as req
+        for h in ["www.pythonanywhere.com", "eu.pythonanywhere.com"]:
+            try:
+                r = req.get(f"https://{h}/login/", timeout=8)
+                if r.status_code == 200:
+                    host = h
+                    break
+            except Exception:
+                continue
+        auth_method = "password"
+
     if not host:
-        add_log(f"❌ فشل الاتصال بـ {username}")
-        return JSONResponse({"ok":False,"message":"❌ فشل الاتصال. تحقق من البيانات."})
-    accounts.append({"username":username,"token":token,"host":host,
-                     "last_renewed":None,"next_renewal":None,"last_results":[]})
+        add_log(f"❌ تعذّر تحديد الخادم لـ {username}")
+        return JSONResponse({"ok": False, "message": "❌ فشل الاتصال. تحقق من البيانات."})
+
+    new_account = {
+        "username": username,
+        "host": host,
+        "auth_method": auth_method,
+        "last_renewed": None,
+        "next_renewal": None,
+        "last_results": []
+    }
+    if token:
+        new_account["token"] = token
+    if password:
+        new_account["password"] = password
+
+    accounts.append(new_account)
     save_accounts(accounts)
-    add_log(f"✅ تمت إضافة {username} على {host}")
-    return JSONResponse({"ok":True,"message":f"✅ تمت إضافة {username} على {host}"})
+    add_log(f"✅ تمت إضافة {username} على {host} [{auth_method}]")
+    return JSONResponse({"ok": True, "message": f"✅ تمت إضافة {username} على {host} [{auth_method}]"})
 
 @app.delete("/api/accounts/{username}")
 async def delete_account(username: str):
     accounts = load_accounts()
-    new_list = [a for a in accounts if a["username"]!=username]
-    if len(new_list)==len(accounts):
-        return JSONResponse({"ok":False,"message":f"⚠️ لم يُعثر على {username}"})
+    new_list = [a for a in accounts if a["username"] != username]
+    if len(new_list) == len(accounts):
+        return JSONResponse({"ok": False, "message": f"⚠️ لم يُعثر على {username}"})
     save_accounts(new_list)
     add_log(f"🗑️ تم حذف {username}")
-    return JSONResponse({"ok":True,"message":f"🗑️ تم حذف {username}"})
+    return JSONResponse({"ok": True, "message": f"🗑️ تم حذف {username}"})
 
 @app.post("/api/renew")
 async def renew_all():
@@ -78,29 +125,29 @@ async def renew_all():
                     add_log(f"  [{a['username']}] {r['domain']} → {r['status']}")
         add_log("✅ انتهى التجديد.")
     threading.Thread(target=do, daemon=True).start()
-    return {"ok":True}
+    return {"ok": True}
 
 @app.post("/api/renew/{username}")
 async def renew_one(username: str):
     accounts = load_accounts()
-    account  = next((a for a in accounts if a["username"]==username), None)
+    account  = next((a for a in accounts if a["username"] == username), None)
     if not account:
-        return {"ok":False}
+        return {"ok": False}
     account["next_renewal"] = None
     save_accounts(accounts)
     def do():
         add_log(f"🔄 تجديد {username}...")
         success, results = renew_account(account)
         accs2 = load_accounts()
-        for i,a in enumerate(accs2):
-            if a["username"]==username:
-                accs2[i]=account
+        for i, a in enumerate(accs2):
+            if a["username"] == username:
+                accs2[i] = account
         save_accounts(accs2)
         for r in (results if success else []):
             add_log(f"  [{username}] {r['domain']} → {r['status']}")
         add_log(f"{'✅' if success else '❌'} {'تم' if success else 'فشل'} تجديد {username}")
     threading.Thread(target=do, daemon=True).start()
-    return {"ok":True}
+    return {"ok": True}
 
 @app.post("/api/scheduler")
 async def toggle_scheduler():
@@ -125,9 +172,9 @@ async def get_log():
 
 @app.get("/health")
 async def health():
-    return {"status":"alive"}
+    return {"status": "alive"}
 
 if __name__ == "__main__":
     start_ping_server(port=8080)
     add_log("🚀 PythonAnywhere Manager started")
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+    uvicorn.run(app, host="0.0.0.0", port=7860)