Hello,
+ +Your Whatsapp Access has expired.
+Please reconnect Whatsapp to continue receiving messages.
+ ++Click here to re-connect. +
diff --git a/spec/jobs/webhooks/whatsapp_events_job_spec.rb b/spec/jobs/webhooks/whatsapp_events_job_spec.rb index 00fde3d41..e4e06b5da 100644 --- a/spec/jobs/webhooks/whatsapp_events_job_spec.rb +++ b/spec/jobs/webhooks/whatsapp_events_job_spec.rb @@ -23,6 +23,13 @@ RSpec.describe Webhooks::WhatsappEventsJob, type: :job do expect(Whatsapp::IncomingMessageWhatsappCloudService).to receive(:new) job.perform_now(params) end + + it 'will not enques Whatsapp::IncomingMessageWhatsappCloudService if channel reauthorization required' do + channel.prompt_reauthorization! + allow(Whatsapp::IncomingMessageWhatsappCloudService).to receive(:new).and_return(process_service) + expect(Whatsapp::IncomingMessageWhatsappCloudService).not_to receive(:new) + job.perform_now(params) + end end context 'when default provider' do diff --git a/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb b/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb index aad74af0a..fa90b7970 100644 --- a/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb +++ b/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb @@ -41,4 +41,18 @@ RSpec.describe AdministratorNotifications::ChannelNotificationsMailer, type: :ma expect(mail.to).to eq([administrator.email]) end end + + describe 'whatsapp_disconnect' do + let!(:whatsapp_channel) { create(:channel_whatsapp, provider: 'whatsapp_cloud', sync_templates: false, validate_provider_config: false) } + let!(:whatsapp_inbox) { create(:inbox, channel: whatsapp_channel, account: account) } + let(:mail) { described_class.with(account: account).whatsapp_disconnect(whatsapp_inbox).deliver_now } + + it 'renders the subject' do + expect(mail.subject).to eq('Your Whatsapp connection has expired') + end + + it 'renders the receiver email' do + expect(mail.to).to eq([administrator.email]) + end + end end diff --git a/spec/models/channel/whatsapp_spec.rb b/spec/models/channel/whatsapp_spec.rb index 9a6620a5e..4368807fe 100644 --- a/spec/models/channel/whatsapp_spec.rb +++ b/spec/models/channel/whatsapp_spec.rb @@ -1,8 +1,33 @@ # frozen_string_literal: true require 'rails_helper' +require Rails.root.join 'spec/models/concerns/reauthorizable_shared.rb' RSpec.describe Channel::Whatsapp do + describe 'concerns' do + let(:channel) { create(:channel_whatsapp) } + + before do + stub_request(:post, 'https://waba.360dialog.io/v1/configs/webhook') + stub_request(:get, 'https://waba.360dialog.io/v1/configs/templates') + end + + it_behaves_like 'reauthorizable' + + context 'when prompt_reauthorization!' do + it 'calls channel notifier mail for whatsapp' do + admin_mailer = double + mailer_double = double + + expect(AdministratorNotifications::ChannelNotificationsMailer).to receive(:with).and_return(admin_mailer) + expect(admin_mailer).to receive(:whatsapp_disconnect).with(channel.inbox).and_return(mailer_double) + expect(mailer_double).to receive(:deliver_later) + + channel.prompt_reauthorization! + end + end + end + describe 'validate_provider_config' do let(:channel) { build(:channel_whatsapp, provider: 'whatsapp_cloud', account: create(:account)) } diff --git a/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb b/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb new file mode 100644 index 000000000..5498f2b8c --- /dev/null +++ b/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb @@ -0,0 +1,70 @@ +require 'rails_helper' + +describe Whatsapp::IncomingMessageWhatsappCloudService do + describe '#perform' do + let!(:whatsapp_channel) { create(:channel_whatsapp, provider: 'whatsapp_cloud', sync_templates: false, validate_provider_config: false) } + let(:params) do + { + phone_number: whatsapp_channel.phone_number, + object: 'whatsapp_business_account', + entry: [{ + changes: [{ + value: { + contacts: [{ profile: { name: 'Sojan Jose' }, wa_id: '2423423243' }], + messages: [{ + from: '2423423243', + image: { + id: 'b1c68f38-8734-4ad3-b4a1-ef0c10d683', + mime_type: 'image/jpeg', + sha256: '29ed500fa64eb55fc19dc4124acb300e5dcca0f822a301ae99944db', + caption: 'Check out my product!' + }, + timestamp: '1664799904', type: 'image' + }] + } + }] + }] + }.with_indifferent_access + end + + context 'when valid attachment message params' do + it 'creates appropriate conversations, message and contacts' do + stub_request(:get, whatsapp_channel.media_url('b1c68f38-8734-4ad3-b4a1-ef0c10d683')).to_return( + status: 200, + body: { + messaging_product: 'whatsapp', + url: 'https://chatwoot-assets.local/sample.png', + mime_type: 'image/jpeg', + sha256: 'sha256', + file_size: 'SIZE', + id: 'b1c68f38-8734-4ad3-b4a1-ef0c10d683' + }.to_json, + headers: { 'content-type' => 'application/json' } + ) + stub_request(:get, 'https://chatwoot-assets.local/sample.png').to_return( + status: 200, + body: File.read('spec/assets/sample.png') + ) + + described_class.new(inbox: whatsapp_channel.inbox, params: params).perform + expect(whatsapp_channel.inbox.conversations.count).not_to eq(0) + expect(Contact.all.first.name).to eq('Sojan Jose') + expect(whatsapp_channel.inbox.messages.first.content).to eq('Check out my product!') + expect(whatsapp_channel.inbox.messages.first.attachments.present?).to be true + end + + it 'increments reauthorization count if fetching attachment fails' do + stub_request(:get, whatsapp_channel.media_url('b1c68f38-8734-4ad3-b4a1-ef0c10d683')).to_return( + status: 401 + ) + + described_class.new(inbox: whatsapp_channel.inbox, params: params).perform + expect(whatsapp_channel.inbox.conversations.count).not_to eq(0) + expect(Contact.all.first.name).to eq('Sojan Jose') + expect(whatsapp_channel.inbox.messages.first.content).to eq('Check out my product!') + expect(whatsapp_channel.inbox.messages.first.attachments.present?).to be false + expect(whatsapp_channel.authorization_error_count).to eq(1) + end + end + end +end