+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components/widgets/conversation/stories/ContactBubble.stories.js b/app/javascript/dashboard/components/widgets/conversation/stories/ContactBubble.stories.js
new file mode 100644
index 000000000..ec000ab45
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/stories/ContactBubble.stories.js
@@ -0,0 +1,28 @@
+import ContactBubble from '../bubble/Contact.vue';
+
+export default {
+ title: 'Components/Messaging/ContactBubble',
+ component: ContactBubble,
+ argTypes: {
+ name: {
+ defaultValue: 'Eden Hazard',
+ control: {
+ type: 'string',
+ },
+ },
+ phoneNumber: {
+ defaultValue: '+517554433220',
+ control: {
+ type: 'string',
+ },
+ },
+ },
+};
+
+const Template = (args, { argTypes }) => ({
+ props: Object.keys(argTypes),
+ components: { ContactBubble },
+ template: '{{ $t('COMPONENTS.FILE_BUBBLE.INSTAGRAM_STORY_UNAVAILABLE') }}
+
+
+
diff --git a/app/javascript/dashboard/routes/auth/Signup.vue b/app/javascript/dashboard/routes/auth/Signup.vue
index dc1fa4cbb..06d8355cb 100644
--- a/app/javascript/dashboard/routes/auth/Signup.vue
+++ b/app/javascript/dashboard/routes/auth/Signup.vue
@@ -88,7 +88,7 @@ export default {
}
.signup-form--content {
- padding: var(--space-jumbo);
+ padding: var(--space-larger);
max-width: 600px;
width: 100%;
}
diff --git a/app/javascript/dashboard/routes/auth/components/Signup/Form.vue b/app/javascript/dashboard/routes/auth/components/Signup/Form.vue
index 4b984db94..1f1d61d94 100644
--- a/app/javascript/dashboard/routes/auth/components/Signup/Form.vue
+++ b/app/javascript/dashboard/routes/auth/components/Signup/Form.vue
@@ -1,70 +1,79 @@
-
+ {{ contact.name }}
+{{ additionalAttributes.description }}
@@ -147,7 +158,7 @@ + + diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue index b9b192e18..2ab51653c 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue @@ -18,14 +18,18 @@
+
+
+
@@ -99,6 +103,31 @@
>
+
+
+ {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON') }}
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
index 735c173ef..740006c59 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
@@ -25,6 +25,7 @@ import CsatTable from './components/CsatTable';
import ReportFilterSelector from './components/FilterSelector';
import { mapGetters } from 'vuex';
import { generateFileName } from '../../../../helper/downloadHelper';
+import { REPORTS_EVENTS } from '../../../../helper/AnalyticsHelper/events';
export default {
name: 'CsatResponses',
@@ -66,6 +67,13 @@ export default {
this.getResponses();
},
onDateRangeChange({ from, to }) {
+ // do not track filter change on inital load
+ if (this.from !== 0 && this.to !== 0) {
+ this.$track(REPORTS_EVENTS.FILTER_REPORT, {
+ filterType: 'date',
+ reportType: 'csat',
+ });
+ }
this.from = from;
this.to = to;
this.getAllData();
@@ -73,6 +81,10 @@ export default {
onAgentsFilterChange(agents) {
this.userIds = agents.map(el => el.id);
this.getAllData();
+ this.$track(REPORTS_EVENTS.FILTER_REPORT, {
+ filterType: 'agent',
+ reportType: 'csat',
+ });
},
downloadReports() {
const type = 'csat';
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
index bc6ac48de..e3d56a7fc 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
@@ -58,6 +58,7 @@ import ReportFilterSelector from './components/FilterSelector';
import { GROUP_BY_FILTER, METRIC_CHART } from './constants';
import reportMixin from '../../../../mixins/reportMixin';
import { formatTime } from '@chatwoot/utils';
+import { REPORTS_EVENTS } from '../../../../helper/AnalyticsHelper/events';
const REPORTS_KEYS = {
CONVERSATIONS: 'conversations_count',
@@ -222,6 +223,13 @@ export default {
this.fetchChartData();
},
onDateRangeChange({ from, to, groupBy }) {
+ // do not track filter change on inital load
+ if (this.from !== 0 && this.to !== 0) {
+ this.$track(REPORTS_EVENTS.FILTER_REPORT, {
+ filterType: 'date',
+ reportType: 'conversations',
+ });
+ }
this.from = from;
this.to = to;
this.filterItemsList = this.fetchFilterItems(groupBy);
@@ -239,6 +247,12 @@ export default {
onFilterChange(payload) {
this.groupBy = GROUP_BY_FILTER[payload.id];
this.fetchAllData();
+
+ this.$track(REPORTS_EVENTS.FILTER_REPORT, {
+ filterType: 'groupBy',
+ filterValue: this.groupBy?.period,
+ reportType: 'conversations',
+ });
},
fetchFilterItems(group_by) {
switch (group_by) {
@@ -255,6 +269,12 @@ export default {
onBusinessHoursToggle(value) {
this.businessHours = value;
this.fetchAllData();
+
+ this.$track(REPORTS_EVENTS.FILTER_REPORT, {
+ filterType: 'businessHours',
+ filterValue: value,
+ reportType: 'conversations',
+ });
},
},
};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
index 098960e85..a28d213ab 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
@@ -62,6 +62,7 @@ import { GROUP_BY_FILTER, METRIC_CHART } from '../constants';
import reportMixin from '../../../../../mixins/reportMixin';
import { formatTime } from '@chatwoot/utils';
import { generateFileName } from '../../../../../helper/downloadHelper';
+import { REPORTS_EVENTS } from '../../../../../helper/AnalyticsHelper/events';
const REPORTS_KEYS = {
CONVERSATIONS: 'conversations_count',
@@ -269,6 +270,14 @@ export default {
this.fetchChartData();
},
onDateRangeChange({ from, to, groupBy }) {
+ // do not track filter change on inital load
+ if (this.from !== 0 && this.to !== 0) {
+ this.$track(REPORTS_EVENTS.FILTER_REPORT, {
+ filterType: 'date',
+ reportType: this.type,
+ });
+ }
+
this.from = from;
this.to = to;
this.groupByfilterItemsList = this.fetchFilterItems(groupBy);
@@ -292,6 +301,12 @@ export default {
onGroupByFilterChange(payload) {
this.groupBy = GROUP_BY_FILTER[payload.id];
this.fetchAllData();
+
+ this.$track(REPORTS_EVENTS.FILTER_REPORT, {
+ filterType: 'groupBy',
+ filterValue: this.groupBy?.period,
+ reportType: this.type,
+ });
},
fetchFilterItems(group_by) {
switch (group_by) {
@@ -308,6 +323,12 @@ export default {
onBusinessHoursToggle(value) {
this.businessHours = value;
this.fetchAllData();
+
+ this.$track(REPORTS_EVENTS.FILTER_REPORT, {
+ filterType: 'businessHours',
+ filterValue: value,
+ reportType: this.type,
+ });
},
},
};
diff --git a/app/javascript/dashboard/routes/index.js b/app/javascript/dashboard/routes/index.js
index 4b59f1d4c..a85b4149e 100644
--- a/app/javascript/dashboard/routes/index.js
+++ b/app/javascript/dashboard/routes/index.js
@@ -42,6 +42,7 @@ const authIgnoreRoutes = [
'auth_confirmation',
'pushBack',
'auth_password_edit',
+ 'oauth-callback',
];
const routeValidators = [
@@ -117,6 +118,7 @@ export const validateRouteAccess = (to, from, next, { getters }) => {
export const initalizeRouter = () => {
const userAuthentication = store.dispatch('setUser');
+
router.beforeEach((to, from, next) => {
AnalyticsHelper.page(to.name || '', {
path: to.path,
diff --git a/app/javascript/dashboard/routes/login/Login.vue b/app/javascript/dashboard/routes/login/Login.vue
index eac42730c..7a04fd2c1 100644
--- a/app/javascript/dashboard/routes/login/Login.vue
+++ b/app/javascript/dashboard/routes/login/Login.vue
@@ -1,6 +1,6 @@
- @@ -216,6 +216,22 @@ }}
+
+
+
+
+
+
- /paricipants' do
+ context 'when it is an unauthenticated user' do
+ it 'returns unauthorized' do
+ get api_v1_account_conversation_participants_url(account_id: account.id, conversation_id: conversation.display_id)
+ expect(response).to have_http_status(:unauthorized)
+ end
+ end
+
+ context 'when it is an authenticated user with access to the conversation' do
+ let(:participant1) { create(:user, account: account, role: :agent) }
+ let(:participant2) { create(:user, account: account, role: :agent) }
+
+ before do
+ create(:inbox_member, inbox: conversation.inbox, user: participant1)
+ create(:inbox_member, inbox: conversation.inbox, user: participant2)
+ end
+
+ it 'returns all the partipants for the conversation' do
+ create(:conversation_participant, conversation: conversation, user: participant1)
+ create(:conversation_participant, conversation: conversation, user: participant2)
+ get api_v1_account_conversation_participants_url(account_id: account.id, conversation_id: conversation.display_id),
+ headers: agent.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(response.body).to include(participant1.email)
+ expect(response.body).to include(participant2.email)
+ end
+ end
+ end
+
+ describe 'POST /api/v1/accounts/{account.id}/conversations//participants' do
+ context 'when it is an unauthenticated user' do
+ it 'returns unauthorized' do
+ post api_v1_account_conversation_participants_url(account_id: account.id, conversation_id: conversation.display_id)
+ expect(response).to have_http_status(:unauthorized)
+ end
+ end
+
+ context 'when it is an authenticated user' do
+ let(:participant) { create(:user, account: account, role: :agent) }
+
+ before do
+ create(:inbox_member, inbox: conversation.inbox, user: participant)
+ end
+
+ it 'creates a new participants when its authorized agent' do
+ params = { user_ids: [participant.id] }
+
+ expect(conversation.conversation_participants.count).to eq(0)
+ post api_v1_account_conversation_participants_url(account_id: account.id, conversation_id: conversation.display_id),
+ params: params,
+ headers: agent.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(response.body).to include(participant.email)
+ expect(conversation.conversation_participants.count).to eq(1)
+ end
+ end
+ end
+
+ describe 'PUT /api/v1/accounts/{account.id}/conversations//participants' do
+ context 'when it is an unauthenticated user' do
+ it 'returns unauthorized' do
+ put api_v1_account_conversation_participants_url(account_id: account.id, conversation_id: conversation.display_id)
+ expect(response).to have_http_status(:unauthorized)
+ end
+ end
+
+ context 'when it is an authenticated user' do
+ let(:participant) { create(:user, account: account, role: :agent) }
+ let(:participant_to_be_added) { create(:user, account: account, role: :agent) }
+ let(:participant_to_be_removed) { create(:user, account: account, role: :agent) }
+
+ before do
+ create(:inbox_member, inbox: conversation.inbox, user: participant)
+ create(:inbox_member, inbox: conversation.inbox, user: participant_to_be_added)
+ create(:inbox_member, inbox: conversation.inbox, user: participant_to_be_removed)
+ end
+
+ it 'updates participants when its authorized agent' do
+ params = { user_ids: [participant.id, participant_to_be_added.id] }
+ create(:conversation_participant, conversation: conversation, user: participant)
+ create(:conversation_participant, conversation: conversation, user: participant_to_be_removed)
+
+ expect(conversation.conversation_participants.count).to eq(2)
+ put api_v1_account_conversation_participants_url(account_id: account.id, conversation_id: conversation.display_id),
+ params: params,
+ headers: agent.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(response.body).to include(participant.email)
+ expect(response.body).to include(participant_to_be_added.email)
+ expect(conversation.conversation_participants.count).to eq(2)
+ end
+ end
+ end
+
+ describe 'DELETE /api/v1/accounts/{account.id}/conversations//participants' do
+ context 'when it is an unauthenticated user' do
+ it 'returns unauthorized' do
+ delete api_v1_account_conversation_participants_url(account_id: account.id, conversation_id: conversation.display_id)
+ expect(response).to have_http_status(:unauthorized)
+ end
+ end
+
+ context 'when it is an authenticated user' do
+ let(:participant) { create(:user, account: account, role: :agent) }
+
+ before do
+ create(:inbox_member, inbox: conversation.inbox, user: participant)
+ end
+
+ it 'deletes participants when its authorized agent' do
+ params = { user_ids: [participant.id] }
+ create(:conversation_participant, conversation: conversation, user: participant)
+
+ expect(conversation.conversation_participants.count).to eq(1)
+ delete api_v1_account_conversation_participants_url(account_id: account.id, conversation_id: conversation.display_id),
+ params: params,
+ headers: agent.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(conversation.conversation_participants.count).to eq(0)
+ end
+ end
+ end
+end
diff --git a/spec/controllers/api/v1/accounts/macros_controller_spec.rb b/spec/controllers/api/v1/accounts/macros_controller_spec.rb
index 77229afaa..7fbe6b54e 100644
--- a/spec/controllers/api/v1/accounts/macros_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/macros_controller_spec.rb
@@ -278,7 +278,7 @@ RSpec.describe 'Api::V1::Accounts::MacrosController', type: :request do
{ 'action_name' => 'snooze_conversation' },
{ 'action_name' => 'assign_agent', 'action_params' => [user_1.id] },
{ 'action_name' => 'send_message', 'action_params' => ['Send this message.'] },
- { 'action_name' => 'add_private_note', 'action_params': ['We are sending greeting message to customer.'] }
+ { 'action_name' => 'add_private_note', :action_params => ['We are sending greeting message to customer.'] }
])
end
diff --git a/spec/controllers/api/v1/accounts/portals_controller_spec.rb b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
index 8f10b6b60..2875f1a29 100644
--- a/spec/controllers/api/v1/accounts/portals_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
@@ -86,15 +86,12 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
context 'when it is an authenticated user' do
it 'creates portal' do
- file = fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png')
-
portal_params = {
portal: {
name: 'test_portal',
slug: 'test_kbase',
custom_domain: 'https://support.chatwoot.dev'
- },
- logo: file
+ }
}
post "/api/v1/accounts/#{account.id}/portals",
params: portal_params,
@@ -103,7 +100,6 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
expect(response).to have_http_status(:success)
json_response = JSON.parse(response.body)
expect(json_response['name']).to eql('test_portal')
- expect(json_response['logo']['filename']).to eql('avatar.png')
expect(json_response['custom_domain']).to eql('support.chatwoot.dev')
end
end
@@ -214,4 +210,33 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
end
end
end
+
+ describe 'POST /api/v1/accounts/{account.id}/portals/attach_file' do
+ it 'update the portal with a logo' do
+ file = fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png')
+
+ post "/api/v1/accounts/#{account.id}/portals/attach_file",
+ headers: admin.create_new_auth_token,
+ params: { logo: file }
+
+ expect(response).to have_http_status(:success)
+
+ blob = JSON.parse(response.body)
+
+ expect(blob['blob_key']).to be_present
+ expect(blob['blob_id']).to be_present
+
+ params = { blob_id: blob['blob_id'] }
+
+ expect(portal.logo.attachment).not_to be_present
+
+ patch "/api/v1/accounts/#{account.id}/portals/#{portal.slug}",
+ headers: admin.create_new_auth_token,
+ params: params
+ portal.reload
+
+ expect(portal.logo.presence).to be_truthy
+ expect(portal.logo.attachment).to be_present
+ end
+ end
end
diff --git a/spec/controllers/api/v1/accounts/webhook_controller_spec.rb b/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
index aeea4d45f..ae1adfa77 100644
--- a/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
@@ -84,8 +84,8 @@ RSpec.describe 'Webhooks API', type: :request do
expect(response).to have_http_status(:ok)
expect(
JSON.parse(response.body)['payload']['webhook']['subscriptions']
- ).to eql %w[conversation_status_changed conversation_updated conversation_created message_created message_updated
- webwidget_triggered]
+ ).to eql %w[conversation_status_changed conversation_updated conversation_created contact_created contact_updated
+ message_created message_updated webwidget_triggered]
end
end
end
diff --git a/spec/controllers/api/v2/accounts/report_controller_spec.rb b/spec/controllers/api/v2/accounts/report_controller_spec.rb
index 134a61220..1d5be3592 100644
--- a/spec/controllers/api/v2/accounts/report_controller_spec.rb
+++ b/spec/controllers/api/v2/accounts/report_controller_spec.rb
@@ -111,11 +111,11 @@ RSpec.describe 'Reports API', type: :request do
context 'when an agent1 associated to conversation having first reply from agent2' do
let(:listener) { ReportingEventListener.instance }
let(:account) { create(:account) }
- let(:admin) { create(:user, account: account, role: :administrator) }
+ let(:agent2) { create(:user, account: account, role: :agent) }
it 'returns unattended conversation count zero for agent1' do
- agent1 = create(:user, account: account, role: :agent)
- agent2 = create(:user, account: account, role: :agent)
+ create(:inbox_member, user: agent, inbox: inbox)
+ create(:inbox_member, user: agent2, inbox: inbox)
conversation = create(:conversation, account: account,
inbox: inbox, assignee: agent2)
@@ -129,7 +129,7 @@ RSpec.describe 'Reports API', type: :request do
event = Events::Base.new('first.reply.created', Time.zone.now, message: first_reply_message)
listener.first_reply_created(event)
- conversation.assignee_id = agent1.id
+ conversation.assignee_id = agent.id
conversation.save!
get "/api/v2/accounts/#{account.id}/reports/conversations",
@@ -140,7 +140,7 @@ RSpec.describe 'Reports API', type: :request do
as: :json
json_response = JSON.parse(response.body)
- user_metrics = json_response.find { |item| item['name'] == agent1[:name] }
+ user_metrics = json_response.find { |item| item['name'] == agent[:name] }
expect(user_metrics.present?).to be true
expect(user_metrics['metric']['open']).to eq(1)
diff --git a/spec/controllers/api_controller_spec.rb b/spec/controllers/api_controller_spec.rb
index b2948e28a..dc8d2ee66 100644
--- a/spec/controllers/api_controller_spec.rb
+++ b/spec/controllers/api_controller_spec.rb
@@ -6,6 +6,8 @@ RSpec.describe 'API Base', type: :request do
get '/api/'
expect(response).to have_http_status(:success)
expect(response.body).to include(Chatwoot.config[:version])
+ expect(response.body).to include('queue_services')
+ expect(response.body).to include('data_services')
end
end
end
diff --git a/spec/controllers/devise/omniauth_callbacks_controller_spec.rb b/spec/controllers/devise/omniauth_callbacks_controller_spec.rb
new file mode 100644
index 000000000..b6c5cd781
--- /dev/null
+++ b/spec/controllers/devise/omniauth_callbacks_controller_spec.rb
@@ -0,0 +1,110 @@
+require 'rails_helper'
+
+RSpec.describe 'DeviseOverrides::OmniauthCallbacksController', type: :request do
+ let(:account_builder) { double }
+ let(:user_double) { object_double(:user) }
+
+ def set_omniauth_config(for_email = 'test@example.com')
+ OmniAuth.config.test_mode = true
+ OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new(
+ provider: 'google',
+ uid: '123545',
+ info: {
+ name: 'test',
+ email: for_email,
+ image: 'https://example.com/image.jpg'
+ }
+ )
+ end
+
+ describe '#omniauth_sucess' do
+ it 'allows signup' do
+ with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
+ set_omniauth_config('test_not_preset@example.com')
+ allow(AccountBuilder).to receive(:new).and_return(account_builder)
+ allow(account_builder).to receive(:perform).and_return(user_double)
+ allow(Avatar::AvatarFromUrlJob).to receive(:perform_later).and_return(true)
+
+ get '/omniauth/google_oauth2/callback'
+
+ # expect a 302 redirect to auth/google_oauth2/callback
+ expect(response).to redirect_to('http://www.example.com/auth/google_oauth2/callback')
+ follow_redirect!
+
+ expect(AccountBuilder).to have_received(:new).with({
+ account_name: 'example',
+ user_full_name: 'test',
+ email: 'test_not_preset@example.com',
+ locale: I18n.locale,
+ confirmed: nil
+ })
+ expect(account_builder).to have_received(:perform)
+ end
+ end
+
+ it 'blocks personal accounts signup' do
+ with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
+ set_omniauth_config('personal@gmail.com')
+ get '/omniauth/google_oauth2/callback'
+
+ # expect a 302 redirect to auth/google_oauth2/callback
+ expect(response).to redirect_to('http://www.example.com/auth/google_oauth2/callback')
+ follow_redirect!
+
+ # expect a 302 redirect to app/login with error disallowing personal accounts
+ expect(response).to redirect_to(%r{/app/login\?error=business-account-only$})
+ end
+ end
+
+ # This test does not affect line coverage, but it is important to ensure that the logic
+ # does not allow any signup if the ENV explicitly disables it
+ it 'blocks signup if ENV disabled' do
+ with_modified_env ENABLE_ACCOUNT_SIGNUP: 'false' do
+ set_omniauth_config('does-not-exist-for-sure@example.com')
+ get '/omniauth/google_oauth2/callback'
+
+ # expect a 302 redirect to auth/google_oauth2/callback
+ expect(response).to redirect_to('http://www.example.com/auth/google_oauth2/callback')
+ follow_redirect!
+
+ # expect a 302 redirect to app/login with error disallowing signup
+ expect(response).to redirect_to(%r{/app/login\?error=no-account-found$})
+ end
+ end
+
+ it 'allows login' do
+ create(:user, email: 'test@example.com')
+ set_omniauth_config('test@example.com')
+
+ get '/omniauth/google_oauth2/callback'
+ # expect a 302 redirect to auth/google_oauth2/callback
+ expect(response).to redirect_to('http://www.example.com/auth/google_oauth2/callback')
+
+ follow_redirect!
+ expect(response).to redirect_to(%r{/app/login\?email=.+&sso_auth_token=.+$})
+
+ # expect app/login page to respond with 200 and render
+ follow_redirect!
+ expect(response).to have_http_status(:ok)
+ end
+
+ # from a line coverage point of view this may seem redundant
+ # but to ensure that the logic allows for existing users even if they have a gmail account
+ # we need to test this explicitly
+ it 'allows personal account login' do
+ create(:user, email: 'personal-existing@gmail.com')
+ set_omniauth_config('personal-existing@gmail.com')
+
+ get '/omniauth/google_oauth2/callback'
+ # expect a 302 redirect to auth/google_oauth2/callback
+ expect(response).to redirect_to('http://www.example.com/auth/google_oauth2/callback')
+
+ follow_redirect!
+ expect(response).to redirect_to(%r{/app/login\?email=.+&sso_auth_token=.+$})
+
+ # expect app/login page to respond with 200 and render
+ follow_redirect!
+ expect(response).to have_http_status(:ok)
+ end
+ end
+end
diff --git a/spec/controllers/microsoft_controller_spec.rb b/spec/controllers/microsoft_controller_spec.rb
new file mode 100644
index 000000000..c4b97cc13
--- /dev/null
+++ b/spec/controllers/microsoft_controller_spec.rb
@@ -0,0 +1,17 @@
+require 'rails_helper'
+
+describe '/.well-known/microsoft-identity-association.json', type: :request do
+ describe 'GET /.well-known/microsoft-identity-association.json' do
+ it 'successfully retrieves assetlinks.json file' do
+ with_modified_env AZURE_APP_ID: 'azure-application-client-id' do
+ get '/.well-known/microsoft-identity-association.json'
+ expect(response).to have_http_status(:success)
+ expect(response.body).to include '"applicationId":"azure-application-client-id"'
+
+ content_length = { associatedApplications: [{ applicationId: 'azure-application-client-id' }] }.to_json.length
+
+ expect(response.headers['Content-Length']).to eq(content_length.to_s)
+ end
+ end
+ end
+end
diff --git a/spec/controllers/public/api/v1/portals/articles_controller_spec.rb b/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
index 53c455c1b..0f074ea29 100644
--- a/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
+++ b/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
@@ -41,8 +41,8 @@ RSpec.describe 'Public Articles API', type: :request do
describe 'GET /public/api/v1/portals/:slug/articles/:id' do
it 'Fetch article with the id' do
get "/hc/#{portal.slug}/#{category.locale}/#{category.slug}/#{article.id}"
-
expect(response).to have_http_status(:success)
+ expect(article.reload.views).to eq 1
end
end
end
diff --git a/spec/controllers/super_admin/instance_statuses_controller_spec.rb b/spec/controllers/super_admin/instance_statuses_controller_spec.rb
new file mode 100644
index 000000000..b2b1237f9
--- /dev/null
+++ b/spec/controllers/super_admin/instance_statuses_controller_spec.rb
@@ -0,0 +1,25 @@
+require 'rails_helper'
+
+RSpec.describe 'Super Admin Instance health', type: :request do
+ let(:super_admin) { create(:super_admin) }
+
+ describe 'GET /super_admin/instance_status' do
+ context 'when it is an unauthenticated super admin' do
+ it 'returns unauthorized' do
+ get '/super_admin/instance_status'
+ expect(response).to have_http_status(:redirect)
+ end
+ end
+
+ context 'when it is an authenticated super admin' do
+ it 'shows the instance_status page' do
+ sign_in(super_admin, scope: :super_admin)
+ get '/super_admin/instance_status'
+ expect(response).to have_http_status(:success)
+ expect(response.body).to include('Chatwoot version')
+ sha = `git rev-parse HEAD`
+ expect(response.body).to include(sha)
+ end
+ end
+ end
+end
diff --git a/spec/factories/articles.rb b/spec/factories/articles.rb
index ec9c4cd2d..e68ed8f4b 100644
--- a/spec/factories/articles.rb
+++ b/spec/factories/articles.rb
@@ -7,6 +7,6 @@ FactoryBot.define do
content { 'MyText' }
description { 'MyDescrption' }
status { 1 }
- views { 1 }
+ views { 0 }
end
end
diff --git a/spec/factories/conversation_participants.rb b/spec/factories/conversation_participants.rb
new file mode 100644
index 000000000..9b10d2fe5
--- /dev/null
+++ b/spec/factories/conversation_participants.rb
@@ -0,0 +1,13 @@
+FactoryBot.define do
+ factory :conversation_participant do
+ conversation
+ account
+
+ before(:build) do |conversation|
+ if conversation.user.blank?
+ conversation.user = create(:user, account: conversation.account)
+ create(:inbox_member, user: conversation.user, inbox: conversation.conversation.inbox)
+ end
+ end
+ end
+end
diff --git a/spec/factories/twitter/twitter_message_create_event.rb b/spec/factories/twitter/twitter_message_create_event.rb
index 35cd735cd..79c7bd693 100644
--- a/spec/factories/twitter/twitter_message_create_event.rb
+++ b/spec/factories/twitter/twitter_message_create_event.rb
@@ -8,7 +8,7 @@ FactoryBot.define do
'type' => 'message_create',
'id' => '123',
'message_create' => {
- target: { 'recipient_id' => '1' },
+ :target => { 'recipient_id' => '1' },
'sender_id' => '2',
'source_app_id' => '268278',
'message_data' => {
diff --git a/spec/factories/webhooks.rb b/spec/factories/webhooks.rb
index b49434fce..42acc2be6 100644
--- a/spec/factories/webhooks.rb
+++ b/spec/factories/webhooks.rb
@@ -8,6 +8,8 @@ FactoryBot.define do
conversation_status_changed
conversation_updated
conversation_created
+ contact_created
+ contact_updated
message_created
message_updated
webwidget_triggered
diff --git a/spec/jobs/bulk_actions_job_spec.rb b/spec/jobs/bulk_actions_job_spec.rb
index 80784a6db..2051c69b2 100644
--- a/spec/jobs/bulk_actions_job_spec.rb
+++ b/spec/jobs/bulk_actions_job_spec.rb
@@ -15,6 +15,12 @@ RSpec.describe BulkActionsJob, type: :job do
let!(:conversation_2) { create(:conversation, account_id: account.id, status: :open) }
let!(:conversation_3) { create(:conversation, account_id: account.id, status: :open) }
+ before do
+ Conversation.all.each do |conversation|
+ create(:inbox_member, inbox: conversation.inbox, user: agent)
+ end
+ end
+
it 'enqueues the job' do
expect { job }.to have_enqueued_job(described_class)
.with(account: account, params: params, user: agent)
diff --git a/spec/jobs/conversations/resolution_job_spec.rb b/spec/jobs/conversations/resolution_job_spec.rb
index 0482f8bbf..4ed26c1d0 100644
--- a/spec/jobs/conversations/resolution_job_spec.rb
+++ b/spec/jobs/conversations/resolution_job_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Conversations::ResolutionJob, type: :job do
it 'enqueues the job' do
expect { job }.to have_enqueued_job(described_class)
.with(account)
- .on_queue('medium')
+ .on_queue('low')
end
it 'does nothing when there is no auto resolve duration' do
@@ -23,4 +23,12 @@ RSpec.describe Conversations::ResolutionJob, type: :job do
described_class.perform_now(account: account)
expect(conversation.reload.status).to eq('resolved')
end
+
+ it 'resolved only a limited number of conversations in a single execution' do
+ stub_const('Limits::BULK_ACTIONS_LIMIT', 2)
+ account.update(auto_resolve_duration: 10)
+ create_list(:conversation, 3, account: account, last_activity_at: 13.days.ago)
+ described_class.perform_now(account: account)
+ expect(account.conversations.resolved.count).to eq(Limits::BULK_ACTIONS_LIMIT)
+ end
end
diff --git a/spec/jobs/webhooks/line_events_job_spec.rb b/spec/jobs/webhooks/line_events_job_spec.rb
index 10da5602a..e8d69939e 100644
--- a/spec/jobs/webhooks/line_events_job_spec.rb
+++ b/spec/jobs/webhooks/line_events_job_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Webhooks::LineEventsJob, type: :job do
subject(:job) { described_class.perform_later(params: params) }
let!(:line_channel) { create(:channel_line) }
- let!(:params) { { line_channel_id: line_channel.line_channel_id, 'line' => { test: 'test' } } }
+ let!(:params) { { :line_channel_id => line_channel.line_channel_id, 'line' => { test: 'test' } } }
let(:post_body) { params.to_json }
let(:signature) { Base64.strict_encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new('SHA256'), line_channel.line_channel_secret, post_body)) }
diff --git a/spec/jobs/webhooks/telegram_events_job_spec.rb b/spec/jobs/webhooks/telegram_events_job_spec.rb
index 9f45955e6..815b7e9dc 100644
--- a/spec/jobs/webhooks/telegram_events_job_spec.rb
+++ b/spec/jobs/webhooks/telegram_events_job_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Webhooks::TelegramEventsJob, type: :job do
subject(:job) { described_class.perform_later(params) }
let!(:telegram_channel) { create(:channel_telegram) }
- let!(:params) { { bot_token: telegram_channel.bot_token, 'telegram' => { test: 'test' } } }
+ let!(:params) { { :bot_token => telegram_channel.bot_token, 'telegram' => { test: 'test' } } }
it 'enqueues the job' do
expect { job }.to have_enqueued_job(described_class)
diff --git a/spec/jobs/webhooks/whatsapp_events_job_spec.rb b/spec/jobs/webhooks/whatsapp_events_job_spec.rb
index e4e06b5da..8dddd9fb4 100644
--- a/spec/jobs/webhooks/whatsapp_events_job_spec.rb
+++ b/spec/jobs/webhooks/whatsapp_events_job_spec.rb
@@ -95,33 +95,6 @@ RSpec.describe Webhooks::WhatsappEventsJob, type: :job do
end.not_to change(Message, :count)
end
- it 'Ignore contacts type message and stop raising error' do
- other_channel = create(:channel_whatsapp, phone_number: '+1987654', provider: 'whatsapp_cloud', sync_templates: false,
- validate_provider_config: false)
- wb_params = {
- phone_number: channel.phone_number,
- object: 'whatsapp_business_account',
- entry: [{
- changes: [{
- value: {
- contacts: [{ profile: { name: 'Test Test' }, wa_id: '1111981136571' }],
- messages: [{ from: '1111981136571',
- contacts: [{ phones: [{ phone: '+1987654' }], name: { first_name: 'contact name' } }],
- timestamp: '1664799904',
- type: 'contacts' }],
- metadata: {
- phone_number_id: other_channel.provider_config['phone_number_id'],
- display_phone_number: other_channel.phone_number.delete('+')
- }
- }
- }]
- }]
- }.with_indifferent_access
- expect do
- Whatsapp::IncomingMessageWhatsappCloudService.new(inbox: other_channel.inbox, params: wb_params).perform
- end.not_to change(Message, :count)
- end
-
it 'will not enque Whatsapp::IncomingMessageWhatsappCloudService when invalid phone number id' do
other_channel = create(:channel_whatsapp, phone_number: '+1987654', provider: 'whatsapp_cloud', sync_templates: false,
validate_provider_config: false)
diff --git a/spec/lib/integrations/slack/send_on_slack_service_spec.rb b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
index e9806d174..5945fd0d5 100644
--- a/spec/lib/integrations/slack/send_on_slack_service_spec.rb
+++ b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
@@ -2,7 +2,8 @@ require 'rails_helper'
describe Integrations::Slack::SendOnSlackService do
let!(:contact) { create(:contact) }
- let!(:conversation) { create(:conversation, contact: contact, identifier: nil) }
+ let(:channel_email) { create(:channel_email) }
+ let!(:conversation) { create(:conversation, inbox: channel_email.inbox, contact: contact, identifier: nil) }
let(:account) { conversation.account }
let!(:hook) { create(:integrations_hook, account: account) }
let!(:message) do
@@ -38,6 +39,32 @@ describe Integrations::Slack::SendOnSlackService do
expect(conversation.reload.identifier).to eq '12345.6789'
end
+
+ context 'with subject line in email' do
+ let(:message) do
+ create(:message,
+ content_attributes: { 'email': { 'subject': 'Sample subject line' } },
+ content: 'Sample Body',
+ account: conversation.account,
+ inbox: conversation.inbox, conversation: conversation)
+ end
+
+ it 'creates slack message with subject line' do
+ inbox = conversation.inbox
+
+ expect(slack_client).to receive(:chat_postMessage).with(
+ channel: hook.reference_id,
+ text: "\n*Inbox:* #{inbox.name} (#{inbox.inbox_type})\n*Subject:* Sample subject line\n\n\n#{message.content}",
+ username: "#{message.sender.name} (Contact)",
+ thread_ts: nil,
+ icon_url: anything
+ ).and_return(slack_message)
+
+ builder.perform
+
+ expect(conversation.reload.identifier).to eq '12345.6789'
+ end
+ end
end
context 'with identifier' do
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index 1da7225bd..0517f99d6 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -420,6 +420,70 @@ describe AutomationRuleListener do
end
end
+ describe '#conversation_opened' do
+ before do
+ conversation.update!(status: :open, team_id: team.id)
+ automation_rule.update!(
+ event_name: 'conversation_opened',
+ name: 'Call actions conversation opened',
+ description: 'Add labels, assign team after conversation updated',
+ conditions: [{ attribute_key: 'team_id', filter_operator: 'equal_to', values: [team.id], query_operator: nil }.with_indifferent_access]
+ )
+ end
+
+ let!(:event) do
+ Events::Base.new('conversation_opened', Time.zone.now, { conversation: conversation.reload })
+ end
+
+ context 'when rule matches' do
+ it 'triggers automation rule to add label' do
+ expect(conversation.labels).to eq([])
+ listener.conversation_opened(event)
+ conversation.reload
+
+ expect(conversation.labels.pluck(:name)).to contain_exactly('support', 'priority_customer')
+ end
+
+ it 'triggers automation rule to assign best agents' do
+ expect(conversation.assignee).to be_nil
+ listener.conversation_opened(event)
+ conversation.reload
+
+ expect(conversation.assignee).to eq(user_1)
+ end
+
+ it 'triggers automation rule send email transcript to the mentioned email' do
+ mailer = double
+ expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
+ listener.conversation_opened(event)
+ conversation.reload
+
+ allow(mailer).to receive(:conversation_transcript)
+ end
+
+ it 'triggers automation rule send email to the team' do
+ message_delivery = instance_double(ActionMailer::MessageDelivery)
+
+ expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation).with(
+ conversation, team,
+ 'Please pay attention to this conversation, its from high priority customer'
+ ).and_return(message_delivery)
+ allow(message_delivery).to receive(:deliver_now)
+
+ listener.conversation_opened(event)
+ end
+
+ it 'triggers automation rule send message to the contacts' do
+ expect(conversation.messages).to be_empty
+ expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
+ listener.conversation_opened(event)
+ conversation.reload
+
+ expect(conversation.messages.first.content).to eq('Send this message.')
+ end
+ end
+ end
+
describe '#message_created event based on case in-sensitive filter' do
before do
automation_rule.update!(
diff --git a/spec/listeners/notification_listener_spec.rb b/spec/listeners/notification_listener_spec.rb
index e581e9ac6..4eb82d6f0 100644
--- a/spec/listeners/notification_listener_spec.rb
+++ b/spec/listeners/notification_listener_spec.rb
@@ -4,7 +4,6 @@ describe NotificationListener do
let!(:account) { create(:account) }
let!(:user) { create(:user, account: account) }
let!(:first_agent) { create(:user, account: account) }
- let!(:second_agent) { create(:user, account: account) }
let!(:agent_with_out_notification) { create(:user, account: account) }
let!(:inbox) { create(:inbox, account: account) }
let!(:conversation) { create(:conversation, account: account, inbox: inbox, assignee: user) }
@@ -55,68 +54,50 @@ describe NotificationListener do
notification_setting.save!
end
- context 'when message contains mention' do
- it 'creates notifications for inbox member who was mentioned' do
- builder = double
- allow(NotificationBuilder).to receive(:new).and_return(builder)
- allow(builder).to receive(:perform)
+ it 'will call mention service' do
+ mention_service = instance_double(Messages::MentionService)
+ allow(Messages::MentionService).to receive(:new).and_return(mention_service)
+ allow(mention_service).to receive(:perform)
- create(:inbox_member, user: first_agent, inbox: inbox)
- conversation.reload
+ create(:inbox_member, user: first_agent, inbox: inbox)
+ conversation.reload
- message = build(
- :message,
- conversation: conversation,
- account: account,
- content: "hi [#{first_agent.name}](mention://user/#{first_agent.id}/#{first_agent.name})",
- private: true
- )
+ message = build(
+ :message,
+ conversation: conversation,
+ account: account,
+ content: "hi [#{first_agent.name}](mention://user/#{first_agent.id}/#{first_agent.name})",
+ private: true
+ )
- event = Events::Base.new(event_name, Time.zone.now, message: message)
- listener.message_created(event)
-
- expect(NotificationBuilder).to have_received(:new).with(notification_type: 'conversation_mention',
- user: first_agent,
- account: account,
- primary_actor: message)
- end
+ expect(mention_service).to receive(:perform)
+ event = Events::Base.new(event_name, Time.zone.now, message: message)
+ listener.message_created(event)
end
- context 'when message contains multiple mentions' do
- it 'creates notifications for inbox member who was mentioned' do
- builder = double
- allow(NotificationBuilder).to receive(:new).and_return(builder)
- allow(builder).to receive(:perform)
- create(:inbox_member, user: first_agent, inbox: inbox)
- create(:inbox_member, user: second_agent, inbox: inbox)
- conversation.reload
+ it 'will call new message notification service' do
+ notification_service = instance_double(Messages::NewMessageNotificationService)
+ allow(Messages::NewMessageNotificationService).to receive(:new).and_return(notification_service)
+ allow(notification_service).to receive(:perform)
- message = build(
- :message,
- conversation: conversation,
- account: account,
- content: "hey [#{second_agent.name}](mention://user/#{second_agent.id}/#{second_agent.name})/
- [#{first_agent.name}](mention://user/#{first_agent.id}/#{first_agent.name}),
- please look in to this?",
- private: true
- )
+ create(:inbox_member, user: first_agent, inbox: inbox)
+ conversation.reload
- event = Events::Base.new(event_name, Time.zone.now, message: message)
- listener.message_created(event)
+ message = build(
+ :message,
+ conversation: conversation,
+ account: account,
+ content: 'hi',
+ private: true
+ )
- expect(NotificationBuilder).to have_received(:new).with(notification_type: 'conversation_mention',
- user: second_agent,
- account: account,
- primary_actor: message)
- expect(NotificationBuilder).to have_received(:new).with(notification_type: 'conversation_mention',
- user: first_agent,
- account: account,
- primary_actor: message)
- end
+ expect(notification_service).to receive(:perform)
+ event = Events::Base.new(event_name, Time.zone.now, message: message)
+ listener.message_created(event)
end
context 'when message content is empty' do
- it 'creates notifications' do
+ it 'will be processed correctly' do
builder = double
allow(NotificationBuilder).to receive(:new).and_return(builder)
allow(builder).to receive(:perform)
@@ -134,7 +115,7 @@ describe NotificationListener do
event = Events::Base.new(event_name, Time.zone.now, message: message)
# want to validate message_created doesnt throw an error
- expect(listener.message_created(event)).to be_nil
+ expect { listener.message_created(event) }.not_to raise_error
end
end
end
diff --git a/spec/listeners/webhook_listener_spec.rb b/spec/listeners/webhook_listener_spec.rb
index 5dac1a8ec..f1a39d932 100644
--- a/spec/listeners/webhook_listener_spec.rb
+++ b/spec/listeners/webhook_listener_spec.rb
@@ -5,6 +5,7 @@ describe WebhookListener do
let(:report_identity) { Reports::UpdateAccountIdentity.new(account, Time.zone.now) }
let!(:user) { create(:user, account: account) }
let!(:inbox) { create(:inbox, account: account) }
+ let!(:contact) { create(:contact, account: account) }
let!(:conversation) { create(:conversation, account: account, inbox: inbox, assignee: user) }
let!(:message) do
create(:message, message_type: 'outgoing',
@@ -12,6 +13,7 @@ describe WebhookListener do
end
let!(:message_created_event) { Events::Base.new(event_name, Time.zone.now, message: message) }
let!(:conversation_created_event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation) }
+ let!(:contact_event) { Events::Base.new(event_name, Time.zone.now, contact: contact) }
describe '#message_created' do
let(:event_name) { :'message.created' }
@@ -159,4 +161,60 @@ describe WebhookListener do
end
end
end
+
+ describe '#contact_created' do
+ let(:event_name) { :'contact.created' }
+
+ context 'when webhook is not configured' do
+ it 'does not trigger webhook' do
+ expect(WebhookJob).to receive(:perform_later).exactly(0).times
+ listener.contact_created(contact_event)
+ end
+ end
+
+ context 'when webhook is configured' do
+ it 'triggers webhook' do
+ webhook = create(:webhook, account: account)
+ expect(WebhookJob).to receive(:perform_later).with(webhook.url, contact.webhook_data.merge(event: 'contact_created')).once
+ listener.contact_created(contact_event)
+ end
+ end
+ end
+
+ describe '#contact_updated' do
+ let(:event_name) { :'contact.updated' }
+ let!(:contact_updated_event) { Events::Base.new(event_name, Time.zone.now, contact: contact, changed_attributes: changed_attributes) }
+ let(:changed_attributes) { { 'name' => ['Jane', 'Jane Doe'] } }
+
+ context 'when webhook is not configured' do
+ it 'does not trigger webhook' do
+ expect(WebhookJob).to receive(:perform_later).exactly(0).times
+ listener.contact_updated(contact_updated_event)
+ end
+ end
+
+ context 'when webhook is configured and there is no changed attributes' do
+ let(:changed_attributes) { {} }
+
+ it 'triggers webhook' do
+ create(:webhook, account: account)
+ expect(WebhookJob).to receive(:perform_later).exactly(0).times
+ listener.contact_updated(contact_updated_event)
+ end
+ end
+
+ context 'when webhook is configured and there are changed attributes' do
+ it 'triggers webhook' do
+ webhook = create(:webhook, account: account)
+ expect(WebhookJob).to receive(:perform_later).with(
+ webhook.url,
+ contact.webhook_data.merge(
+ event: 'contact_updated',
+ changed_attributes: [{ 'name' => { :current_value => 'Jane Doe', :previous_value => 'Jane' } }]
+ )
+ ).once
+ listener.contact_updated(contact_updated_event)
+ end
+ end
+ end
end
diff --git a/spec/mailers/agent_notifications/conversation_notifications_mailer_spec.rb b/spec/mailers/agent_notifications/conversation_notifications_mailer_spec.rb
index a4e00204d..6b102d566 100644
--- a/spec/mailers/agent_notifications/conversation_notifications_mailer_spec.rb
+++ b/spec/mailers/agent_notifications/conversation_notifications_mailer_spec.rb
@@ -87,4 +87,22 @@ RSpec.describe AgentNotifications::ConversationNotificationsMailer, type: :maile
expect(mail).to be_nil
end
end
+
+ describe 'participating_conversation_new_message' do
+ let(:message) { create(:message, conversation: conversation, account: account) }
+ let(:mail) { described_class.with(account: account).participating_conversation_new_message(message, agent).deliver_now }
+
+ it 'renders the subject' do
+ expect(mail.subject).to eq("#{agent.available_name}, New message in your participating conversation [ID - #{message.conversation.display_id}].")
+ end
+
+ it 'renders the receiver email' do
+ expect(mail.to).to eq([agent.email])
+ end
+
+ it 'will not send email if agent is online' do
+ ::OnlineStatusTracker.update_presence(conversation.account.id, 'User', agent.id)
+ expect(mail).to be_nil
+ end
+ end
end
diff --git a/spec/models/attachment_spec.rb b/spec/models/attachment_spec.rb
index 9201a2540..bd82b2c2f 100644
--- a/spec/models/attachment_spec.rb
+++ b/spec/models/attachment_spec.rb
@@ -25,7 +25,6 @@ RSpec.describe Attachment, type: :model do
it 'returns external url as data and thumb urls' do
external_url = instagram_message.attachments.first.external_url
expect(instagram_message.attachments.first.push_event_data[:data_url]).to eq external_url
- expect(instagram_message.attachments.first.push_event_data[:thumb_url]).to eq external_url
end
end
end
diff --git a/spec/models/channel/facebook_page_spec.rb b/spec/models/channel/facebook_page_spec.rb
index f0f0e036e..5f1374afe 100644
--- a/spec/models/channel/facebook_page_spec.rb
+++ b/spec/models/channel/facebook_page_spec.rb
@@ -30,6 +30,42 @@ RSpec.describe Channel::FacebookPage do
channel.prompt_reauthorization!
end
end
+
+ context 'when fetch instagram story' do
+ let!(:account) { create(:account) }
+ let!(:instagram_channel) { create(:channel_instagram_fb_page, account: account, instagram_id: 'chatwoot-app-user-id-1') }
+ let!(:instagram_inbox) { create(:inbox, channel: instagram_channel, account: account, greeting_enabled: false) }
+ let(:fb_object) { double }
+ let(:message) { create(:message, inbox_id: instagram_inbox.id) }
+ let(:instagram_message) { create(:message, :instagram_story_mention, inbox_id: instagram_inbox.id) }
+
+ it '#fetch_instagram_story_link' do
+ allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
+ allow(fb_object).to receive(:get_object).and_return(
+ { story:
+ {
+ mention: {
+ link: 'https://www.example.com/test.jpeg',
+ id: '17920786367196703'
+ }
+ },
+ from: {
+ username: 'Sender-id-1', id: 'Sender-id-1'
+ },
+ id: 'instagram-message-id-1234' }.with_indifferent_access
+ )
+ story_link = instagram_channel.fetch_instagram_story_link(message)
+ expect(story_link).to eq('https://www.example.com/test.jpeg')
+ end
+
+ it '#delete_instagram_story' do
+ expect(instagram_message.attachments.count).to eq(1)
+
+ instagram_channel.delete_instagram_story(instagram_message)
+
+ expect(instagram_message.attachments.count).to eq(0)
+ end
+ end
end
it 'has a valid name' do
diff --git a/spec/models/concerns/assignment_handler_shared.rb b/spec/models/concerns/assignment_handler_shared.rb
index 816351248..55951cd99 100644
--- a/spec/models/concerns/assignment_handler_shared.rb
+++ b/spec/models/concerns/assignment_handler_shared.rb
@@ -73,6 +73,10 @@ shared_examples_for 'assignment_handler' do
end
let(:assignment_mailer) { instance_double(AgentNotifications::ConversationNotificationsMailer, deliver: true) }
+ before do
+ create(:inbox_member, user: agent, inbox: conversation.inbox)
+ end
+
it 'assigns the agent to conversation' do
expect(update_assignee).to be(true)
expect(conversation.reload.assignee).to eq(agent)
@@ -85,6 +89,10 @@ shared_examples_for 'assignment_handler' do
expect(update_assignee).to be(true)
end
+ it 'adds assignee to conversation participants' do
+ expect { update_assignee }.to change { conversation.conversation_participants.count }.by(1)
+ end
+
context 'when agent is current user' do
before do
Current.user = agent
diff --git a/spec/models/conversation_participants_spec.rb b/spec/models/conversation_participants_spec.rb
new file mode 100644
index 000000000..6e0fe7504
--- /dev/null
+++ b/spec/models/conversation_participants_spec.rb
@@ -0,0 +1,32 @@
+require 'rails_helper'
+
+RSpec.describe ConversationParticipant, type: :model do
+ context 'with validations' do
+ it { is_expected.to validate_presence_of(:account_id) }
+ it { is_expected.to validate_presence_of(:conversation_id) }
+ it { is_expected.to validate_presence_of(:user_id) }
+ end
+
+ describe 'associations' do
+ it { is_expected.to belong_to(:account) }
+ it { is_expected.to belong_to(:conversation) }
+ it { is_expected.to belong_to(:user) }
+ end
+
+ describe 'validations' do
+ it 'ensure account is present' do
+ conversation = create(:conversation)
+ conversation_participant = build(:conversation_participant, conversation: conversation, account_id: nil)
+ conversation_participant.valid?
+ expect(conversation_participant.account_id).to eq(conversation.account_id)
+ end
+
+ it 'throws error if inbox member does not belongs to account' do
+ conversation = create(:conversation)
+ user = create(:user, account: conversation.account)
+ participant = build(:conversation_participant, user: user, conversation: conversation)
+ expect { participant.save! }.to raise_error(ActiveRecord::RecordInvalid)
+ expect(participant.errors.messages[:user]).to eq(['must have inbox access'])
+ end
+ end
+end
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 06fe5f108..aca21e843 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -105,6 +105,8 @@ RSpec.describe Conversation, type: :model do
let(:label) { create(:label, account: account) }
before do
+ create(:inbox_member, user: old_assignee, inbox: conversation.inbox)
+ create(:inbox_member, user: new_assignee, inbox: conversation.inbox)
allow(Rails.configuration.dispatcher).to receive(:dispatch)
Current.user = old_assignee
end
@@ -458,6 +460,7 @@ RSpec.describe Conversation, type: :model do
first_reply_created_at: nil,
contact_last_seen_at: conversation.contact_last_seen_at.to_i,
agent_last_seen_at: conversation.agent_last_seen_at.to_i,
+ created_at: conversation.created_at.to_i,
unread_count: 0
}
end
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index f88214fbe..4d7886f25 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -198,21 +198,21 @@ RSpec.describe Message, type: :model do
}.to_json, headers: {})
end
- it 'deletes the attachment for deleted stories' do
+ it 'keeps the attachment for deleted stories' do
expect(instagram_message.attachments.count).to eq 1
stub_request(:get, %r{https://graph.facebook.com/.*}).to_return(status: 404)
instagram_message.push_event_data
- expect(instagram_message.reload.attachments.count).to eq 0
+ expect(instagram_message.reload.attachments.count).to eq 1
end
- it 'deletes the attachment for expired stories' do
+ it 'keeps the attachment for expired stories' do
expect(instagram_message.attachments.count).to eq 1
# for expired stories, the link will be empty
stub_request(:get, %r{https://graph.facebook.com/.*}).to_return(status: 200, body: {
story: { mention: { link: '', id: '17920786367196703' } }
}.to_json, headers: {})
instagram_message.push_event_data
- expect(instagram_message.reload.attachments.count).to eq 0
+ expect(instagram_message.reload.attachments.count).to eq 1
end
end
end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index e3584d182..15894d2d7 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -51,6 +51,14 @@ RSpec.describe Notification do
expect(notification.push_message_title).to eq "[New message] - ##{notification.conversation.display_id} "
end
+ it 'returns appropriate title suited for the notification type participating_conversation_new_message' do
+ message = create(:message, sender: create(:user), content: Faker::Lorem.paragraphs(number: 2))
+ notification = create(:notification, notification_type: 'participating_conversation_new_message', primary_actor: message)
+
+ expect(notification.push_message_title).to eq "[New message] - ##{notification.conversation.display_id} \
+#{message.content.truncate_words(10)}"
+ end
+
it 'returns appropriate title suited for the notification type conversation_mention' do
message = create(:message, sender: create(:user), content: 'Hey [@John](mention://user/1/john), can you check this ticket?')
notification = create(:notification, notification_type: 'conversation_mention', primary_actor: message, secondary_actor: message.sender)
diff --git a/spec/presenters/conversations/event_data_presenter_spec.rb b/spec/presenters/conversations/event_data_presenter_spec.rb
index 3a194beb6..874ed54bf 100644
--- a/spec/presenters/conversations/event_data_presenter_spec.rb
+++ b/spec/presenters/conversations/event_data_presenter_spec.rb
@@ -30,6 +30,7 @@ RSpec.describe Conversations::EventDataPresenter do
first_reply_created_at: nil,
contact_last_seen_at: conversation.contact_last_seen_at.to_i,
agent_last_seen_at: conversation.agent_last_seen_at.to_i,
+ created_at: conversation.created_at.to_i,
unread_count: 0
}
end
diff --git a/spec/services/auto_assignment/agent_assignment_service_spec.rb b/spec/services/auto_assignment/agent_assignment_service_spec.rb
index 00f813d33..83790dc28 100644
--- a/spec/services/auto_assignment/agent_assignment_service_spec.rb
+++ b/spec/services/auto_assignment/agent_assignment_service_spec.rb
@@ -16,6 +16,7 @@ RSpec.describe AutoAssignment::AgentAssignmentService do
end
before do
+ inbox_members.each { |inbox_member| create(:account_user, account: account, user: inbox_member.user) }
allow(::OnlineStatusTracker).to receive(:get_available_users).and_return(online_users)
end
diff --git a/spec/services/messages/mention_service_spec.rb b/spec/services/messages/mention_service_spec.rb
new file mode 100644
index 000000000..21484ab13
--- /dev/null
+++ b/spec/services/messages/mention_service_spec.rb
@@ -0,0 +1,70 @@
+require 'rails_helper'
+
+describe Messages::MentionService do
+ let!(:account) { create(:account) }
+ let!(:user) { create(:user, account: account) }
+ let!(:first_agent) { create(:user, account: account) }
+ let!(:second_agent) { create(:user, account: account) }
+ let!(:inbox) { create(:inbox, account: account) }
+ let!(:conversation) { create(:conversation, account: account, inbox: inbox, assignee: user) }
+ let(:builder) { double }
+
+ before do
+ create(:inbox_member, user: first_agent, inbox: inbox)
+ create(:inbox_member, user: second_agent, inbox: inbox)
+ conversation.reload
+ allow(NotificationBuilder).to receive(:new).and_return(builder)
+ allow(builder).to receive(:perform)
+ end
+
+ context 'when message contains mention' do
+ it 'creates notifications for inbox member who was mentioned' do
+ message = build(
+ :message,
+ conversation: conversation,
+ account: account,
+ content: "hi [#{first_agent.name}](mention://user/#{first_agent.id}/#{first_agent.name})",
+ private: true
+ )
+
+ described_class.new(message: message).perform
+
+ expect(NotificationBuilder).to have_received(:new).with(notification_type: 'conversation_mention',
+ user: first_agent,
+ account: account,
+ primary_actor: message)
+ end
+ end
+
+ context 'when message contains multiple mentions' do
+ let(:message) do
+ build(
+ :message,
+ conversation: conversation,
+ account: account,
+ content: "hey [#{second_agent.name}](mention://user/#{second_agent.id}/#{second_agent.name})/
+ [#{first_agent.name}](mention://user/#{first_agent.id}/#{first_agent.name}),
+ please look in to this?",
+ private: true
+ )
+ end
+
+ it 'creates notifications for inbox member who was mentioned' do
+ described_class.new(message: message).perform
+
+ expect(NotificationBuilder).to have_received(:new).with(notification_type: 'conversation_mention',
+ user: second_agent,
+ account: account,
+ primary_actor: message)
+ expect(NotificationBuilder).to have_received(:new).with(notification_type: 'conversation_mention',
+ user: first_agent,
+ account: account,
+ primary_actor: message)
+ end
+
+ it 'add the users to the participants list' do
+ described_class.new(message: message).perform
+ expect(conversation.conversation_participants.map(&:user_id)).to match_array([first_agent.id, second_agent.id])
+ end
+ end
+end
diff --git a/spec/services/messages/new_message_notification_service_spec.rb b/spec/services/messages/new_message_notification_service_spec.rb
new file mode 100644
index 000000000..bb35ec48a
--- /dev/null
+++ b/spec/services/messages/new_message_notification_service_spec.rb
@@ -0,0 +1,123 @@
+require 'rails_helper'
+
+describe Messages::NewMessageNotificationService do
+ context 'when message is not notifiable' do
+ it 'will not create any notifications' do
+ message = build(:message, message_type: :activity)
+ expect(NotificationBuilder).not_to receive(:new)
+ described_class.new(message: message).perform
+ end
+ end
+
+ context 'when message is notifiable' do
+ let(:account) { create(:account) }
+ let(:assignee) { create(:user, account: account) }
+ let(:participating_agent_1) { create(:user, account: account) }
+ let(:participating_agent_2) { create(:user, account: account) }
+ let(:inbox) { create(:inbox, account: account) }
+ let(:conversation) { create(:conversation, account: account, inbox: inbox, assignee: assignee) }
+ let(:builder) { double }
+
+ before do
+ create(:inbox_member, inbox: inbox, user: participating_agent_1)
+ create(:inbox_member, inbox: inbox, user: participating_agent_2)
+ create(:inbox_member, inbox: inbox, user: assignee)
+ create(:conversation_participant, conversation: conversation, user: participating_agent_1)
+ create(:conversation_participant, conversation: conversation, user: participating_agent_2)
+ create(:conversation_participant, conversation: conversation, user: assignee)
+ allow(NotificationBuilder).to receive(:new).and_return(builder)
+ allow(builder).to receive(:perform)
+ end
+
+ context 'when message is created by a participant' do
+ let(:message) { create(:message, conversation: conversation, account: account, sender: participating_agent_1) }
+
+ before do
+ described_class.new(message: message).perform
+ end
+
+ it 'creates notifications for other participating users' do
+ expect(NotificationBuilder).to have_received(:new).with(notification_type: 'participating_conversation_new_message',
+ user: participating_agent_2,
+ account: account,
+ primary_actor: message)
+ end
+
+ it 'creates notifications for assignee' do
+ expect(NotificationBuilder).to have_received(:new).with(notification_type: 'assigned_conversation_new_message',
+ user: assignee,
+ account: account,
+ primary_actor: message)
+ end
+
+ it 'will not create notifications for the user who created the message' do
+ expect(NotificationBuilder).not_to have_received(:new).with(notification_type: 'participating_conversation_new_message',
+ user: participating_agent_1,
+ account: account,
+ primary_actor: message)
+ end
+ end
+
+ context 'when message is created by a contact' do
+ let(:message) { create(:message, conversation: conversation, account: account) }
+
+ before do
+ described_class.new(message: message).perform
+ end
+
+ it 'creates notifications for assignee' do
+ expect(NotificationBuilder).to have_received(:new).with(notification_type: 'assigned_conversation_new_message',
+ user: assignee,
+ account: account,
+ primary_actor: message)
+ end
+
+ it 'creates notifications for all participating users' do
+ expect(NotificationBuilder).to have_received(:new).with(notification_type: 'participating_conversation_new_message',
+ user: participating_agent_1,
+ account: account,
+ primary_actor: message)
+ expect(NotificationBuilder).to have_received(:new).with(notification_type: 'participating_conversation_new_message',
+ user: participating_agent_2,
+ account: account,
+ primary_actor: message)
+ end
+ end
+
+ context 'with multiple notifications are subscribed' do
+ let(:message) { create(:message, conversation: conversation, account: account) }
+
+ before do
+ assignee.notification_settings.find_by(account_id: account.id).update(selected_email_flags: %w[email_assigned_conversation_new_message
+ email_participating_conversation_new_message])
+ described_class.new(message: message).perform
+ end
+
+ it 'will not create assignee notifications for the assignee if participating notification was send' do
+ expect(NotificationBuilder).not_to have_received(:new).with(notification_type: 'assigned_conversation_new_message',
+ user: assignee,
+ account: account,
+ primary_actor: message)
+ end
+ end
+
+ context 'when message is created by assignee' do
+ let(:message) { create(:message, conversation: conversation, account: account, sender: assignee) }
+
+ before do
+ described_class.new(message: message).perform
+ end
+
+ it 'will not create notifications for the user who created the message' do
+ expect(NotificationBuilder).not_to have_received(:new).with(notification_type: 'participating_conversation_new_message',
+ user: assignee,
+ account: account,
+ primary_actor: message)
+ expect(NotificationBuilder).not_to have_received(:new).with(notification_type: 'assigned_conversation_new_message',
+ user: assignee,
+ account: account,
+ primary_actor: message)
+ end
+ end
+ end
+end
diff --git a/spec/services/notification/push_notification_service_spec.rb b/spec/services/notification/push_notification_service_spec.rb
index d5217f635..17fc5f6f3 100644
--- a/spec/services/notification/push_notification_service_spec.rb
+++ b/spec/services/notification/push_notification_service_spec.rb
@@ -7,7 +7,7 @@ describe Notification::PushNotificationService do
let(:fcm_double) { double }
before do
- allow(Webpush).to receive(:payload_send).and_return(true)
+ allow(WebPush).to receive(:payload_send).and_return(true)
allow(FCM).to receive(:new).and_return(fcm_double)
allow(fcm_double).to receive(:send).and_return({ body: { 'results': [] }.to_json })
end
@@ -18,7 +18,7 @@ describe Notification::PushNotificationService do
create(:notification_subscription, user: notification.user)
described_class.new(notification: notification).perform
- expect(Webpush).to have_received(:payload_send)
+ expect(WebPush).to have_received(:payload_send)
expect(FCM).not_to have_received(:new)
end
end
@@ -29,7 +29,7 @@ describe Notification::PushNotificationService do
described_class.new(notification: notification).perform
expect(FCM).to have_received(:new)
- expect(Webpush).not_to have_received(:payload_send)
+ expect(WebPush).not_to have_received(:payload_send)
end
end
end
diff --git a/spec/services/whatsapp/incoming_message_service_spec.rb b/spec/services/whatsapp/incoming_message_service_spec.rb
index 3721d48cd..9c2ee9127 100644
--- a/spec/services/whatsapp/incoming_message_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_service_spec.rb
@@ -23,7 +23,7 @@ describe Whatsapp::IncomingMessageService do
expect(whatsapp_channel.inbox.messages.first.content).to eq('Test')
end
- it 'appends to last conversation when if conversation already exisits' do
+ it 'appends to last conversation when if conversation already exists' do
contact_inbox = create(:contact_inbox, inbox: whatsapp_channel.inbox, source_id: params[:messages].first[:from])
2.times.each { create(:conversation, inbox: whatsapp_channel.inbox, contact_inbox: contact_inbox) }
last_conversation = create(:conversation, inbox: whatsapp_channel.inbox, contact_inbox: contact_inbox)
@@ -63,8 +63,8 @@ describe Whatsapp::IncomingMessageService do
'contacts' => [{ 'profile' => { 'name' => 'Sojan Jose' }, 'wa_id' => '2423423243' }],
'messages' => [{
'errors' => [{ 'code': 131_051, 'title': 'Message type is currently not supported.' }],
- 'from': '2423423243', 'id': 'wamid.SDFADSf23sfasdafasdfa',
- 'timestamp': '1667047370', 'type': 'unsupported'
+ :from => '2423423243', :id => 'wamid.SDFADSf23sfasdafasdfa',
+ :timestamp => '1667047370', :type => 'unsupported'
}]
}.with_indifferent_access
@@ -113,6 +113,17 @@ describe Whatsapp::IncomingMessageService do
expect(message.reload.status).to eq('failed')
expect(message.external_error).to eq('123: abc')
end
+
+ it 'will not throw error if unsupported status' do
+ status_params = {
+ 'statuses' => [{ 'recipient_id' => from, 'id' => from, 'status' => 'deleted',
+ 'errors' => [{ 'code': 123, 'title': 'abc' }] }]
+ }.with_indifferent_access
+
+ message = Message.find_by!(source_id: from)
+ expect(message.status).to eq('sent')
+ expect { described_class.new(inbox: whatsapp_channel.inbox, params: status_params).perform }.not_to raise_error
+ end
end
context 'when valid interactive message params' do
@@ -120,7 +131,7 @@ describe Whatsapp::IncomingMessageService do
params = {
'contacts' => [{ 'profile' => { 'name' => 'Sojan Jose' }, 'wa_id' => '2423423243' }],
'messages' => [{ 'from' => '2423423243', 'id' => 'SDFADSf23sfasdafasdfa',
- 'interactive': {
+ :interactive => {
'button_reply': {
'id': '1',
'title': 'First Button'
@@ -184,11 +195,11 @@ describe Whatsapp::IncomingMessageService do
'contacts' => [{ 'profile' => { 'name' => 'Sojan Jose' }, 'wa_id' => '2423423243' }],
'messages' => [{ 'from' => '2423423243', 'id' => 'SDFADSf23sfasdafasdfa',
'location' => { 'id' => 'b1c68f38-8734-4ad3-b4a1-ef0c10d683',
- 'address': 'San Francisco, CA, USA',
- 'latitude': 37.7893768,
- 'longitude': -122.3895553,
- 'name': 'Bay Bridge',
- 'url': 'http://location_url.test' },
+ :address => 'San Francisco, CA, USA',
+ :latitude => 37.7893768,
+ :longitude => -122.3895553,
+ :name => 'Bay Bridge',
+ :url => 'http://location_url.test' },
'timestamp' => '1633034394', 'type' => 'location' }]
}.with_indifferent_access
described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
@@ -202,5 +213,38 @@ describe Whatsapp::IncomingMessageService do
expect(location_attachment.external_url).to eq('http://location_url.test')
end
end
+
+ context 'when valid contact message params' do
+ it 'creates appropriate message and attachments' do
+ params = { 'contacts' => [{ 'profile' => { 'name' => 'Kedar' }, 'wa_id' => '919746334593' }],
+ 'messages' => [{ 'from' => '919446284490',
+ 'id' => 'wamid.SDFADSf23sfasdafasdfa',
+ 'timestamp' => '1675823265',
+ 'type' => 'contacts',
+ 'contacts' => [
+ {
+ 'name' => { 'formatted_name' => 'Apple Inc.' },
+ 'phones' => [{ 'phone' => '+911800', 'type' => 'MAIN' }]
+ },
+ { 'name' => { 'first_name' => 'Chatwoot', 'formatted_name' => 'Chatwoot' },
+ 'phones' => [{ 'phone' => '+1 (415) 341-8386' }] }
+ ] }] }.with_indifferent_access
+ described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
+ expect(Contact.all.first.name).to eq('Kedar')
+
+ expect(whatsapp_channel.inbox.conversations.count).not_to eq(0)
+
+ # Two messages are tested deliberately to ensure multiple contact attachments work.
+ m1 = whatsapp_channel.inbox.messages.first
+ contact_attachments = m1.attachments.first
+ expect(m1.content).to eq('Apple Inc.')
+ expect(contact_attachments.fallback_title).to eq('+911800')
+
+ m2 = whatsapp_channel.inbox.messages.last
+ contact_attachments = m2.attachments.first
+ expect(m2.content).to eq('Chatwoot')
+ expect(contact_attachments.fallback_title).to eq('+1 (415) 341-8386')
+ end
+ end
end
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e375bb8ee..3c275aeb4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -15,7 +15,7 @@ RSpec.configure do |config|
config.shared_context_metadata_behavior = :apply_to_host_groups
- def with_modified_env(options, &block)
- ClimateControl.modify(options, &block)
+ def with_modified_env(options, &)
+ ClimateControl.modify(options, &)
end
end
diff --git a/swagger/definitions/resource/webhook.yml b/swagger/definitions/resource/webhook.yml
index 1e4c58904..a9881b8e4 100644
--- a/swagger/definitions/resource/webhook.yml
+++ b/swagger/definitions/resource/webhook.yml
@@ -14,6 +14,8 @@ properties:
"conversation_created",
"conversation_status_changed",
"conversation_updated",
+ "contact_created",
+ "contact_updated",
"message_created",
"message_updated",
"webwidget_triggered"
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 7a31a56d1..5878d1e41 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -5264,6 +5264,8 @@
"conversation_created",
"conversation_status_changed",
"conversation_updated",
+ "contact_created",
+ "contact_updated",
"message_created",
"message_updated",
"webwidget_triggered"
diff --git a/yarn.lock b/yarn.lock
index ee23124a5..18ec29bc6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1391,9 +1391,9 @@
is-url "^1.2.4"
nanoid "^2.1.11"
-"@chatwoot/prosemirror-schema@https://github.com/chatwoot/prosemirror-schema.git#beta":
+"@chatwoot/prosemirror-schema@https://github.com/chatwoot/prosemirror-schema.git":
version "1.0.0"
- resolved "https://github.com/chatwoot/prosemirror-schema.git#e74e54cca4acaa4d87f3e0e48d47ffaea283ec88"
+ resolved "https://github.com/chatwoot/prosemirror-schema.git#ebbf09d6ebd9138cdf2bb47257bb02ebbf01af53"
dependencies:
prosemirror-commands "^1.1.4"
prosemirror-dropcursor "^1.3.2"
@@ -1410,12 +1410,12 @@
prosemirror-utils "^0.9.6"
prosemirror-view "^1.17.2"
-"@chatwoot/utils@^0.0.10":
- version "0.0.10"
- resolved "https://registry.npmjs.org/@chatwoot/utils/-/utils-0.0.10.tgz#59f68cc28d8718b261ebed8b9c94d2c493b6c67f"
- integrity sha512-Zd+wQTblWKUV1mhcXoabcfoLygx/Ock5pP0JQdfqW64lubhjYaRR4gCutEgqUcQB4nuOUH7MZ7BTzdZm4RoM/g==
+"@chatwoot/utils@^0.0.11":
+ version "0.0.11"
+ resolved "https://registry.yarnpkg.com/@chatwoot/utils/-/utils-0.0.11.tgz#6922492e21c20bdb0ef733967a0b94829d8f620f"
+ integrity sha512-uiLsuBYTlZGXJ/d7QfJ+hlO1u7U1750ON5iu0pus8t6GlJQdxvMQWuf6fHQtfsDNcvL1aXsQu3H6BUk/nVZLlw==
dependencies:
- date-fns "^2.22.1"
+ date-fns "^2.29.1"
"@cnakazawa/watch@^1.0.3":
version "1.0.4"
@@ -6902,10 +6902,10 @@ date-fns@^1.27.2:
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
-date-fns@^2.22.1:
- version "2.28.0"
- resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2"
- integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
+date-fns@^2.29.1:
+ version "2.29.3"
+ resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
+ integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
date-format-parse@^0.2.6:
version "0.2.6"
+
+
![]()
-
-
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/routes/login/login.routes.js b/app/javascript/dashboard/routes/login/login.routes.js
index 40038a154..37e333a5b 100644
--- a/app/javascript/dashboard/routes/login/login.routes.js
+++ b/app/javascript/dashboard/routes/login/login.routes.js
@@ -13,6 +13,7 @@ export default {
ssoAuthToken: route.query.sso_auth_token,
ssoAccountId: route.query.sso_account_id,
ssoConversationId: route.query.sso_conversation_id,
+ authError: route.query.error,
}),
},
],
diff --git a/app/javascript/dashboard/store/modules/auth.js b/app/javascript/dashboard/store/modules/auth.js
index e19d8d34c..f06ea3750 100644
--- a/app/javascript/dashboard/store/modules/auth.js
+++ b/app/javascript/dashboard/store/modules/auth.js
@@ -209,7 +209,16 @@ export const actions = {
// mutations
export const mutations = {
[types.SET_CURRENT_USER_AVAILABILITY](_state, availability) {
- Vue.set(_state.currentUser, 'availability', availability);
+ const accounts = _state.currentUser.accounts.map(account => {
+ if (account.id === _state.currentUser.account_id) {
+ return { ...account, availability, availability_status: availability };
+ }
+ return account;
+ });
+ Vue.set(_state, 'currentUser', {
+ ..._state.currentUser,
+ accounts,
+ });
},
[types.CLEAR_USER](_state) {
_state.currentUser = initialState.currentUser;
diff --git a/app/javascript/dashboard/store/modules/campaigns.js b/app/javascript/dashboard/store/modules/campaigns.js
index 63ca3b923..a2ffc1363 100644
--- a/app/javascript/dashboard/store/modules/campaigns.js
+++ b/app/javascript/dashboard/store/modules/campaigns.js
@@ -1,6 +1,8 @@
import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
import types from '../mutation-types';
import CampaignsAPI from '../../api/campaigns';
+import AnalyticsHelper from '../../helper/AnalyticsHelper';
+import { CAMPAIGNS_EVENTS } from '../../helper/AnalyticsHelper/events';
export const state = {
records: [],
@@ -51,6 +53,7 @@ export const actions = {
commit(types.SET_CAMPAIGN_UI_FLAG, { isUpdating: true });
try {
const response = await CampaignsAPI.update(id, updateObj);
+ AnalyticsHelper.track(CAMPAIGNS_EVENTS.UPDATE_CAMPAIGN);
commit(types.EDIT_CAMPAIGN, response.data);
} catch (error) {
throw new Error(error);
@@ -62,6 +65,7 @@ export const actions = {
commit(types.SET_CAMPAIGN_UI_FLAG, { isDeleting: true });
try {
await CampaignsAPI.delete(id);
+ AnalyticsHelper.track(CAMPAIGNS_EVENTS.DELETE_CAMPAIGN);
commit(types.DELETE_CAMPAIGN, id);
} catch (error) {
throw new Error(error);
diff --git a/app/javascript/dashboard/store/modules/contacts/actions.js b/app/javascript/dashboard/store/modules/contacts/actions.js
index ad0c735ec..7b898cbea 100644
--- a/app/javascript/dashboard/store/modules/contacts/actions.js
+++ b/app/javascript/dashboard/store/modules/contacts/actions.js
@@ -5,6 +5,8 @@ import {
import types from '../../mutation-types';
import ContactAPI from '../../../api/contacts';
import AccountActionsAPI from '../../../api/accountActions';
+import AnalyticsHelper from '../../../helper/AnalyticsHelper';
+import { CONTACTS_EVENTS } from '../../../helper/AnalyticsHelper/events';
const buildContactFormData = contactParams => {
const formData = new FormData();
@@ -33,6 +35,16 @@ const buildContactFormData = contactParams => {
return formData;
};
+export const raiseContactCreateErrors = error => {
+ if (error.response?.status === 422) {
+ throw new DuplicateContactException(error.response.data.attributes);
+ } else if (error.response?.data?.message) {
+ throw new ExceptionWithMessage(error.response.data.message);
+ } else {
+ throw new Error(error);
+ }
+};
+
export const actions = {
search: async ({ commit }, { search, page, sortAttr, label }) => {
commit(types.SET_CONTACT_UI_FLAG, { isFetching: true });
@@ -104,15 +116,14 @@ export const actions = {
const response = await ContactAPI.create(
isFormData ? buildContactFormData(contactParams) : contactParams
);
+
+ AnalyticsHelper.track(CONTACTS_EVENTS.CREATE_CONTACT);
commit(types.SET_CONTACT_ITEM, response.data.payload.contact);
commit(types.SET_CONTACT_UI_FLAG, { isCreating: false });
+ return response.data.payload.contact;
} catch (error) {
commit(types.SET_CONTACT_UI_FLAG, { isCreating: false });
- if (error.response?.data?.message) {
- throw new ExceptionWithMessage(error.response.data.message);
- } else {
- throw new Error(error);
- }
+ return raiseContactCreateErrors(error);
}
},
@@ -223,19 +234,26 @@ export const actions = {
}
},
- filter: async ({ commit }, { page = 1, sortAttr, queryPayload } = {}) => {
+ filter: async (
+ { commit },
+ { page = 1, sortAttr, queryPayload, resetState = true } = {}
+ ) => {
commit(types.SET_CONTACT_UI_FLAG, { isFetching: true });
try {
const {
data: { payload, meta },
} = await ContactAPI.filter(page, sortAttr, queryPayload);
- commit(types.CLEAR_CONTACTS);
- commit(types.SET_CONTACTS, payload);
- commit(types.SET_CONTACT_META, meta);
- commit(types.SET_CONTACT_UI_FLAG, { isFetching: false });
+ if (resetState) {
+ commit(types.CLEAR_CONTACTS);
+ commit(types.SET_CONTACTS, payload);
+ commit(types.SET_CONTACT_META, meta);
+ commit(types.SET_CONTACT_UI_FLAG, { isFetching: false });
+ }
+ return payload;
} catch (error) {
commit(types.SET_CONTACT_UI_FLAG, { isFetching: false });
}
+ return [];
},
setContactFilters({ commit }, data) {
diff --git a/app/javascript/dashboard/store/modules/conversationWatchers.js b/app/javascript/dashboard/store/modules/conversationWatchers.js
index d8da9cdb8..1e1050e49 100644
--- a/app/javascript/dashboard/store/modules/conversationWatchers.js
+++ b/app/javascript/dashboard/store/modules/conversationWatchers.js
@@ -23,7 +23,7 @@ export const getters = {
export const actions = {
show: async ({ commit }, { conversationId }) => {
- commit(types.SET_CONVERSATION_WATCHERS_UI_FLAG, {
+ commit(types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG, {
isFetching: true,
});
@@ -31,21 +31,21 @@ export const actions = {
const response = await ConversationInboxApi.fetchParticipants(
conversationId
);
- commit(types.SET_CONVERSATION_WATCHERS, {
+ commit(types.SET_CONVERSATION_PARTICIPANTS, {
conversationId,
data: response.data,
});
} catch (error) {
throwErrorMessage(error);
} finally {
- commit(types.SET_CONVERSATION_WATCHERS_UI_FLAG, {
+ commit(types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG, {
isFetching: false,
});
}
},
update: async ({ commit }, { conversationId, userIds }) => {
- commit(types.SET_CONVERSATION_WATCHERS_UI_FLAG, {
+ commit(types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG, {
isUpdating: true,
});
@@ -54,14 +54,14 @@ export const actions = {
conversationId,
userIds,
});
- commit(types.SET_CONVERSATION_WATCHERS, {
+ commit(types.SET_CONVERSATION_PARTICIPANTS, {
conversationId,
data: response.data,
});
} catch (error) {
throwErrorMessage(error);
} finally {
- commit(types.SET_CONVERSATION_WATCHERS_UI_FLAG, {
+ commit(types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG, {
isUpdating: false,
});
}
@@ -69,14 +69,14 @@ export const actions = {
};
export const mutations = {
- [types.SET_CONVERSATION_WATCHERS_UI_FLAG]($state, data) {
+ [types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG]($state, data) {
$state.uiFlags = {
...$state.uiFlags,
...data,
};
},
- [types.SET_CONVERSATION_WATCHERS]($state, { data, conversationId }) {
+ [types.SET_CONVERSATION_PARTICIPANTS]($state, { data, conversationId }) {
Vue.set($state.records, conversationId, data);
},
};
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index 6d3e598ab..b28c74ba3 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -10,9 +10,9 @@ import {
isOnUnattendedView,
} from './helpers/actionHelpers';
import messageReadActions from './actions/messageReadActions';
-import AnalyticsHelper, {
- ANALYTICS_EVENTS,
-} from '../../../helper/AnalyticsHelper';
+import AnalyticsHelper from '../../../helper/AnalyticsHelper';
+import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';
+import messageTranslateActions from './actions/messageTranslateActions';
// actions
const actions = {
getConversation: async ({ commit }, conversationId) => {
@@ -176,8 +176,8 @@ const actions = {
const response = await MessageApi.create(pendingMessage);
AnalyticsHelper.track(
pendingMessage.private
- ? ANALYTICS_EVENTS.SENT_PRIVATE_NOTE
- : ANALYTICS_EVENTS.SENT_MESSAGE
+ ? CONVERSATION_EVENTS.SENT_PRIVATE_NOTE
+ : CONVERSATION_EVENTS.SENT_MESSAGE
);
commit(types.ADD_MESSAGE, {
...response.data,
@@ -342,6 +342,7 @@ const actions = {
commit(types.CLEAR_CONVERSATION_FILTERS);
},
...messageReadActions,
+ ...messageTranslateActions,
};
export default actions;
diff --git a/app/javascript/dashboard/store/modules/conversations/actions/messageTranslateActions.js b/app/javascript/dashboard/store/modules/conversations/actions/messageTranslateActions.js
new file mode 100644
index 000000000..a88c7cb0a
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/conversations/actions/messageTranslateActions.js
@@ -0,0 +1,15 @@
+import MessageApi from '../../../../api/inbox/message';
+
+export default {
+ async translateMessage(_, { conversationId, messageId, targetLanguage }) {
+ try {
+ await MessageApi.translateMessage(
+ conversationId,
+ messageId,
+ targetLanguage
+ );
+ } catch (error) {
+ // ignore error
+ }
+ },
+};
diff --git a/app/javascript/dashboard/store/modules/conversations/getters.js b/app/javascript/dashboard/store/modules/conversations/getters.js
index 75d9aef44..e02fa7c40 100644
--- a/app/javascript/dashboard/store/modules/conversations/getters.js
+++ b/app/javascript/dashboard/store/modules/conversations/getters.js
@@ -91,6 +91,12 @@ const getters = {
value => value.id === Number(conversationId)
);
},
+ getConversationParticipants: _state => {
+ return _state.conversationParticipants;
+ },
+ getConversationLastSeen: _state => {
+ return _state.conversationLastSeen;
+ },
};
export default getters;
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index a8a2fdabe..03ac280f6 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -13,6 +13,8 @@ const state = {
currentInbox: null,
selectedChatId: null,
appliedFilters: [],
+ conversationParticipants: [],
+ conversationLastSeen: null,
};
// mutations
diff --git a/app/javascript/dashboard/store/modules/csat.js b/app/javascript/dashboard/store/modules/csat.js
index 2557e2698..4806ef3a0 100644
--- a/app/javascript/dashboard/store/modules/csat.js
+++ b/app/javascript/dashboard/store/modules/csat.js
@@ -2,6 +2,8 @@ import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
import types from '../mutation-types';
import CSATReports from '../../api/csatReports';
import { downloadCsvFile } from '../../helper/downloadHelper';
+import AnalyticsHelper from '../../helper/AnalyticsHelper';
+import { REPORTS_EVENTS } from '../../helper/AnalyticsHelper/events';
const computeDistribution = (value, total) =>
((value * 100) / total).toFixed(2);
@@ -111,6 +113,9 @@ export const actions = {
downloadCSATReports(_, params) {
return CSATReports.download(params).then(response => {
downloadCsvFile(params.fileName, response.data);
+ AnalyticsHelper.track(REPORTS_EVENTS.DOWNLOAD_REPORT, {
+ reportType: 'csat',
+ });
});
},
};
diff --git a/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js b/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
index 3ab840105..47d64abfb 100644
--- a/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
+++ b/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
@@ -123,4 +123,19 @@ export const actions = {
});
}
},
+
+ attachImage: async (_, { portalSlug, file }) => {
+ try {
+ const {
+ data: { file_url: fileUrl },
+ } = await articlesAPI.uploadImage({
+ portalSlug,
+ file,
+ });
+ return fileUrl;
+ } catch (error) {
+ throwErrorMessage(error);
+ }
+ return '';
+ },
};
diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index e8ee24daa..a9e002471 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -6,9 +6,8 @@ import WebChannel from '../../api/channel/webChannel';
import FBChannel from '../../api/channel/fbChannel';
import TwilioChannel from '../../api/channel/twilioChannel';
import { throwErrorMessage } from '../utils/api';
-import AnalyticsHelper, {
- ANALYTICS_EVENTS,
-} from '../../helper/AnalyticsHelper';
+import AnalyticsHelper from '../../helper/AnalyticsHelper';
+import { ACCOUNT_EVENTS } from '../../helper/AnalyticsHelper/events';
const buildInboxData = inboxParams => {
const formData = new FormData();
@@ -121,7 +120,7 @@ export const getters = {
};
const sendAnalyticsEvent = channelType => {
- AnalyticsHelper.track(ANALYTICS_EVENTS.ADDED_AN_INBOX, {
+ AnalyticsHelper.track(ACCOUNT_EVENTS.ADDED_AN_INBOX, {
channelType,
});
};
diff --git a/app/javascript/dashboard/store/modules/integrations.js b/app/javascript/dashboard/store/modules/integrations.js
index af4a72cb0..c7518547d 100644
--- a/app/javascript/dashboard/store/modules/integrations.js
+++ b/app/javascript/dashboard/store/modules/integrations.js
@@ -17,7 +17,7 @@ const state = {
};
const isAValidAppIntegration = integration => {
- return ['dialogflow', 'dyte'].includes(integration.id);
+ return ['dialogflow', 'dyte', 'google_translate'].includes(integration.id);
};
export const getters = {
getIntegrations($state) {
diff --git a/app/javascript/dashboard/store/modules/labels.js b/app/javascript/dashboard/store/modules/labels.js
index f597212a3..53c4d7b5f 100644
--- a/app/javascript/dashboard/store/modules/labels.js
+++ b/app/javascript/dashboard/store/modules/labels.js
@@ -1,6 +1,8 @@
import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
import types from '../mutation-types';
import LabelsAPI from '../../api/labels';
+import AnalyticsHelper from '../../helper/AnalyticsHelper';
+import { LABEL_EVENTS } from '../../helper/AnalyticsHelper/events';
export const state = {
records: [],
@@ -43,6 +45,7 @@ export const actions = {
commit(types.SET_LABEL_UI_FLAG, { isCreating: true });
try {
const response = await LabelsAPI.create(cannedObj);
+ AnalyticsHelper.track(LABEL_EVENTS.CREATE);
commit(types.ADD_LABEL, response.data);
} catch (error) {
const errorMessage = error?.response?.data?.message;
@@ -56,6 +59,7 @@ export const actions = {
commit(types.SET_LABEL_UI_FLAG, { isUpdating: true });
try {
const response = await LabelsAPI.update(id, updateObj);
+ AnalyticsHelper.track(LABEL_EVENTS.UPDATE);
commit(types.EDIT_LABEL, response.data);
} catch (error) {
throw new Error(error);
@@ -68,6 +72,7 @@ export const actions = {
commit(types.SET_LABEL_UI_FLAG, { isDeleting: true });
try {
await LabelsAPI.delete(id);
+ AnalyticsHelper.track(LABEL_EVENTS.DELETED);
commit(types.DELETE_LABEL, id);
} catch (error) {
throw new Error(error);
diff --git a/app/javascript/dashboard/store/modules/reports.js b/app/javascript/dashboard/store/modules/reports.js
index b6c72c19b..4d4fee959 100644
--- a/app/javascript/dashboard/store/modules/reports.js
+++ b/app/javascript/dashboard/store/modules/reports.js
@@ -2,6 +2,8 @@
import * as types from '../mutation-types';
import Report from '../../api/reports';
import { downloadCsvFile } from '../../helper/downloadHelper';
+import AnalyticsHelper from '../../helper/AnalyticsHelper';
+import { REPORTS_EVENTS } from '../../helper/AnalyticsHelper/events';
const state = {
fetchingStatus: false,
@@ -116,6 +118,10 @@ export const actions = {
return Report.getAgentReports(reportObj)
.then(response => {
downloadCsvFile(reportObj.fileName, response.data);
+ AnalyticsHelper.track(REPORTS_EVENTS.DOWNLOAD_REPORT, {
+ reportType: 'agent',
+ businessHours: reportObj?.businessHours,
+ });
})
.catch(error => {
console.error(error);
@@ -125,6 +131,10 @@ export const actions = {
return Report.getLabelReports(reportObj)
.then(response => {
downloadCsvFile(reportObj.fileName, response.data);
+ AnalyticsHelper.track(REPORTS_EVENTS.DOWNLOAD_REPORT, {
+ reportType: 'label',
+ businessHours: reportObj?.businessHours,
+ });
})
.catch(error => {
console.error(error);
@@ -134,6 +144,10 @@ export const actions = {
return Report.getInboxReports(reportObj)
.then(response => {
downloadCsvFile(reportObj.fileName, response.data);
+ AnalyticsHelper.track(REPORTS_EVENTS.DOWNLOAD_REPORT, {
+ reportType: 'inbox',
+ businessHours: reportObj?.businessHours,
+ });
})
.catch(error => {
console.error(error);
@@ -143,6 +157,10 @@ export const actions = {
return Report.getTeamReports(reportObj)
.then(response => {
downloadCsvFile(reportObj.fileName, response.data);
+ AnalyticsHelper.track(REPORTS_EVENTS.DOWNLOAD_REPORT, {
+ reportType: 'team',
+ businessHours: reportObj?.businessHours,
+ });
})
.catch(error => {
console.error(error);
diff --git a/app/javascript/dashboard/store/modules/specs/auth/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/auth/mutations.spec.js
index 43b5d0e3e..0cacff429 100644
--- a/app/javascript/dashboard/store/modules/specs/auth/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/auth/mutations.spec.js
@@ -42,4 +42,19 @@ describe('#mutations', () => {
});
});
});
+ describe('#SET_CURRENT_USER_AVAILABILITY', () => {
+ const state = {
+ currentUser: {
+ id: 1,
+ accounts: [{ id: 1, availability_status: 'offline' }],
+ account_id: 1,
+ },
+ };
+ it('set availability status for current user', () => {
+ mutations[types.SET_CURRENT_USER_AVAILABILITY](state, 'online');
+ expect(state.currentUser.accounts[0].availability_status).toEqual(
+ 'online'
+ );
+ });
+ });
});
diff --git a/app/javascript/dashboard/store/modules/specs/conversationWatchers/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversationWatchers/actions.spec.js
index 115c505ce..25b28a5bb 100644
--- a/app/javascript/dashboard/store/modules/specs/conversationWatchers/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversationWatchers/actions.spec.js
@@ -12,12 +12,12 @@ describe('#actions', () => {
axios.get.mockResolvedValue({ data: { id: 1 } });
await actions.show({ commit }, { conversationId: 1 });
expect(commit.mock.calls).toEqual([
- [types.SET_CONVERSATION_WATCHERS_UI_FLAG, { isFetching: true }],
+ [types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG, { isFetching: true }],
[
- types.SET_CONVERSATION_WATCHERS,
+ types.SET_CONVERSATION_PARTICIPANTS,
{ conversationId: 1, data: { id: 1 } },
],
- [types.SET_CONVERSATION_WATCHERS_UI_FLAG, { isFetching: false }],
+ [types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG, { isFetching: false }],
]);
});
it('sends correct actions if API is error', async () => {
@@ -26,8 +26,8 @@ describe('#actions', () => {
actions.show({ commit }, { conversationId: 1 })
).rejects.toThrow(Error);
expect(commit.mock.calls).toEqual([
- [types.SET_CONVERSATION_WATCHERS_UI_FLAG, { isFetching: true }],
- [types.SET_CONVERSATION_WATCHERS_UI_FLAG, { isFetching: false }],
+ [types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG, { isFetching: true }],
+ [types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG, { isFetching: false }],
]);
});
});
@@ -40,12 +40,12 @@ describe('#actions', () => {
{ conversationId: 2, userIds: [{ id: 2 }] }
);
expect(commit.mock.calls).toEqual([
- [types.SET_CONVERSATION_WATCHERS_UI_FLAG, { isUpdating: true }],
+ [types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG, { isUpdating: true }],
[
- types.SET_CONVERSATION_WATCHERS,
+ types.SET_CONVERSATION_PARTICIPANTS,
{ conversationId: 2, data: [{ id: 2 }] },
],
- [types.SET_CONVERSATION_WATCHERS_UI_FLAG, { isUpdating: false }],
+ [types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG, { isUpdating: false }],
]);
});
it('sends correct actions if API is error', async () => {
@@ -54,8 +54,8 @@ describe('#actions', () => {
actions.update({ commit }, { conversationId: 1, content: 'hi' })
).rejects.toThrow(Error);
expect(commit.mock.calls).toEqual([
- [types.SET_CONVERSATION_WATCHERS_UI_FLAG, { isUpdating: true }],
- [types.SET_CONVERSATION_WATCHERS_UI_FLAG, { isUpdating: false }],
+ [types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG, { isUpdating: true }],
+ [types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG, { isUpdating: false }],
]);
});
});
diff --git a/app/javascript/dashboard/store/modules/specs/conversationWatchers/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/conversationWatchers/mutations.spec.js
index 781e8eaa8..9dc44fbbf 100644
--- a/app/javascript/dashboard/store/modules/specs/conversationWatchers/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversationWatchers/mutations.spec.js
@@ -2,13 +2,13 @@ import types from '../../../mutation-types';
import { mutations } from '../../conversationWatchers';
describe('#mutations', () => {
- describe('#SET_CONVERSATION_WATCHERS', () => {
+ describe('#SET_CONVERSATION_PARTICIPANTS', () => {
it('sets an individual record', () => {
let state = {
records: {},
};
- mutations[types.SET_CONVERSATION_WATCHERS](state, {
+ mutations[types.SET_CONVERSATION_PARTICIPANTS](state, {
data: [],
conversationId: 1,
});
@@ -16,7 +16,7 @@ describe('#mutations', () => {
});
});
- describe('#SET_CONVERSATION_WATCHERS_UI_FLAG', () => {
+ describe('#SET_CONVERSATION_PARTICIPANTS_UI_FLAG', () => {
it('set ui flags', () => {
let state = {
uiFlags: {
@@ -25,7 +25,7 @@ describe('#mutations', () => {
},
};
- mutations[types.SET_CONVERSATION_WATCHERS_UI_FLAG](state, {
+ mutations[types.SET_CONVERSATION_PARTICIPANTS_UI_FLAG](state, {
isFetching: false,
});
expect(state.uiFlags).toEqual({
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
old mode 100755
new mode 100644
index c2d8b30f8..ceff83fab
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -21,6 +21,7 @@ export default {
CLEAR_CONTACT_CONVERSATIONS: 'CLEAR_CONTACT_CONVERSATIONS',
SET_CONVERSATION_FILTERS: 'SET_CONVERSATION_FILTERS',
CLEAR_CONVERSATION_FILTERS: 'CLEAR_CONVERSATION_FILTERS',
+ SET_CONVERSATION_LAST_SEEN: 'SET_CONVERSATION_LAST_SEEN',
SET_CURRENT_CHAT_WINDOW: 'SET_CURRENT_CHAT_WINDOW',
CLEAR_CURRENT_CHAT_WINDOW: 'CLEAR_CURRENT_CHAT_WINDOW',
@@ -260,6 +261,7 @@ export default {
EDIT_MACRO: 'EDIT_MACRO',
DELETE_MACRO: 'DELETE_MACRO',
- SET_CONVERSATION_WATCHERS_UI_FLAG: 'SET_CONVERSATION_WATCHERS_UI_FLAG',
- SET_CONVERSATION_WATCHERS: 'SET_CONVERSATION_WATCHERS',
+ SET_CONVERSATION_PARTICIPANTS_UI_FLAG:
+ 'SET_CONVERSATION_PARTICIPANTS_UI_FLAG',
+ SET_CONVERSATION_PARTICIPANTS: 'SET_CONVERSATION_PARTICIPANTS',
};
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index e3cb16063..4fe005069 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -29,7 +29,7 @@ import {
import FluentIcon from 'shared/components/FluentIcon/DashboardIcon';
import VueDOMPurifyHTML from 'vue-dompurify-html';
import { domPurifyConfig } from '../shared/helpers/HTMLSanitizer';
-import AnalyticsHelper from '../dashboard/helper/AnalyticsHelper';
+import AnalyticsPlugin from '../dashboard/helper/AnalyticsHelper/plugin';
Vue.config.env = process.env;
@@ -37,6 +37,19 @@ if (window.errorLoggingConfig) {
Sentry.init({
Vue,
dsn: window.errorLoggingConfig,
+ denyUrls: [
+ // Chrome extensions
+ /^chrome:\/\//i,
+ /chrome-extension:/i,
+ /extensions\//i,
+
+ // Locally saved copies
+ /file:\/\//i,
+
+ // Safari extensions.
+ /safari-web-extension:/i,
+ /safari-extension:/i,
+ ],
integrations: [new Integrations.BrowserTracing()],
});
}
@@ -55,6 +68,7 @@ Vue.use(VTooltip, {
defaultHtml: false,
});
Vue.use(hljs.vuePlugin);
+Vue.use(AnalyticsPlugin);
Vue.component('multiselect', Multiselect);
Vue.component('woot-switch', WootSwitch);
@@ -74,7 +88,6 @@ window.WootConstants = constants;
window.axios = createAxios(axios);
window.bus = new Vue();
initializeChatwootEvents();
-AnalyticsHelper.init();
initializeAnalyticsEvents();
initalizeRouter();
diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index 32e64b36a..8f4e85bae 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -23,7 +23,11 @@ import {
} from './bubbleHelpers';
import { isWidgetColorLighter } from 'shared/helpers/colorHelper';
import { dispatchWindowEvent } from 'shared/helpers/CustomEventHelper';
-import { CHATWOOT_ERROR, CHATWOOT_READY } from '../widget/constants/sdkEvents';
+import {
+ CHATWOOT_ERROR,
+ CHATWOOT_ON_MESSAGE,
+ CHATWOOT_READY,
+} from '../widget/constants/sdkEvents';
import { SET_USER_ERROR } from '../widget/constants/errorTypes';
import { getUserCookieName } from './cookieHelpers';
import {
@@ -177,7 +181,9 @@ export const IFrameHelper = {
Cookies.remove(getUserCookieName());
}
},
-
+ onMessage({ data }) {
+ dispatchWindowEvent({ eventName: CHATWOOT_ON_MESSAGE, data });
+ },
setBubbleLabel(message) {
setBubbleText(window.$chatwoot.launcherTitle || message.label);
},
diff --git a/app/javascript/sdk/bubbleHelpers.js b/app/javascript/sdk/bubbleHelpers.js
index f2da5e74f..54401a82c 100644
--- a/app/javascript/sdk/bubbleHelpers.js
+++ b/app/javascript/sdk/bubbleHelpers.js
@@ -16,7 +16,7 @@ export const notificationBubble = document.createElement('span');
export const setBubbleText = bubbleText => {
if (isExpandedView(window.$chatwoot.type)) {
const textNode = document.getElementById('woot-widget--expanded__text');
- textNode.innerHTML = bubbleText;
+ textNode.innerText = bubbleText;
}
};
@@ -46,7 +46,7 @@ export const createBubbleIcon = ({ className, path, target }) => {
if (isExpandedView(window.$chatwoot.type)) {
const textNode = document.createElement('div');
textNode.id = 'woot-widget--expanded__text';
- textNode.innerHTML = '';
+ textNode.innerText = '';
target.appendChild(textNode);
bubbleClassName += ' woot-widget--expanded';
}
diff --git a/app/javascript/shared/assets/stylesheets/colors.scss b/app/javascript/shared/assets/stylesheets/colors.scss
index 64b7f3f94..5e45d264f 100644
--- a/app/javascript/shared/assets/stylesheets/colors.scss
+++ b/app/javascript/shared/assets/stylesheets/colors.scss
@@ -1,6 +1,7 @@
:root {
--white: #fff;
--white-transparent: rgba(255, 255, 255, 0.9);
+ --black-transparent: rgba(0, 0, 0, 0.9);
--w-25: #F5FAFF;
--w-50: #EBF5FF;
diff --git a/app/javascript/shared/components/ChatForm.vue b/app/javascript/shared/components/ChatForm.vue
index 347bf39d9..bf3d830eb 100644
--- a/app/javascript/shared/components/ChatForm.vue
+++ b/app/javascript/shared/components/ChatForm.vue
@@ -86,8 +86,8 @@
diff --git a/config/app.yml b/config/app.yml
index ab0d2d9cc..5a5b23178 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
shared: &shared
- version: '2.13.1'
+ version: '2.14.0'
development:
<<: *shared
diff --git a/config/initializers/languages.rb b/config/initializers/languages.rb
index d5131be64..fdd394440 100644
--- a/config/initializers/languages.rb
+++ b/config/initializers/languages.rb
@@ -37,7 +37,8 @@ LANGUAGES_CONFIG = {
32 => { name: 'slovenčina (sk)', iso_639_3_code: 'slk', iso_639_1_code: 'sk', enabled: true },
33 => { name: 'украї́нська мо́ва (uk)', iso_639_3_code: 'ukr', iso_639_1_code: 'uk', enabled: true },
34 => { name: 'ภาษาไทย (th)', iso_639_3_code: 'tha', iso_639_1_code: 'th', enabled: true },
- 35 => { name: 'latviešu valoda (lv)', iso_639_3_code: 'lav', iso_639_1_code: 'lv', enabled: true }
+ 35 => { name: 'latviešu valoda (lv)', iso_639_3_code: 'lav', iso_639_1_code: 'lv', enabled: true },
+ 36 => { name: 'íslenska (is)', iso_639_3_code: 'isl', iso_639_1_code: 'is', enabled: true }
}.filter { |_key, val| val[:enabled] }.freeze
Rails.configuration.i18n.available_locales = LANGUAGES_CONFIG.map { |_index, lang| lang[:iso_639_1_code].to_sym }
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
new file mode 100644
index 000000000..d92d9b040
--- /dev/null
+++ b/config/initializers/omniauth.rb
@@ -0,0 +1,5 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+ provider :google_oauth2, ENV.fetch('GOOGLE_OAUTH_CLIENT_ID', nil), ENV.fetch('GOOGLE_OAUTH_CLIENT_SECRET', nil), {
+ provider_ignores_state: true
+ }
+end
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 46ca2cdcb..f04ecaadb 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -104,6 +104,11 @@ class Rack::Attack
throttle('api/v1/widget/contacts', limit: 60, period: 1.hour) do |req|
req.ip if req.path_without_extentions == '/api/v1/widget/contacts' && (req.patch? || req.put?)
end
+
+ ## Prevent Conversation Bombing through multiple sessions
+ throttle('widget?website_token={website_token}&cw_conversation={x-auth-token}', limit: 5, period: 1.hour) do |req|
+ req.ip if req.path_without_extentions == '/widget' && ActionDispatch::Request.new(req.env).params['cw_conversation'].blank?
+ end
end
# Log blocked events
diff --git a/config/integration/apps.yml b/config/integration/apps.yml
index 97145e1c1..d4743a941 100644
--- a/config/integration/apps.yml
+++ b/config/integration/apps.yml
@@ -91,3 +91,40 @@ dyte:
},
]
visible_properties: ["organization_id"]
+google_translate:
+ id: google_translate
+ logo: googletranslate.png
+ i18n_key: google_translate
+ action: /google_translate
+ hook_type: account
+ allow_multiple_hooks: false
+ settings_json_schema: {
+ "type": "object",
+ "properties": {
+ "project_id": { "type": "string" },
+ "credentials": { "type": "object" },
+ },
+ "required": ["project_id", "credentials"],
+ "additionalProperties": false,
+ }
+ settings_form_schema: [
+ {
+ "label": "Google Cloud Project ID",
+ "type": "text",
+ "name": "project_id",
+ "validation": "required",
+ "validationName": "Project Id",
+ },
+ {
+ "label": "Google Cloud Project Key File",
+ "type": "textarea",
+ "name": "credentials",
+ "validation": "required|JSON",
+ "validationName": "Credentials",
+ "validation-messages": {
+ "JSON": "Invalid JSON",
+ "required": "Credentials is required"
+ },
+ },
+ ]
+ visible_properties: ['project_id']
diff --git a/config/locales/de.yml b/config/locales/de.yml
index ba4a6449e..aad31cfa3 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -45,7 +45,7 @@ de:
locale:
unique: sollte in der Kategorie und im Portal eindeutig sein
dyte:
- invalid_message_type: "Invalid message type. Action not permitted"
+ invalid_message_type: "Ungültiger Nachrichtentyp. Aktion nicht erlaubt"
inboxes:
imap:
socket_error: Bitte überprüfen Sie die Netzwerkverbindung, die IMAP-Adresse und versuchen Sie es erneut.
@@ -141,8 +141,8 @@ de:
integration_apps:
dyte:
name: "Dyte"
- description: "Dyte is tool that helps you to add live audio & video to your application with just a few lines of code. This integration allows you to give an option to your agents to have a video or voice call with your customers from without leaving Chatwoot."
- meeting_name: "%{agent_name} has started a meeting"
+ description: "Dyte ist ein Tool, mit dem Sie Live-Audio & Video zu Ihrer Anwendung mit nur wenigen Zeilen Code hinzufügen können. Mit dieser Integration können Sie Ihren Agenten die Möglichkeit geben, einen Video- oder Sprachanruf mit Ihren Kunden zu führen, ohne Chatwoot zu verlassen."
+ meeting_name: "%{agent_name} hat ein Meeting begonnen"
slack:
name: "Slack"
description: "Slack ist ein Chat-Tool, das all deine Kommunikation an einem Ort zusammenbringt. Durch die Integration von Slack kannst du über alle neuen Unterhaltungen in deinem Account direkt in deinem Slack benachrichtigt werden."
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ea7c24c06..be8904057 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -171,6 +171,9 @@ en:
fullcontact:
name: "Fullcontact"
description: "FullContact integration helps to enrich visitor profiles. Identify the users as soon as they share their email address and offer them tailored customer service. Connect your FullContact to your account by sharing the FullContact API Key."
+ google_translate:
+ name: "Google Translate"
+ description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
public_portal:
search:
search_placeholder: Search for article by title or body...
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index bdca1c819..b578ea860 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -45,7 +45,7 @@ fr:
locale:
unique: Doit être unique dans la catégorie et le portail
dyte:
- invalid_message_type: "Invalid message type. Action not permitted"
+ invalid_message_type: "Type de message invalide. Action non autorisée"
inboxes:
imap:
socket_error: Veuillez vérifier la connexion, l'adresse IMAP et réessayez.
@@ -88,7 +88,7 @@ fr:
agent_name: Nom de l'agent
rating: Note
feedback: Commentaire
- recorded_at: Recorded date
+ recorded_at: Date d'enregistrement
notifications:
notification_title:
conversation_creation: "[Nouvelle conversation] - #%{display_id} a été créé dans %{inbox_name}"
@@ -97,7 +97,7 @@ fr:
conversation_mention: "Vous avez été mentionné dans la conversation [ID - %{display_id}] par %{name}"
conversations:
messages:
- instagram_story_content: "%{story_sender} vous a mentionné dans l'histoire: "
+ instagram_story_content: "%{story_sender} vous a mentionné dans la story: "
instagram_deleted_story_content: Cette Story n'est plus disponible.
deleted: Ce message a été supprimé
activity:
@@ -141,8 +141,8 @@ fr:
integration_apps:
dyte:
name: "Dyte"
- description: "Dyte is tool that helps you to add live audio & video to your application with just a few lines of code. This integration allows you to give an option to your agents to have a video or voice call with your customers from without leaving Chatwoot."
- meeting_name: "%{agent_name} has started a meeting"
+ description: "Dyte est un outil qui vous aide à ajouter de l'audio et de la vidéo en direct à votre application avec seulement quelques lignes de code. Cette intégration vous permet de donner une option à vos agents de passer un appel vidéo ou vocal avec vos clients sans quitter Chatwoot."
+ meeting_name: "%{agent_name} a démarré une réunion"
slack:
name: "Slack"
description: "Slack est un outil de chat qui regroupe toutes vos communications en un seul endroit. En intégrant Slack, vous pouvez être notifié de toutes les nouvelles conversations de votre compte directement dans votre Slack."
diff --git a/config/routes.rb b/config/routes.rb
index 912324842..0ac64012e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,11 +1,11 @@
Rails.application.routes.draw do
# AUTH STARTS
- match 'auth/:provider/callback', to: 'home#callback', via: [:get, :post]
mount_devise_token_auth_for 'User', at: 'auth', controllers: {
confirmations: 'devise_overrides/confirmations',
passwords: 'devise_overrides/passwords',
sessions: 'devise_overrides/sessions',
- token_validations: 'devise_overrides/token_validations'
+ token_validations: 'devise_overrides/token_validations',
+ omniauth_callbacks: 'devise_overrides/omniauth_callbacks'
}, via: [:get, :post]
## renders the frontend paths only if its not an api only server
@@ -74,9 +74,14 @@ Rails.application.routes.draw do
post :filter
end
scope module: :conversations do
- resources :messages, only: [:index, :create, :destroy]
+ resources :messages, only: [:index, :create, :destroy] do
+ member do
+ post :translate
+ end
+ end
resources :assignments, only: [:create]
resources :labels, only: [:create, :index]
+ resource :participants, only: [:show, :create, :update, :destroy]
resource :direct_uploads, only: [:create]
end
member do
@@ -177,8 +182,11 @@ Rails.application.routes.draw do
patch :archive
put :add_members
end
+ post :attach_file, on: :collection
resources :categories
- resources :articles
+ resources :articles do
+ post :attach_file, on: :collection
+ end
end
end
end
@@ -350,6 +358,7 @@ Rails.application.routes.draw do
# Routes for external service verifications
get 'apple-app-site-association' => 'apple_app#site_association'
get '.well-known/assetlinks.json' => 'android_app#assetlinks'
+ get '.well-known/microsoft-identity-association.json' => 'microsoft#identity_association'
# ----------------------------------------------------------------------
# Internal Monitoring Routes
@@ -373,6 +382,7 @@ Rails.application.routes.draw do
resources :installation_configs, only: [:index, :new, :create, :show, :edit, :update]
resources :agent_bots, only: [:index, :new, :create, :show, :edit, :update]
resources :platform_apps, only: [:index, :new, :create, :show, :edit, :update]
+ resource :instance_status, only: [:show]
# resources that doesn't appear in primary navigation in super admin
resources :account_users, only: [:new, :create, :destroy]
diff --git a/config/webpack/resolve.js b/config/webpack/resolve.js
index ce17c0db4..cbef68e8a 100644
--- a/config/webpack/resolve.js
+++ b/config/webpack/resolve.js
@@ -9,6 +9,7 @@ const resolve = {
survey: path.resolve('./app/javascript/survey'),
assets: path.resolve('./app/javascript/dashboard/assets'),
components: path.resolve('./app/javascript/dashboard/components'),
+ helpers: path.resolve('./app/javascript/shared/helpers'),
'./iconfont.eot': 'vue-easytable/libs/font/iconfont.eot',
'./iconfont.woff': 'vue-easytable/libs/font/iconfont.woff',
'./iconfont.ttf': 'vue-easytable/libs/font/iconfont.ttf',
diff --git a/db/migrate/20220808193420_add_conversation_participants.rb b/db/migrate/20220808193420_add_conversation_participants.rb
new file mode 100644
index 000000000..a130a5e01
--- /dev/null
+++ b/db/migrate/20220808193420_add_conversation_participants.rb
@@ -0,0 +1,11 @@
+class AddConversationParticipants < ActiveRecord::Migration[6.1]
+ def change
+ create_table 'conversation_participants', force: :cascade do |t|
+ t.references :account, null: false
+ t.references :user, null: false
+ t.references :conversation, null: false
+ t.datetime 'created_at', precision: 6, null: false
+ t.datetime 'updated_at', precision: 6, null: false
+ end
+ end
+end
diff --git a/db/migrate/20230118155353_add_unique_index_to_conversation_participants.rb b/db/migrate/20230118155353_add_unique_index_to_conversation_participants.rb
new file mode 100644
index 000000000..cf47c6ea8
--- /dev/null
+++ b/db/migrate/20230118155353_add_unique_index_to_conversation_participants.rb
@@ -0,0 +1,5 @@
+class AddUniqueIndexToConversationParticipants < ActiveRecord::Migration[6.1]
+ def change
+ add_index :conversation_participants, [:user_id, :conversation_id], unique: true
+ end
+end
diff --git a/db/migrate/20230209033203_update_default_on_subscriptions_webhooks.rb b/db/migrate/20230209033203_update_default_on_subscriptions_webhooks.rb
new file mode 100644
index 000000000..18be46ebe
--- /dev/null
+++ b/db/migrate/20230209033203_update_default_on_subscriptions_webhooks.rb
@@ -0,0 +1,9 @@
+class UpdateDefaultOnSubscriptionsWebhooks < ActiveRecord::Migration[6.1]
+ def change
+ change_column_default :webhooks, :subscriptions,
+ from: %w[conversation_status_changed conversation_updated conversation_created
+ message_created message_updated webwidget_triggered],
+ to: %w[conversation_status_changed conversation_updated conversation_created
+ contact_created contact_updated message_created message_updated webwidget_triggered]
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2b279b55a..68284421c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2022_12_30_113108) do
+ActiveRecord::Schema.define(version: 2023_02_09_033203) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_stat_statements"
@@ -388,6 +388,18 @@ ActiveRecord::Schema.define(version: 2022_12_30_113108) do
t.index ["phone_number", "account_id"], name: "index_contacts_on_phone_number_and_account_id"
end
+ create_table "conversation_participants", force: :cascade do |t|
+ t.bigint "account_id", null: false
+ t.bigint "user_id", null: false
+ t.bigint "conversation_id", null: false
+ t.datetime "created_at", precision: 6, null: false
+ t.datetime "updated_at", precision: 6, null: false
+ t.index ["account_id"], name: "index_conversation_participants_on_account_id"
+ t.index ["conversation_id"], name: "index_conversation_participants_on_conversation_id"
+ t.index ["user_id", "conversation_id"], name: "index_conversation_participants_on_user_id_and_conversation_id", unique: true
+ t.index ["user_id"], name: "index_conversation_participants_on_user_id"
+ end
+
create_table "conversations", id: :serial, force: :cascade do |t|
t.integer "account_id", null: false
t.integer "inbox_id", null: false
@@ -851,7 +863,7 @@ ActiveRecord::Schema.define(version: 2022_12_30_113108) do
t.datetime "created_at", precision: 6, null: false
t.datetime "updated_at", precision: 6, null: false
t.integer "webhook_type", default: 0
- t.jsonb "subscriptions", default: ["conversation_status_changed", "conversation_updated", "conversation_created", "message_created", "message_updated", "webwidget_triggered"]
+ t.jsonb "subscriptions", default: ["conversation_status_changed", "conversation_updated", "conversation_created", "contact_created", "contact_updated", "message_created", "message_updated", "webwidget_triggered"]
t.index ["account_id", "url"], name: "index_webhooks_on_account_id_and_url", unique: true
end
diff --git a/deployment/chatwoot-web.1.service b/deployment/chatwoot-web.1.service
index 15d70e1bf..d3650b977 100644
--- a/deployment/chatwoot-web.1.service
+++ b/deployment/chatwoot-web.1.service
@@ -16,10 +16,10 @@ KillMode=mixed
StandardInput=null
SyslogIdentifier=%p
-Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.0.4/bin:/home/chatwoot/.rvm/gems/ruby-3.0.4@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.0.4/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
+Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.1.3/bin:/home/chatwoot/.rvm/gems/ruby-3.1.3@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.1.3/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
Environment="PORT=3000"
Environment="RAILS_ENV=production"
Environment="NODE_ENV=production"
Environment="RAILS_LOG_TO_STDOUT=true"
-Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.0.4"
-Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.0.4:/home/chatwoot/.rvm/gems/ruby-3.0.4@global"
+Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.1.3"
+Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.1.3:/home/chatwoot/.rvm/gems/ruby-3.1.3@global"
diff --git a/deployment/chatwoot-worker.1.service b/deployment/chatwoot-worker.1.service
index b3f8804ce..5d4ac9512 100644
--- a/deployment/chatwoot-worker.1.service
+++ b/deployment/chatwoot-worker.1.service
@@ -16,10 +16,10 @@ KillMode=mixed
StandardInput=null
SyslogIdentifier=%p
-Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.0.4/bin:/home/chatwoot/.rvm/gems/ruby-3.0.4@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.0.4/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
+Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.1.3/bin:/home/chatwoot/.rvm/gems/ruby-3.1.3@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.1.3/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
Environment="PORT=3000"
Environment="RAILS_ENV=production"
Environment="NODE_ENV=production"
Environment="RAILS_LOG_TO_STDOUT=true"
-Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.0.4"
-Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.0.4:/home/chatwoot/.rvm/gems/ruby-3.0.4@global"
+Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.1.3"
+Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.1.3:/home/chatwoot/.rvm/gems/ruby-3.1.3@global"
diff --git a/deployment/setup_20.04.sh b/deployment/setup_20.04.sh
index 4e86478c7..82f4aca40 100644
--- a/deployment/setup_20.04.sh
+++ b/deployment/setup_20.04.sh
@@ -172,7 +172,7 @@ EOF
function install_dependencies() {
apt update && apt upgrade -y
apt install -y curl
- curl -sL https://deb.nodesource.com/setup_12.x | bash -
+ curl -sL https://deb.nodesource.com/setup_16.x | bash -
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
apt update
@@ -328,8 +328,8 @@ function setup_chatwoot() {
sudo -i -u chatwoot << EOF
rvm --version
rvm autolibs disable
- rvm install "ruby-3.0.4"
- rvm use 3.0.4 --default
+ rvm install "ruby-3.1.3"
+ rvm use 3.1.3 --default
git clone https://github.com/chatwoot/chatwoot.git
cd chatwoot
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ca689a38b..aaa48b5a9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
# pre-build stage
-FROM ruby:3.0.4-alpine AS pre-builder
+FROM ruby:3.1.3-alpine3.16 AS pre-builder
# ARG default to production settings
# For development docker-compose file overrides ARGS
@@ -61,11 +61,12 @@ RUN if [ "$RAILS_ENV" = "production" ]; then \
fi
# Remove unnecessary files
-RUN rm -rf /gems/ruby/3.0.0/cache/*.gem \
- && find /gems/ruby/3.0.0/gems/ \( -name "*.c" -o -name "*.o" \) -delete
+RUN rm -rf /gems/ruby/3.1.0/cache/*.gem \
+ && find /gems/ruby/3.1.0/gems/ \( -name "*.c" -o -name "*.o" \) -delete
# final build stage
-FROM ruby:3.0.4-alpine
+FROM ruby:3.1.3-alpine3.16
+
ARG BUNDLE_WITHOUT="development:test"
ENV BUNDLE_WITHOUT ${BUNDLE_WITHOUT}
diff --git a/lib/integrations/google_translate/processor_service.rb b/lib/integrations/google_translate/processor_service.rb
new file mode 100644
index 000000000..5c0be7545
--- /dev/null
+++ b/lib/integrations/google_translate/processor_service.rb
@@ -0,0 +1,30 @@
+class Integrations::GoogleTranslate::ProcessorService
+ pattr_initialize [:message!, :target_language!]
+
+ def perform
+ return if message.content.blank?
+ return if hook.blank?
+
+ response = client.translate_text(
+ contents: [message.content],
+ target_language_code: target_language,
+ parent: "projects/#{hook.settings['project_id']}"
+ )
+
+ return if response.translations.first.blank?
+
+ response.translations.first.translated_text
+ end
+
+ private
+
+ def hook
+ @hook ||= message.account.hooks.find_by(app_id: 'google_translate')
+ end
+
+ def client
+ @client ||= Google::Cloud::Translate.translation_service do |config|
+ config.credentials = hook.settings['credentials']
+ end
+ end
+end
diff --git a/lib/integrations/slack/send_on_slack_service.rb b/lib/integrations/slack/send_on_slack_service.rb
index 87440cb6e..6a8751e47 100644
--- a/lib/integrations/slack/send_on_slack_service.rb
+++ b/lib/integrations/slack/send_on_slack_service.rb
@@ -36,10 +36,23 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
if conversation.identifier.present?
"#{private_indicator}#{message.content}"
else
- "\n*Inbox:* #{message.inbox.name} (#{message.inbox.inbox_type})\n\n#{message.content}"
+ "#{formatted_inbox_name}#{email_subject_line}\n#{message.content}"
end
end
+ def formatted_inbox_name
+ "\n*Inbox:* #{message.inbox.name} (#{message.inbox.inbox_type})\n"
+ end
+
+ def email_subject_line
+ return '' unless message.inbox.email?
+
+ email_payload = message.content_attributes['email']
+ return "*Subject:* #{email_payload['subject']}\n\n" if email_payload.present? && email_payload['subject'].present?
+
+ ''
+ end
+
def avatar_url(sender)
sender_type = sender.instance_of?(Contact) ? 'contact' : 'user'
"#{ENV.fetch('FRONTEND_URL', nil)}/integrations/slack/#{sender_type}.png"
diff --git a/lib/limits.rb b/lib/limits.rb
new file mode 100644
index 000000000..1e2d36447
--- /dev/null
+++ b/lib/limits.rb
@@ -0,0 +1,3 @@
+module Limits
+ BULK_ACTIONS_LIMIT = 100
+end
diff --git a/lib/seeders/account_seeder.rb b/lib/seeders/account_seeder.rb
index 1f665acc5..7af6110d2 100644
--- a/lib/seeders/account_seeder.rb
+++ b/lib/seeders/account_seeder.rb
@@ -3,7 +3,7 @@
### Usage #####
#
# # Seed an account with all data types in this class
-# Seeders::AccountSeeder.new(account: @Account.find(1)).perform!
+# Seeders::AccountSeeder.new(account: Account.find(1)).perform!
#
#
############################################################
@@ -89,16 +89,25 @@ class Seeders::AccountSeeder
conversation = contact_inbox.conversations.create!(account: contact_inbox.inbox.account, contact: contact_inbox.contact,
inbox: contact_inbox.inbox, assignee: assignee)
create_messages(conversation: conversation, messages: conversation_data['messages'])
+ conversation.update_labels(conversation_data[:labels]) if conversation_data[:labels].present?
end
def create_messages(conversation:, messages:)
messages.each do |message_data|
- sender = User.find_by(email: message_data['sender']) if message_data['sender'].present?
+ sender = find_message_sender(conversation, message_data)
conversation.messages.create!(message_data.slice('content', 'message_type').merge(account: conversation.inbox.account, sender: sender,
inbox: conversation.inbox))
end
end
+ def find_message_sender(conversation, message_data)
+ if message_data['message_type'] == 'incoming'
+ User.find_by(email: message_data['sender']) if message_data['sender'].present?
+ else
+ conversation.contact
+ end
+ end
+
def seed_inboxes
Seeders::InboxSeeder.new(account: @account, company_data: @account_data[:company]).perform!
end
diff --git a/lib/seeders/seed_data.yml b/lib/seeders/seed_data.yml
index 5e41e0131..5426f4c9a 100644
--- a/lib/seeders/seed_data.yml
+++ b/lib/seeders/seed_data.yml
@@ -222,6 +222,7 @@ contacts:
gender: 'male'
conversations:
- channel: Channel::Whatsapp
+ source_id: "123456723"
messages:
- message_type: incoming
content: hello world
@@ -263,6 +264,7 @@ contacts:
gender: 'male'
conversations:
- channel: Channel::Whatsapp
+ source_id: "12323432"
messages:
- message_type: incoming
content: hello world
@@ -271,6 +273,7 @@ contacts:
gender: 'male'
conversations:
- channel: Channel::Whatsapp
+ source_id: "12342234324"
messages:
- message_type: incoming
content: hello world
@@ -330,6 +333,12 @@ contacts:
gender: 'female'
conversations:
- channel: Channel::Whatsapp
+ source_id: "1223423567"
+ labels:
+ - billing
+ - delivery
+ - ops-handover
+ - premium-customer
messages:
- message_type: incoming
content: "Hey \n I didn't get the product delivered, but it shows it is delivered to my address. Please check"
@@ -338,6 +347,9 @@ contacts:
gender: 'male'
conversations:
- channel: Channel::WebWidget
+ labels:
+ - software
+ - ops-handover
messages:
- message_type: incoming
content: "Hey there, \n I need some help with the product, my button is not working on the website."
@@ -347,6 +359,10 @@ contacts:
conversations:
- channel: Channel::WebWidget
assignee: michael_scott@paperlayer.test
+ labels:
+ - billing
+ - software
+ - lead
messages:
- message_type: incoming
content: "Hey, \n My card is not working on your website. Please help"
@@ -357,6 +373,9 @@ contacts:
- channel: Channel::Email
source_id: "cmathersonj@va.test"
assignee: michael_scott@paperlayer.test
+ labels:
+ - billing
+ - lead
messages:
- message_type: incoming
content: "Hey, \n I'm looking for some help to figure out if it is the right product for me."
diff --git a/lib/vapid_service.rb b/lib/vapid_service.rb
index 2e8b581ea..ea3498658 100644
--- a/lib/vapid_service.rb
+++ b/lib/vapid_service.rb
@@ -12,7 +12,7 @@ class VapidService
return config['VAPID_KEYS'] if config['VAPID_KEYS'].present?
# keys don't exist in the database. so let's generate and save them
- keys = Webpush.generate_key
+ keys = WebPush.generate_key
# TODO: remove the logic on environment variables when we completely deprecate
public_key = ENV.fetch('VAPID_PUBLIC_KEY') { keys.public_key }
private_key = ENV.fetch('VAPID_PRIVATE_KEY') { keys.private_key }
diff --git a/package.json b/package.json
index 1c228139d..a5fde6a4b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@chatwoot/chatwoot",
- "version": "2.13.1",
+ "version": "2.14.0",
"license": "MIT",
"scripts": {
"eslint": "eslint app/**/*.{js,vue}",
@@ -19,8 +19,8 @@
},
"dependencies": {
"@braid/vue-formulate": "^2.5.2",
- "@chatwoot/prosemirror-schema": "https://github.com/chatwoot/prosemirror-schema.git#beta",
- "@chatwoot/utils": "^0.0.10",
+ "@chatwoot/prosemirror-schema": "https://github.com/chatwoot/prosemirror-schema.git",
+ "@chatwoot/utils": "^0.0.11",
"@hcaptcha/vue-hcaptcha": "^0.3.2",
"@june-so/analytics-next": "^1.36.5",
"@rails/actioncable": "6.1.3",
@@ -122,7 +122,6 @@
},
"husky": {
"hooks": {
- "pre-commit": "lint-staged",
"pre-push": "sh bin/validate_push"
}
},
@@ -138,10 +137,6 @@
"eslint --fix",
"git add"
],
- "!(*schema).rb": [
- "bundle exec rubocop -a",
- "git add"
- ],
"*.scss": [
"scss-lint"
]
diff --git a/public/assets/images/auth/google.svg b/public/assets/images/auth/google.svg
new file mode 100644
index 000000000..088288fa3
--- /dev/null
+++ b/public/assets/images/auth/google.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/dashboard/images/integrations/googletranslate.png b/public/dashboard/images/integrations/googletranslate.png
new file mode 100644
index 000000000..d502ea051
Binary files /dev/null and b/public/dashboard/images/integrations/googletranslate.png differ
diff --git a/spec/builders/messages/message_builder_spec.rb b/spec/builders/messages/message_builder_spec.rb
index b17f752db..845c1ab99 100644
--- a/spec/builders/messages/message_builder_spec.rb
+++ b/spec/builders/messages/message_builder_spec.rb
@@ -78,5 +78,26 @@ describe ::Messages::MessageBuilder do
end
end
end
+
+ context 'when email channel messages' do
+ let!(:channel_email) { create(:channel_email, account: account) }
+ let(:inbox_member) { create(:inbox_member, inbox: channel_email.inbox) }
+ let(:conversation) { create(:conversation, inbox: channel_email.inbox, account: account) }
+ let(:params) do
+ ActionController::Parameters.new({ cc_emails: 'test_cc_mail@test.com', bcc_emails: 'test_bcc_mail@test.com' })
+ end
+
+ it 'creates message with content_attributes for cc and bcc email addresses' do
+ message = message_builder
+
+ expect(message.content_attributes[:cc_emails]).to eq [params[:cc_emails]]
+ expect(message.content_attributes[:bcc_emails]).to eq [params[:bcc_emails]]
+ end
+
+ it 'does not create message with wrong cc and bcc email addresses' do
+ params = ActionController::Parameters.new({ cc_emails: 'test.com', bcc_emails: 'test_bcc.com' })
+ expect { described_class.new(user, conversation, params).perform }.to raise_error 'Invalid email address'
+ end
+ end
end
end
diff --git a/spec/controllers/api/v1/accounts/articles_controller_spec.rb b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
index 1de808a20..747a0c88d 100644
--- a/spec/controllers/api/v1/accounts/articles_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
@@ -232,5 +232,23 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
expect(json_response['payload']['id']).to eq(root_article.id)
end
end
+
+ describe 'Upload an image' do
+ let(:article) { create(:article, account_id: account.id, category_id: category.id, portal_id: portal.id, author_id: agent.id) }
+
+ it 'update the article with an image' do
+ file = fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png')
+
+ post "/api/v1/accounts/#{account.id}/portals/#{article.portal.slug}/articles/attach_file",
+ headers: agent.create_new_auth_token,
+ params: { background_image: file }
+
+ expect(response).to have_http_status(:success)
+
+ blob = JSON.parse(response.body)
+
+ expect(blob['file_url']).to be_present
+ end
+ end
end
end
diff --git a/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb b/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
index e6128ca82..8306ec539 100644
--- a/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
@@ -12,6 +12,10 @@ RSpec.describe 'Api::V1::Accounts::BulkActionsController', type: :request do
create(:conversation, account_id: account.id, status: :open, team_id: team_1.id)
create(:conversation, account_id: account.id, status: :open)
create(:conversation, account_id: account.id, status: :open)
+ Conversation.all.each do |conversation|
+ create(:inbox_member, inbox: conversation.inbox, user: agent_1)
+ create(:inbox_member, inbox: conversation.inbox, user: agent_2)
+ end
end
describe 'POST /api/v1/accounts/{account.id}/bulk_action' do
diff --git a/spec/controllers/api/v1/accounts/canned_responses_controller_spec.rb b/spec/controllers/api/v1/accounts/canned_responses_controller_spec.rb
index 128fb4d53..228da2d56 100644
--- a/spec/controllers/api/v1/accounts/canned_responses_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/canned_responses_controller_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe 'Canned Responses API', type: :request do
let(:account) { create(:account) }
before do
- create(:canned_response, account: account)
+ create(:canned_response, account: account, content: 'Hey {{ contact.name }}, Thanks for reaching out', short_code: 'name-short-code')
end
describe 'GET /api/v1/accounts/{account.id}/canned_responses' do
@@ -29,9 +29,12 @@ RSpec.describe 'Canned Responses API', type: :request do
end
it 'returns all the canned responses the user searched for' do
- create(:canned_response, account: account)
+ cr1 = account.canned_responses.first
+ create(:canned_response, account: account, content: 'Great! Looking forward', short_code: 'short-code')
+ cr2 = create(:canned_response, account: account, content: 'Thanks for reaching out', short_code: 'content-with-thanks')
+ cr3 = create(:canned_response, account: account, content: 'Thanks for reaching out', short_code: 'Thanks')
- params = { search: CannedResponse.last.short_code }
+ params = { search: 'thanks' }
get "/api/v1/accounts/#{account.id}/canned_responses",
params: params,
@@ -39,7 +42,9 @@ RSpec.describe 'Canned Responses API', type: :request do
as: :json
expect(response).to have_http_status(:success)
- expect(JSON.parse(response.body)).to eq([CannedResponse.last].as_json)
+ expect(JSON.parse(response.body)).to eq(
+ [cr3, cr2, cr1].as_json
+ )
end
end
end
@@ -65,7 +70,7 @@ RSpec.describe 'Canned Responses API', type: :request do
as: :json
expect(response).to have_http_status(:success)
- expect(CannedResponse.count).to eq(2)
+ expect(account.canned_responses.count).to eq(2)
end
end
end
diff --git a/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb
index dbe19690a..a4e9d8cb0 100644
--- a/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations/assignments_controller_spec.rb
@@ -56,8 +56,8 @@ RSpec.describe 'Conversation Assignment API', type: :request do
let(:agent) { create(:user, account: account, role: :agent) }
before do
- conversation.update!(assignee: agent)
create(:inbox_member, inbox: conversation.inbox, user: agent)
+ conversation.update!(assignee: agent)
end
it 'unassigns the assignee from the conversation' do
diff --git a/spec/controllers/api/v1/accounts/conversations/participants_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations/participants_controller_spec.rb
new file mode 100644
index 000000000..6238314ab
--- /dev/null
+++ b/spec/controllers/api/v1/accounts/conversations/participants_controller_spec.rb
@@ -0,0 +1,142 @@
+require 'rails_helper'
+
+RSpec.describe 'Conversation Participants API', type: :request do
+ let(:account) { create(:account) }
+ let(:conversation) { create(:conversation, account: account) }
+ let(:agent) { create(:user, account: account, role: :agent) }
+
+ before do
+ create(:inbox_member, inbox: conversation.inbox, user: agent)
+ end
+
+ describe 'GET /api/v1/accounts/{account.id}/conversations/
-
-