Update main.py

main.py

@@ -1,99 +1,142 @@
-import os
+from fastapi import FastAPI, Response
 import requests
+import json
 import sys
-from fastapi import FastAPI
-from fastapi.responses import JSONResponse
+from http.cookiejar import Cookie
 
 app = FastAPI()
 
+# ========= Config ثابتة للاختبار =========
 BASE = "https://odoo.binrushd.care"
 AUTH_URL = f"{BASE}/api/auth/token"
 SESSION_AUTH_URL = f"{BASE}/web/session/authenticate"
 
-# ضع قيمك أو استخدم متغيرات بيئة
-CF_ID     = os.getenv("CF_ACCESS_CLIENT_ID", "0491b36d7dcabce5b04f1a53f347bb4e.access")
-CF_SECRET = os.getenv("CF_ACCESS_CLIENT_SECRET", "22152cb41b62393e159daaff7dce433006c3744c5850e6adc15fa3544bb5eb09")
-LOGIN     = os.getenv("ODOO_LOGIN", "binrushd.automation@gmail.com")
-PASSWORD  = os.getenv("ODOO_PASSWORD", "BR2025")
-DB_NAME   = os.getenv("ODOO_DB", "BR_EMR_16.0_202401")
-
-s = requests.Session()
-s.headers.update({
-    "Accept": "*/*",
-    "Content-Type": "application/json",
-    # مهم: بدون br لتفادي brotli
-    "Accept-Encoding": "gzip, deflate",
-    "Connection": "keep-alive",
-    "CF-Access-Client-Id": CF_ID,
-    "CF-Access-Client-Secret": CF_SECRET,
-})
-
-def main():
-    # 1) الحصول على access_token (القيم تُرسل كهيدر كما في إعدادك)
-    auth_headers = {
+CF_ID     = "0491b36d7dcabce5b04f1a53f347bb4e.access"
+CF_SECRET = "22152cb41b62393e159daaff7dce433006c3744c5850e6adc15fa3544bb5eb09"
+LOGIN     = "binrushd.automation@gmail.com"
+PASSWORD  = "BR2025"
+DB_NAME   = "BR_EMR_16.0_202401"
+
+
+def cookies_to_log_list(cookiejar):
+    """حوّل الكوكيز لقائمة سهلة القراءة في اللوج."""
+    out = []
+    for c in cookiejar:  # type: Cookie
+        out.append({
+            "name": c.name,
+            "value": c.value,
+            "domain": c.domain,
+            "path": c.path,
+            "secure": c.secure,
+            "expires": c.expires,
+        })
+    return out
+
+
+@app.get("/get-token-and-session")
+def get_token_and_session():
+    s = requests.Session()
+    # مهم: نمنع brotli عشان ما يجيلك نص HTML مضغوط br
+    s.headers.update({
+        "Accept": "*/*",
+        "Content-Type": "application/json",
+        "Accept-Encoding": "gzip, deflate",   # بدون br
+        "Connection": "keep-alive",
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+                      "AppleWebKit/537.36 (KHTML, like Gecko) "
+                      "Chrome/120.0.0.0 Safari/537.36",
         "CF-Access-Client-Id": CF_ID,
         "CF-Access-Client-Secret": CF_SECRET,
-        "login": LOGIN,
-        "password": PASSWORD,
-        "db": DB_NAME,
-    }
-    r = s.get(AUTH_URL, headers=auth_headers, timeout=(5, 30))
-    r.raise_for_status()
-    data = r.json()
-    token = data.get("access_token") or (data.get("data") or {}).get("access_token")
-    if not token:
-        print("❌ No access_token in response:", data)
-        sys.exit(1)
-
-    # 2) محاولة التقاط session_id من Set-Cookie، وإن لم يوجد نعمل authenticate
-    session_id = s.cookies.get("session_id") or r.cookies.get("session_id")
-    if not session_id:
-        payload = {
-            "jsonrpc": "2.0",
-            "params": {"db": DB_NAME, "login": LOGIN, "password": PASSWORD}
+    })
+
+    try:
+        # ========== (1) طلب التوكن ==========
+        auth_headers = {
+            "CF-Access-Client-Id": CF_ID,
+            "CF-Access-Client-Secret": CF_SECRET,
+            # لو السيرفر بيقرأ دول من الهيدر:
+            "login": LOGIN,
+            "password": PASSWORD,
+            "db": DB_NAME,
         }
-        r2 = s.post(SESSION_AUTH_URL, json=payload, timeout=(5, 30))
-        r2.raise_for_status()
-        session_id = s.cookies.get("session_id") or r2.cookies.get("session_id")
+
+        r = s.get(AUTH_URL, headers=auth_headers, timeout=(5, 30), allow_redirects=True)
+
+        # لوج مفصل للرد
+        r_log = {
+            "status_code": r.status_code,
+            "reason": r.reason,
+            "headers": dict(r.headers),
+            "set_cookie": r.headers.get("Set-Cookie", ""),
+            "cookies_now": cookies_to_log_list(s.cookies),
+            "body_preview": r.text[:1000],
+        }
+        print("[AUTH RESPONSE]", json.dumps(r_log, ensure_ascii=False), file=sys.stderr)
+
+        if r.status_code >= 400:
+            # رجّع الرد كما هو بنفس الحالة والمحتوى
+            return Response(content=r.text,
+                            status_code=r.status_code,
+                            media_type=r.headers.get("Content-Type", "text/plain"))
+
+        # استخرج التوكن
+        try:
+            data = r.json()
+        except ValueError:
+            data = {}
+        token = data.get("access_token") or (data.get("data") or {}).get("access_token")
+        if not token:
+            msg = {"error": "No access_token in response", "raw": data}
+            print("[NO TOKEN]", json.dumps(msg, ensure_ascii=False), file=sys.stderr)
+            return Response(content=json.dumps(msg, ensure_ascii=False),
+                            status_code=502, media_type="application/json")
+
+        # ========== (2) التقاط/إنشاء session_id ==========
+        session_id = s.cookies.get("session_id") or r.cookies.get("session_id")
+
         if not session_id:
-            print("❌ Could not obtain session_id cookie.")
-            sys.exit(1)
+            payload = {
+                "jsonrpc": "2.0",
+                "params": {"db": DB_NAME, "login": LOGIN, "password": PASSWORD}
+            }
+            r2 = s.post(SESSION_AUTH_URL, json=payload, timeout=(5, 30), allow_redirects=True)
 
-    # اطبعهم لاستخدامهم لاحقًا في GAS
-    print("ACCESS_TOKEN:", token)
-    print("SESSION_ID:", session_id)
+            r2_log = {
+                "status_code": r2.status_code,
+                "reason": r2.reason,
+                "headers": dict(r2.headers),
+                "set_cookie": r2.headers.get("Set-Cookie", ""),
+                "cookies_now": cookies_to_log_list(s.cookies),
+                "body_preview": r2.text[:1000],
+            }
+            print("[SESSION AUTH RESPONSE]", json.dumps(r2_log, ensure_ascii=False), file=sys.stderr)
 
-    return {"ACCESS_TOKEN": token, "SESSION_ID": session_id}
+            if r2.status_code >= 400:
+                return Response(content=r2.text,
+                                status_code=r2.status_code,
+                                media_type=r2.headers.get("Content-Type", "text/plain"))
 
+            session_id = s.cookies.get("session_id") or r2.cookies.get("session_id")
 
-@app.get("/run")
-def run():
-    try:
-        result = main()  # يطبع نفس رسائل اللوج بالضبط
-        return {"ok": True, "data": result}
-    except requests.HTTPError as e:
-        resp = e.response
-        # اطبع ملخص للّوج مع الحفاظ على طباعات main كما هي
-        print(f"HTTPError {resp.status_code} on {resp.url}")
-        print(resp.text[:500])
-        return JSONResponse(
-            status_code=resp.status_code,
-            content={
-                "ok": False,
-                "error": "HTTPError",
-                "status": resp.status_code,
-                "url": resp.url,
-                "body_preview": resp.text[:500],
-            },
-        )
-    except Exception as e:
-        print("Unhandled error:", str(e))
-        return JSONResponse(
-            status_code=500,
-            content={"ok": False, "error": "UnhandledError", "detail": str(e)},
-        )
-
-@app.get("/ping")
-def ping():
-    """بسيطة لاختبار الاتصال"""
-    return {"pong": True}
+        if not session_id:
+            msg = {"error": "Could not obtain session_id cookie."}
+            print("[SESSION MISSING]", json.dumps(msg, ensure_ascii=False), file=sys.stderr)
+            return Response(content=json.dumps(msg, ensure_ascii=False),
+                            status_code=502, media_type="application/json")
+
+        # ========== (3) النتيجة ==========
+        result = {
+            "access_token": token,
+            "session_id": session_id,
+            "cookies": cookies_to_log_list(s.cookies),  # للمراجعة/الديبج
+        }
+        # اطبع الكوكيز بوضوح في اللوج
+        print("[FINAL COOKIES]", json.dumps(result["cookies"], ensure_ascii=False), file=sys.stderr)
+
+        return Response(content=json.dumps(result, ensure_ascii=False),
+                        status_code=200, media_type="application/json")
+
+    except requests.RequestException as e:
+        err_txt = f"Network error: {type(e).__name__} - {str(e)}"
+        print("[NETWORK ERROR]", err_txt, file=sys.stderr)
+        return Response(content=err_txt, status_code=502, media_type="text/plain")