Update app.py

Author: omarakhmedov-web

app.py

@@ -4849,29 +4849,46 @@ def nowpayments_order_status(order_id: str):
 
 
 def parse_nowpayments_ipn_payload() -> Dict[str, Any]:
-    payload = request.get_json(silent=True)
-    if isinstance(payload, dict) and payload:
-        return payload
+    payload: Dict[str, Any] = {}
+
     raw = request.get_data(cache=True, as_text=True) or ""
     if raw:
         try:
             parsed = json.loads(raw)
-            if isinstance(parsed, dict) and parsed:
-                return parsed
+            if isinstance(parsed, dict):
+                payload.update(parsed)
         except Exception:
             pass
-    payload = {}
+
+    json_payload = request.get_json(silent=True)
+    if isinstance(json_payload, dict):
+        payload.update(json_payload)
+
     try:
         for key in request.form.keys():
-            payload[str(key)] = request.form.get(key)
+            field_key = str(key)
+            field_value = request.form.get(key)
+            if field_key in {"payload", "body", "data"} and isinstance(field_value, str) and field_value.strip():
+                try:
+                    nested = json.loads(field_value)
+                    if isinstance(nested, dict):
+                        payload.update(nested)
+                        continue
+                except Exception:
+                    pass
+            if field_key not in payload:
+                payload[field_key] = field_value
     except Exception:
         pass
-    if not payload:
-        try:
-            for key in request.args.keys():
-                payload[str(key)] = request.args.get(key)
-        except Exception:
-            pass
+
+    try:
+        for key in request.args.keys():
+            arg_key = str(key)
+            if arg_key not in payload:
+                payload[arg_key] = request.args.get(key)
+    except Exception:
+        pass
+
     return payload
 
 
@@ -4880,6 +4897,18 @@ def nowpayments_ipn_receive():
     payload = parse_nowpayments_ipn_payload()
     bypass_enabled = str(os.getenv("NOWPAYMENTS_IPN_TEST_BYPASS", "0")).strip().lower() in {"1", "true", "yes", "on"}
     bypass_requested = str(request.args.get("test_bypass") or "").strip().lower() in {"1", "true", "yes", "on"}
+    has_identifier = any(normalize_text(payload.get(key), 120) for key in ("order_id", "invoice_id", "invoiceId", "payment_id", "id", "purchase_id"))
+    payment_status_value = normalize_text(payload.get("payment_status") or payload.get("status"), 80)
+    if not has_identifier or not payment_status_value:
+        raise ApiError(
+            "NOWPayments IPN payload is missing required fields.",
+            400,
+            code="NOWPAYMENTS_IPN_PAYLOAD_INVALID",
+            details={
+                "has_identifier": bool(has_identifier),
+                "has_payment_status": bool(payment_status_value),
+            },
+        )
     if not (bypass_enabled and bypass_requested):
         signature = str(request.headers.get("x-nowpayments-sig") or request.headers.get("X-NOWPAYMENTS-SIG") or "").strip()
         if not signature: