scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-10-29 10:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: exclude private and activity messages from public API (#7123)

Browse Source 
- Exclude private messages
This commit is contained in:
Shivam Mishra
2023-05-19 14:24:49 +05:30
committed by GitHub
parent 105f9a27d2
commit b988a01df3
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/public/api/v1/models/_conversation.json.jbuilder
View File

@@ -4,7 +4,7 @@ json.contact_last_seen_at resource.contact_last_seen_at.to_i
json.status resource.status
json.agent_last_seen_at resource.agent_last_seen_at.to_i
json.messages do
json.array! resource.messages do |message|
json.array! resource.messages.chat do |message|
json.partial! 'public/api/v1/models/message', formats: [:json], resource: message
end
end

19
spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
View File

@@ -14,6 +14,25 @@ RSpec.describe 'Public Inbox Contact Conversations API', type: :request do
data = JSON.parse(response.body)
expect(data.length).to eq 1
end
it 'does not return any private or activity message' do
conversation = create(:conversation, contact_inbox: contact_inbox)
create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation, content: 'message-1')
create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation, content: 'message-2')
create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation, content: 'private-message-1',
private: true)
create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation, content: 'activity-message-1',
message_type: :activity)
get "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations"
expect(response).to have_http_status(:success)
data = JSON.parse(response.body)
expect(data.length).to eq 1
expect(data.first['messages'].length).to eq 2
expect(data.first['messages'].map { |m| m['content'] }).not_to include('private-message-1')
expect(data.first['messages'].map { |m| m['message_type'] }).not_to include('activity')
end
end
describe 'POST /public/api/v1/inboxes/{identifier}/contact/{source_id}/conversations' do