KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Labels cannot be added to conversations (#1644)

Browse source
This commit is contained in:
Pranav Raj S 2021-01-13 12:15:11 +05:30 committed by GitHub
parent 764c90174e
commit 8c66dbd342
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/api/v1/accounts/contacts/labels_controller.rb
View file

@ -4,10 +4,10 @@ class Api::V1::Accounts::Contacts::LabelsController < Api::V1::Accounts::BaseCon
private private
def model def model
@model ||= Current.account.contacts.find(params[:contact_id]) @model ||= Current.account.contacts.find(permitted_params[:contact_id])
end end
def permitted_params def permitted_params
params.permit(:contact_id, :labels) params.permit(:contact_id, labels: [])
end end
end end

2
app/controllers/api/v1/accounts/conversations/labels_controller.rb
View file

@ -8,6 +8,6 @@ class Api::V1::Accounts::Conversations::LabelsController < Api::V1::Accounts::Co
end end
def permitted_params def permitted_params
params.permit(:conversation_id, :labels) params.permit(:conversation_id, labels: [])
end end
end end

4
spec/controllers/api/v1/accounts/contacts/labels_controller_spec.rb
View file

@ -42,7 +42,7 @@ RSpec.describe 'Contact Label API', type: :request do
context 'when it is an unauthenticated user' do context 'when it is an unauthenticated user' do
it 'returns unauthorized' do it 'returns unauthorized' do
post api_v1_account_contact_labels_url(account_id: account.id, contact_id: contact.id), post api_v1_account_contact_labels_url(account_id: account.id, contact_id: contact.id),
params: { labels: 'label3,label4' }, params: { labels: %w[label3 label4] },
as: :json as: :json
expect(response).to have_http_status(:unauthorized) expect(response).to have_http_status(:unauthorized)
@ -54,7 +54,7 @@ RSpec.describe 'Contact Label API', type: :request do
it 'creates labels for the contact' do it 'creates labels for the contact' do
post api_v1_account_contact_labels_url(account_id: account.id, contact_id: contact.id), post api_v1_account_contact_labels_url(account_id: account.id, contact_id: contact.id),
params: { labels: 'label3,label4' }, params: { labels: %w[label3 label4] },
headers: agent.create_new_auth_token, headers: agent.create_new_auth_token,
as: :json as: :json

4
spec/controllers/api/v1/accounts/conversations/labels_controller_spec.rb
View file

@ -42,7 +42,7 @@ RSpec.describe 'Conversation Label API', type: :request do
context 'when it is an unauthenticated user' do context 'when it is an unauthenticated user' do
it 'returns unauthorized' do it 'returns unauthorized' do
post api_v1_account_conversation_labels_url(account_id: account.id, conversation_id: conversation.display_id), post api_v1_account_conversation_labels_url(account_id: account.id, conversation_id: conversation.display_id),
params: { labels: 'label3,label4' }, params: { labels: %w[label3 label4] },
as: :json as: :json
expect(response).to have_http_status(:unauthorized) expect(response).to have_http_status(:unauthorized)
@ -54,7 +54,7 @@ RSpec.describe 'Conversation Label API', type: :request do
it 'creates labels for the conversation' do it 'creates labels for the conversation' do
post api_v1_account_conversation_labels_url(account_id: account.id, conversation_id: conversation.display_id), post api_v1_account_conversation_labels_url(account_id: account.id, conversation_id: conversation.display_id),
params: { labels: 'label3,label4' }, params: { labels: %w[label3 label4] },
headers: agent.create_new_auth_token, headers: agent.create_new_auth_token,
as: :json as: :json