Update bot/handlers.py

bot/handlers.py

@@ -26,17 +26,40 @@ from bot.temp.files import cleanup_file
 
 from bot.youtube.uploader import upload_video
 
-# ✅ NEW: extra dns helper for /diag
+# ✅ extra dns helper for /diag
 from bot.integrations.diag_extra import dns_check
 
-# ✅ NEW: use robust fetch with DNS fallback (DoH -> IP)
-from bot.integrations.http import fetch_status
+# ✅ robust fetch_status (optional). If not present, fallback to get_client().get()
+try:
+    from bot.integrations.http import fetch_status  # type: ignore
+except Exception:
+    async def fetch_status(url: str) -> str:
+        try:
+            from bot.integrations.http import get_client
+            c = get_client()
+            r = await c.get(url)
+            return str(r.status_code)
+        except Exception as e:
+            return f"ERR:{type(e).__name__}:{e}"
+
 
 # ---------- in-memory auth state (simple FSM) ----------
 # values: "json" | "ci"
 _AWAIT_AUTH: Dict[int, str] = {}
 
 
+def _pick_login_url(j: dict) -> str:
+    """Backend sometimes returns loginUrl instead of login_url. Accept both."""
+    if not isinstance(j, dict):
+        return ""
+    return (
+        (j.get("login_url") or "").strip()
+        or (j.get("loginUrl") or "").strip()
+        or (j.get("auth_url") or "").strip()
+        or (j.get("url") or "").strip()
+    )
+
+
 def setup_handlers(app: Client) -> None:
 
     @app.on_message(filters.command(["start"]) & filters.private)
@@ -99,7 +122,6 @@ def setup_handlers(app: Client) -> None:
         if not is_owner_id(m.from_user.id if m.from_user else None):
             return await safe_reply(m, texts.OWNER_ONLY)
 
-        # ✅ robust: tries normal request; on DNS fail uses DoH->IP fallback
         r1 = await fetch_status((Workers.WORKER1_URL or "") + "/")
         r2 = await fetch_status((Workers.WORKER2_URL or "") + "/")
 
@@ -174,26 +196,39 @@ def setup_handlers(app: Client) -> None:
             return
 
         try:
+            # ---- parse credentials ----
             if mode == "json":
                 data = json.loads(m.text)
                 root = data.get("installed") or data.get("web") or {}
-                client_id = root.get("client_id") or data.get("client_id")
-                client_secret = root.get("client_secret") or data.get("client_secret")
+                client_id = (root.get("client_id") or data.get("client_id") or "").strip()
+                client_secret = (root.get("client_secret") or data.get("client_secret") or "").strip()
                 if not client_id or not client_secret:
                     return await safe_reply(m, texts.PARSE_FAIL)
             else:
-                txt = m.text.strip()
+                txt = (m.text or "").strip()
                 parts = [p.strip() for p in re.split(r"[|\n]+", txt) if p.strip()]
                 if len(parts) < 2:
                     return await safe_reply(m, texts.PARSE_FAIL)
                 client_id, client_secret = parts[0], parts[1]
 
+            # ---- call backend ----
             j = await profile_add(uid, client_id, client_secret, label="main", ttl_sec=600)
             if not j.get("ok"):
                 return await safe_reply(m, texts.PROFILE_ADD_FAIL.format(j))
 
+            login_url = _pick_login_url(j)
             _AWAIT_AUTH.pop(uid, None)
-            await safe_reply(m, texts.SENT_AUTH_LINK + j["login_url"])
+
+            if not login_url:
+                # ✅ Do not crash; show backend response for debugging
+                return await safe_reply(
+                    m,
+                    "❌ profile_add OK but login link missing.\n"
+                    "Backend response:\n"
+                    f"`{j}`"
+                )
+
+            await safe_reply(m, texts.SENT_AUTH_LINK + login_url)
 
         except Exception as e:
             await safe_reply(m, f"{texts.PARSE_FAIL}\n`{type(e).__name__}: {e}`")