From 70e20f8b3561dbb2180dc58b8348f5158c7a1071 Mon Sep 17 00:00:00 2001 From: Sojan Jose Date: Mon, 8 Jun 2026 18:54:54 +0530 Subject: [PATCH] fix(webhooks): include account data in webhook payloads --- app/listeners/webhook_listener.rb | 4 ++-- .../conversations/event_data_presenter.rb | 5 ++++- app/presenters/inbox/event_data_presenter.rb | 4 ++++ spec/listeners/agent_bot_listener_spec.rb | 2 +- spec/listeners/webhook_listener_spec.rb | 22 +++++++++++++++++-- .../event_data_presenter_spec.rb | 4 ++++ 6 files changed, 35 insertions(+), 6 deletions(-) diff --git a/app/listeners/webhook_listener.rb b/app/listeners/webhook_listener.rb index 835d03661..c64b36ca0 100644 --- a/app/listeners/webhook_listener.rb +++ b/app/listeners/webhook_listener.rb @@ -68,7 +68,7 @@ class WebhookListener < BaseListener def inbox_created(event) inbox, account = extract_inbox_and_account(event) - inbox_webhook_data = Inbox::EventDataPresenter.new(inbox).push_data + inbox_webhook_data = Inbox::EventDataPresenter.new(inbox).webhook_data payload = inbox_webhook_data.merge(event: __method__.to_s) deliver_account_webhooks(payload, account) end @@ -78,7 +78,7 @@ class WebhookListener < BaseListener changed_attributes = extract_changed_attributes(event) return if changed_attributes.blank? - inbox_webhook_data = Inbox::EventDataPresenter.new(inbox).push_data + inbox_webhook_data = Inbox::EventDataPresenter.new(inbox).webhook_data payload = inbox_webhook_data.merge(event: __method__.to_s, changed_attributes: changed_attributes) deliver_account_webhooks(payload, account) end diff --git a/app/presenters/conversations/event_data_presenter.rb b/app/presenters/conversations/event_data_presenter.rb index ae0e69608..4dfa10abe 100644 --- a/app/presenters/conversations/event_data_presenter.rb +++ b/app/presenters/conversations/event_data_presenter.rb @@ -23,7 +23,10 @@ class Conversations::EventDataPresenter < SimpleDelegator # Like #push_data but with message text normalized for external integrations (webhooks). def webhook_data - push_data.merge(messages: webhook_push_messages) + push_data.merge( + account: account.webhook_data, + messages: webhook_push_messages + ) end private diff --git a/app/presenters/inbox/event_data_presenter.rb b/app/presenters/inbox/event_data_presenter.rb index a408424ae..7f832bb5a 100644 --- a/app/presenters/inbox/event_data_presenter.rb +++ b/app/presenters/inbox/event_data_presenter.rb @@ -32,4 +32,8 @@ class Inbox::EventDataPresenter < SimpleDelegator channel: channel } end + + def webhook_data + push_data.merge(account: account.webhook_data) + end end diff --git a/spec/listeners/agent_bot_listener_spec.rb b/spec/listeners/agent_bot_listener_spec.rb index 08deeb6c4..00aac800b 100644 --- a/spec/listeners/agent_bot_listener_spec.rb +++ b/spec/listeners/agent_bot_listener_spec.rb @@ -82,7 +82,7 @@ describe AgentBotListener do create(:agent_bot_inbox, inbox: inbox, agent_bot: agent_bot) expect(AgentBots::WebhookJob).to receive(:perform_later).with( agent_bot.outgoing_url, - hash_including(event: 'conversation_status_changed', changed_attributes: anything), + hash_including(event: 'conversation_status_changed', account: account.webhook_data, changed_attributes: anything), :agent_bot_webhook, hash_including(secret: agent_bot.secret) ).once diff --git a/spec/listeners/webhook_listener_spec.rb b/spec/listeners/webhook_listener_spec.rb index a7a64f175..0b23c7319 100644 --- a/spec/listeners/webhook_listener_spec.rb +++ b/spec/listeners/webhook_listener_spec.rb @@ -101,6 +101,15 @@ describe WebhookListener do ).once listener.conversation_created(conversation_created_event) end + + it 'includes account details in the conversation payload' do + webhook = create(:webhook, inbox: inbox, account: account) + expect(WebhookJob).to receive(:perform_later).with( + webhook.url, hash_including(account: account.webhook_data), :account_webhook, + secret: webhook.secret, delivery_id: instance_of(String) + ).once + listener.conversation_created(conversation_created_event) + end end context 'when inbox is an API Channel' do @@ -250,7 +259,7 @@ describe WebhookListener do context 'when webhook is configured' do it 'triggers webhook' do - inbox_data = Inbox::EventDataPresenter.new(inbox).push_data + inbox_data = Inbox::EventDataPresenter.new(inbox).webhook_data webhook = create(:webhook, account: account, subscriptions: ['inbox_created']) expect(WebhookJob).to receive(:perform_later).with( webhook.url, inbox_data.merge(event: 'inbox_created'), :account_webhook, @@ -258,6 +267,15 @@ describe WebhookListener do ).once listener.inbox_created(inbox_created_event) end + + it 'includes account details in the inbox payload' do + webhook = create(:webhook, account: account, subscriptions: ['inbox_created']) + expect(WebhookJob).to receive(:perform_later).with( + webhook.url, hash_including(account: account.webhook_data), :account_webhook, + secret: webhook.secret, delivery_id: instance_of(String) + ).once + listener.inbox_created(inbox_created_event) + end end end @@ -287,7 +305,7 @@ describe WebhookListener do it 'triggers webhook' do webhook = create(:webhook, account: account, subscriptions: ['inbox_updated']) - inbox_data = Inbox::EventDataPresenter.new(inbox).push_data + inbox_data = Inbox::EventDataPresenter.new(inbox).webhook_data changed_attributes_data = [{ 'name' => { 'previous_value': 'Inbox 1', 'current_value': inbox.name } }] expect(WebhookJob).to receive(:perform_later).with( diff --git a/spec/presenters/conversations/event_data_presenter_spec.rb b/spec/presenters/conversations/event_data_presenter_spec.rb index 76fd8f8a8..21cb26c98 100644 --- a/spec/presenters/conversations/event_data_presenter_spec.rb +++ b/spec/presenters/conversations/event_data_presenter_spec.rb @@ -46,6 +46,10 @@ RSpec.describe Conversations::EventDataPresenter do end describe '#webhook_data' do + it 'includes account details for webhook consumers' do + expect(presenter.webhook_data[:account]).to eq(conversation.account.webhook_data) + end + it 'normalizes hard-break backslashes in message content' do message = create(:message, conversation: conversation, account: conversation.account, message_type: :outgoing, content: "Hello\\\nWorld")