@@ -436,7 +318,6 @@
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
index 820b4631b..31eff872e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
@@ -163,7 +163,7 @@ export default {
FB.init({
appId: window.chatwootConfig.fbAppId,
xfbml: true,
- version: 'v12.0',
+ version: window.chatwootConfig.fbApiVersion,
status: true,
});
window.fbSDKLoaded = true;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue
index 736642f29..d86ebaaff 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue
@@ -40,7 +40,7 @@ export default {
FB.init({
appId: window.chatwootConfig.fbAppId,
xfbml: true,
- version: 'v12.0',
+ version: window.chatwootConfig.fbApiVersion,
status: true,
});
window.fbSDKLoaded = true;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
new file mode 100644
index 000000000..2b3fa413f
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
new file mode 100644
index 000000000..cc8746fed
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/services/instagram/message_text.rb b/app/services/instagram/message_text.rb
index 75c77b540..619ef4c90 100644
--- a/app/services/instagram/message_text.rb
+++ b/app/services/instagram/message_text.rb
@@ -22,7 +22,7 @@ class Instagram::MessageText < Instagram::WebhooksBaseService
return unsend_message if message_is_deleted?
- ensure_contact(contact_id)
+ ensure_contact(contact_id) if contacts_first_message?(contact_id)
create_message
end
@@ -36,7 +36,7 @@ class Instagram::MessageText < Instagram::WebhooksBaseService
rescue Koala::Facebook::AuthenticationError
@inbox.channel.authorization_error!
raise
- rescue StandardError => e
+ rescue StandardError, Koala::Facebook::ClientError => e
result = {}
ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
end
@@ -52,6 +52,10 @@ class Instagram::MessageText < Instagram::WebhooksBaseService
@messaging[:message][:is_deleted].present?
end
+ def contacts_first_message?(ig_scope_id)
+ @inbox.contact_inboxes.where(source_id: ig_scope_id).empty? && @inbox.channel.instagram_id.present?
+ end
+
def unsend_message
message_to_delete = @inbox.messages.find_by(
source_id: @messaging[:message][:mid]
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index f7d7155d1..3f91ac042 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -34,6 +34,7 @@
window.chatwootConfig = {
hostURL: '<%= ENV.fetch('FRONTEND_URL', '') %>',
fbAppId: '<%= ENV.fetch('FB_APP_ID', nil) %>',
+ fbApiVersion: '<%= @global_config['FACEBOOK_API_VERSION'] %>',
signupEnabled: '<%= @global_config['ENABLE_ACCOUNT_SIGNUP'] %>',
<% if @global_config['VAPID_PUBLIC_KEY'] %>
vapidPublicKey: new Uint8Array(<%= Base64.urlsafe_decode64(@global_config['VAPID_PUBLIC_KEY']).bytes %>),
diff --git a/lib/integrations/slack/incoming_message_builder.rb b/lib/integrations/slack/incoming_message_builder.rb
index ec4f8e2b5..86c3c232b 100644
--- a/lib/integrations/slack/incoming_message_builder.rb
+++ b/lib/integrations/slack/incoming_message_builder.rb
@@ -37,7 +37,7 @@ class Integrations::Slack::IncomingMessageBuilder
if message.present?
SUPPORTED_MESSAGE_TYPES.include?(message[:type]) && !attached_file_message?
else
- params[:event][:files].any? && !attached_file_message?
+ params[:event][:files].present? && !attached_file_message?
end
end
diff --git a/lib/seeders/account_seeder.rb b/lib/seeders/account_seeder.rb
index 65fe5a4e1..162bc4cd9 100644
--- a/lib/seeders/account_seeder.rb
+++ b/lib/seeders/account_seeder.rb
@@ -17,6 +17,7 @@ class Seeders::AccountSeeder
def seed!
seed_canned_responses
+ seed_inboxes
end
def seed_canned_responses(count: 50)
@@ -24,4 +25,65 @@ class Seeders::AccountSeeder
account.canned_responses.create(content: Faker::Quote.fortune_cookie, short_code: Faker::Alphanumeric.alpha(number: 10))
end
end
+
+ def seed_inboxes
+ seed_website_inbox
+ seed_facebook_inbox
+ seed_twitter_inbox
+ seed_whatsapp_inbox
+ seed_sms_inbox
+ seed_email_inbox
+ seed_api_inbox
+ seed_telegram_inbox
+ seed_line_inbox
+ end
+
+ def seed_website_inbox
+ channel = Channel::WebWidget.create!(account: account, website_url: 'https://acme.inc')
+ Inbox.create!(channel: channel, account: account, name: 'Acme Website')
+ end
+
+ def seed_facebook_inbox
+ channel = Channel::FacebookPage.create!(account: account, user_access_token: 'test', page_access_token: 'test', page_id: 'test')
+ Inbox.create!(channel: channel, account: account, name: 'Acme Facebook')
+ end
+
+ def seed_twitter_inbox
+ channel = Channel::TwitterProfile.create!(account: account, twitter_access_token: 'test', twitter_access_token_secret: 'test', profile_id: '123')
+ Inbox.create!(channel: channel, account: account, name: 'Acme Twitter')
+ end
+
+ def seed_whatsapp_inbox
+ channel = Channel::Whatsapp.create!(account: account, phone_number: '+123456789')
+ Inbox.create!(channel: channel, account: account, name: 'Acme Whatsapp')
+ end
+
+ def seed_sms_inbox
+ channel = Channel::Sms.create!(account: account, phone_number: '+123456789')
+ Inbox.create!(channel: channel, account: account, name: 'Acme SMS')
+ end
+
+ def seed_email_inbox
+ channel = Channel::Email.create!(account: account, email: 'test@acme.inc', forward_to_email: 'test_fwd@acme.inc')
+ Inbox.create!(channel: channel, account: account, name: 'Acme Email')
+ end
+
+ def seed_api_inbox
+ channel = Channel::Api.create!(account: account)
+ Inbox.create!(channel: channel, account: account, name: 'Acme API')
+ end
+
+ def seed_telegram_inbox
+ # rubocop:disable Rails/SkipsModelValidations
+ Channel::Telegram.insert({ account_id: account.id, bot_name: 'Acme', bot_token: 'test', created_at: Time.now.utc, updated_at: Time.now.utc },
+ returning: %w[id])
+ channel = Channel::Telegram.find_by(bot_token: 'test')
+ Inbox.create!(channel: channel, account: account, name: 'Acme Telegram')
+ # rubocop:enable Rails/SkipsModelValidations
+ end
+
+ def seed_line_inbox
+ channel = Channel::Line.create!(account: account, line_channel_id: 'test', line_channel_secret: 'test', line_channel_token: 'test')
+ Inbox.create!(channel: channel, account: account, name: 'Acme Line')
+ 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 c14b570d2..134a61220 100644
--- a/spec/controllers/api/v2/accounts/report_controller_spec.rb
+++ b/spec/controllers/api/v2/accounts/report_controller_spec.rb
@@ -223,6 +223,40 @@ RSpec.describe 'Reports API', type: :request do
expect(response).to have_http_status(:success)
end
end
+
+ context 'when an agent has access to multiple accounts' do
+ let(:account1) { create(:account) }
+ let(:account2) { create(:account) }
+
+ let(:params) do
+ super().merge(
+ type: :agent,
+ since: 30.days.ago.to_i.to_s,
+ until: date_timestamp.to_s
+ )
+ end
+
+ it 'returns agent metrics from the current account' do
+ admin1 = create(:user, account: account1, role: :administrator)
+ inbox1 = create(:inbox, account: account1)
+ inbox2 = create(:inbox, account: account2)
+
+ create(:account_user, user: admin1, account: account2)
+ create(:conversation, account: account1, inbox: inbox1,
+ assignee: admin1, created_at: Time.zone.today - 2.days)
+ create(:conversation, account: account2, inbox: inbox2,
+ assignee: admin1, created_at: Time.zone.today - 2.days)
+
+ get "/api/v2/accounts/#{account1.id}/reports/summary",
+ params: params.merge({ id: admin1.id }),
+ headers: admin1.create_new_auth_token
+
+ expect(response).to have_http_status(:success)
+
+ json_response = JSON.parse(response.body)
+ expect(json_response['conversations_count']).to eq(1)
+ end
+ end
end
describe 'GET /api/v2/accounts/:account_id/reports/inboxes' do
diff --git a/spec/controllers/platform/api/v1/users_controller_spec.rb b/spec/controllers/platform/api/v1/users_controller_spec.rb
index e2e9d17df..6ed3cbb7d 100644
--- a/spec/controllers/platform/api/v1/users_controller_spec.rb
+++ b/spec/controllers/platform/api/v1/users_controller_spec.rb
@@ -145,14 +145,17 @@ RSpec.describe 'Platform Users API', type: :request do
expect(response).to have_http_status(:unauthorized)
end
- it 'updates the user' do
+ it 'updates the user attributes' do
create(:platform_app_permissible, platform_app: platform_app, permissible: user)
- patch "/platform/api/v1/users/#{user.id}", params: { name: 'test123', custom_attributes: { test: 'test_update' } },
+ patch "/platform/api/v1/users/#{user.id}", params: {
+ name: 'test123', email: 'newtestemail@test.com', custom_attributes: { test: 'test_update' }
+ },
headers: { api_access_token: platform_app.access_token.token }, as: :json
expect(response).to have_http_status(:success)
data = JSON.parse(response.body)
expect(data['name']).to eq('test123')
+ expect(data['email']).to eq('newtestemail@test.com')
expect(data['custom_attributes']['test']).to eq('test_update')
end
end
diff --git a/spec/lib/integrations/slack/incoming_message_builder_spec.rb b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
index 1695331c3..0eede30cf 100644
--- a/spec/lib/integrations/slack/incoming_message_builder_spec.rb
+++ b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
@@ -61,6 +61,15 @@ describe Integrations::Slack::IncomingMessageBuilder do
expect(conversation.messages.count).to eql(messages_count)
end
+ it 'does not create message for invalid event type and event files is not present' do
+ messages_count = conversation.messages.count
+ message_with_attachments[:event][:files] = nil
+ builder = described_class.new(message_with_attachments)
+ allow(builder).to receive(:sender).and_return(nil)
+ builder.perform
+ expect(conversation.messages.count).to eql(messages_count)
+ end
+
it 'saves attachment if params files present' do
expect(hook).not_to eq nil
messages_count = conversation.messages.count