diff --git a/app/services/whatsapp/incoming_message_whatsapp_cloud_service.rb b/app/services/whatsapp/incoming_message_whatsapp_cloud_service.rb index f8ac8c85a..164c3ac12 100644 --- a/app/services/whatsapp/incoming_message_whatsapp_cloud_service.rb +++ b/app/services/whatsapp/incoming_message_whatsapp_cloud_service.rb @@ -10,10 +10,7 @@ class Whatsapp::IncomingMessageWhatsappCloudService < Whatsapp::IncomingMessageB def download_attachment_file(attachment_payload) url_response = HTTParty.get( - inbox.channel.media_url( - attachment_payload[:id], - inbox.channel.provider_config['phone_number_id'] - ), + inbox.channel.media_url(attachment_payload[:id]), headers: inbox.channel.api_headers ) # This url response will be failure if the access token has expired. diff --git a/app/services/whatsapp/providers/whatsapp_cloud_service.rb b/app/services/whatsapp/providers/whatsapp_cloud_service.rb index 6f2ead579..5b4c26196 100644 --- a/app/services/whatsapp/providers/whatsapp_cloud_service.rb +++ b/app/services/whatsapp/providers/whatsapp_cloud_service.rb @@ -75,10 +75,8 @@ class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseServi csat_template_service.get_template_status(template_name) end - def media_url(media_id, phone_number_id = nil) - url = "#{api_base_path}/v13.0/#{media_id}" - url += "?phone_number_id=#{phone_number_id}" if phone_number_id - url + def media_url(media_id) + "#{api_base_path}/v13.0/#{media_id}" end private diff --git a/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb b/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb index b162250bf..2ac3bb651 100644 --- a/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb +++ b/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb @@ -41,10 +41,7 @@ describe Whatsapp::IncomingMessageWhatsappCloudService do it 'increments reauthorization count if fetching attachment fails' do stub_request( :get, - whatsapp_channel.media_url( - 'b1c68f38-8734-4ad3-b4a1-ef0c10d683', - whatsapp_channel.provider_config['phone_number_id'] - ) + whatsapp_channel.media_url('b1c68f38-8734-4ad3-b4a1-ef0c10d683') ).to_return( status: 401 ) @@ -112,10 +109,7 @@ describe Whatsapp::IncomingMessageWhatsappCloudService do def stub_media_url_request stub_request( :get, - whatsapp_channel.media_url( - 'b1c68f38-8734-4ad3-b4a1-ef0c10d683', - whatsapp_channel.provider_config['phone_number_id'] - ) + whatsapp_channel.media_url('b1c68f38-8734-4ad3-b4a1-ef0c10d683') ).to_return( status: 200, body: {