Update bot/integrations/cf_worker1.py

bot/integrations/cf_worker1.py

@@ -2,18 +2,64 @@
 from bot.config import Workers
 from bot.integrations.http import post_json
 
+
 def _h():
-    return {"Authorization": f"Bearer {Workers.BOT_BACKEND_KEY}", "Content-Type": "application/json"}
+    return {
+        "Authorization": f"Bearer {Workers.BOT_BACKEND_KEY}",
+        "Content-Type": "application/json",
+    }
+
+
+def _unwrap(r: dict) -> dict:
+    """
+    post_json() may return:
+      A) direct backend json -> {"ok": true, ...}
+      B) wrapper -> {"ok": true, "status": 200, "data": {...}}
+    handlers.py expects (A), so convert (B) -> (A)
+    """
+    if isinstance(r, dict) and isinstance(r.get("data"), dict):
+        data = r["data"]
+        # keep fallback ok/status for debugging if you want
+        if "ok" not in data and "ok" in r:
+            data["ok"] = r["ok"]
+        return data
+    return r
 
-async def profile_add(tg_id: int, client_id: str, client_secret: str, label: str = "main", ttl_sec: int = 600) -> dict:
-    return await post_json(
+
+async def profile_add(
+    tg_id: int,
+    client_id: str,
+    client_secret: str,
+    label: str = "main",
+    ttl_sec: int = 600,
+) -> dict:
+    r = await post_json(
         f"{Workers.WORKER1_URL}/api/profile/add",
         _h(),
-        {"tg_id": str(tg_id), "client_id": client_id, "client_secret": client_secret, "label": label, "ttl_sec": ttl_sec},
+        {
+            "tg_id": str(tg_id),
+            "client_id": client_id,
+            "client_secret": client_secret,
+            "label": label,
+            "ttl_sec": ttl_sec,
+        },
     )
+    return _unwrap(r)
+
 
 async def profile_list(tg_id: int) -> dict:
-    return await post_json(f"{Workers.WORKER1_URL}/api/profile/list", _h(), {"tg_id": str(tg_id)})
+    r = await post_json(
+        f"{Workers.WORKER1_URL}/api/profile/list",
+        _h(),
+        {"tg_id": str(tg_id)},
+    )
+    return _unwrap(r)
+
 
 async def profile_set_default(tg_id: int, profile_id: str) -> dict:
-    return await post_json(f"{Workers.WORKER1_URL}/api/profile/set_default", _h(), {"tg_id": str(tg_id), "profile_id": profile_id})
+    r = await post_json(
+        f"{Workers.WORKER1_URL}/api/profile/set_default",
+        _h(),
+        {"tg_id": str(tg_id), "profile_id": profile_id},
+    )
+    return _unwrap(r)