Update main.py

main.py

@@ -1,36 +1,34 @@
-# app.py
 import os
-import sys
-import json
 import requests
-from fastapi import FastAPI, HTTPException, Request
+import sys
+from fastapi import FastAPI
 
-BASE = os.getenv("ODOO_BASE", "https://odoo.binrushd.care")
+app = FastAPI()
+
+BASE = "https://odoo.binrushd.care"
 AUTH_URL = f"{BASE}/api/auth/token"
 SESSION_AUTH_URL = f"{BASE}/web/session/authenticate"
 
-# نفس متغيراتك بالضبط (تقدر تغيّرها من env)
+# ضع قيمك أو استخدم متغيرات بيئة
 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")
 
-app = FastAPI(title="Run get_token_and_session on request")
-
-def get_token_and_session():
-    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,
-    })
+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,
+})
 
-    # (1) الحصول على access_token (الهيدرز زي ما في سكريبتك)
+def main():
+    # 1) الحصول على access_token (القيم تُرسل كهيدر كما في إعدادك)
     auth_headers = {
         "CF-Access-Client-Id": CF_ID,
         "CF-Access-Client-Secret": CF_SECRET,
@@ -40,17 +38,13 @@ def get_token_and_session():
     }
     r = s.get(AUTH_URL, headers=auth_headers, timeout=(5, 30))
     r.raise_for_status()
-    try:
-        data = r.json()
-    except ValueError:
-        # اطبع أول جزء من البودي للتشخيص
-        raise RuntimeError(f"Non-JSON from auth endpoint: {r.text[:300]}")
-
+    data = r.json()
     token = data.get("access_token") or (data.get("data") or {}).get("access_token")
     if not token:
-        raise RuntimeError(f"No access_token in response: {data}")
+        print("❌ No access_token in response:", data)
+        sys.exit(1)
 
-    # (2) session_id من الكوكيز، أو نعمل authenticate
+    # 2) محاولة التقاط session_id من Set-Cookie، وإن لم يوجد نعمل authenticate
     session_id = s.cookies.get("session_id") or r.cookies.get("session_id")
     if not session_id:
         payload = {
@@ -61,32 +55,24 @@ def get_token_and_session():
         r2.raise_for_status()
         session_id = s.cookies.get("session_id") or r2.cookies.get("session_id")
         if not session_id:
-            raise RuntimeError("Could not obtain session_id cookie.")
+            print("❌ Could not obtain session_id cookie.")
+            sys.exit(1)
 
-    # اطباعهُم في اللوج
+    # اطبعهم لاستخدامهم لاحقًا في GAS
     print("ACCESS_TOKEN:", token)
     print("SESSION_ID:", session_id)
 
-    return token, session_id
+    return {"ACCESS_TOKEN": token, "SESSION_ID": session_id}
+
 
 @app.get("/run")
-def run_get_token_and_session_get():
-    try:
-        token, session_id = get_token_and_session()
-        return {"ok": True, "access_token": token, "session_id": session_id}
-    except Exception as e:
-        # رجّع 502 عشان تبان مشكلة خارجية بوضوح
-        raise HTTPException(status_code=502, detail=str(e))
+def run():
+    """ينفذ الكود عند أي GET"""
+    result = main()
+    return {"ok": True, "data": result}
 
-@app.post("/run")
-async def run_get_token_and_session_post(_req: Request):
-    # نفس السلوك للـ POST
-    try:
-        token, session_id = get_token_and_session()
-        return {"ok": True, "access_token": token, "session_id": session_id}
-    except Exception as e:
-        raise HTTPException(status_code=502, detail=str(e))
 
 @app.get("/ping")
 def ping():
+    """بسيطة لاختبار الاتصال"""
     return {"pong": True}