diff --git a/backend/app/Controllers/WhatsAppController.php b/backend/app/Controllers/WhatsAppController.php index 4046a77..2623a60 100644 --- a/backend/app/Controllers/WhatsAppController.php +++ b/backend/app/Controllers/WhatsAppController.php @@ -40,10 +40,11 @@ class WhatsAppController extends BaseController WhatsAppSession::updateState($session['id'], ['status' => 'connecting']); // Call Baileys Node.js Service on port 3722 + $appUrl = rtrim(getenv('APP_URL') ?: 'https://nabeh.intaleqapp.com', '/'); $nodeUrl = 'http://127.0.0.1:3722/api/sessions/start'; $payload = json_encode([ 'session_key' => $session['session_key'], - 'webhook_url' => getenv('APP_URL') . '/api/whatsapp/webhook' + 'webhook_url' => $appUrl . '/api/whatsapp/webhook' ]); $ch = curl_init($nodeUrl); diff --git a/backend/app/Models/Campaign.php b/backend/app/Models/Campaign.php index c36a68e..ae52186 100644 --- a/backend/app/Models/Campaign.php +++ b/backend/app/Models/Campaign.php @@ -8,7 +8,7 @@ namespace App\Models; */ class Campaign extends BaseModel { - protected string $table = 'campaigns'; + protected static string $table = 'campaigns'; /** * Get all campaigns for a company diff --git a/whatsapp-gateway/baileys-client.js b/whatsapp-gateway/baileys-client.js index 994fd6f..4f63883 100644 --- a/whatsapp-gateway/baileys-client.js +++ b/whatsapp-gateway/baileys-client.js @@ -12,17 +12,17 @@ if (!fs.existsSync(SESSIONS_DIR)) { fs.mkdirSync(SESSIONS_DIR, { recursive: true }); } -const WEBHOOK_SECRET = process.env.WEBHOOK_SECRET; - async function sendWebhook(webhook_url, payload) { try { + console.log(`Sending webhook to ${webhook_url} with state ${payload.state}`); await axios.post(webhook_url, payload, { headers: { 'Content-Type': 'application/json', - 'X-Webhook-Secret': WEBHOOK_SECRET + 'X-Webhook-Secret': process.env.WEBHOOK_SECRET || 'fallback' }, timeout: 5000 }); + console.log(`Webhook sent successfully to ${webhook_url}`); } catch (err) { console.error(`Failed to send webhook to ${webhook_url}:`, err.message); }