Voice calling is now a capability on the existing TwilioSms rather than a separate Voice model. A single Twilio phone number handles both SMS and voice calls through one inbox. Fixes https://linear.app/chatwoot/issue/CW-6683/add-voice-calling-as-a-capability-on-twilio-sms-channel and https://linear.app/chatwoot/issue/PLA-120/add-the-support-for-sms **What changed** - Replaced Channel::Voice with voice_enabled flag on Channel::TwilioSms - Added voice_enabled, twiml_app_sid, api_key_secret columns to channel_twilio_sms table - Dropped channel_voice table (no production data) - All voice logic lives in Enterprise layer via prepend_mod_with('Channel::TwilioSms') - Added Voice settings tab on Twilio SMS inbox settings to enable/disable voice - Validates Twilio number voice capability before provisioning - Teardown service cleans up TwiML app and credentials when voice is disabled - Frontend voice detection uses isVoiceCallEnabled() / getVoiceCallProvider() helpers — extensible to future providers - Gated by channel_voice feature flag **How to test** 1. Enable feature flag: Account.find(<id>).enable_features('channel_voice') 2. Create voice inbox: Inboxes → Voice tile → enter Twilio credentials → verify incoming/outgoing calls and SMS work 3. Enable voice on existing SMS inbox: Inboxes → select Twilio SMS inbox → Voice tab → toggle on → provide API key credentials → verify calls work 4. Disable voice: Voice tab → toggle off → verify TwiML app is deleted, credentials cleared, SMS still works 5. Re-enable voice: Toggle on again → must provide api_key_secret again → new TwiML app provisioned --------- Co-authored-by: Muhsin <12408980+muhsin-k@users.noreply.github.com>
84 lines
2.8 KiB
Ruby
84 lines
2.8 KiB
Ruby
# == Schema Information
|
|
#
|
|
# Table name: channel_twilio_sms
|
|
#
|
|
# id :bigint not null, primary key
|
|
# account_sid :string not null
|
|
# api_key_secret :string
|
|
# api_key_sid :string
|
|
# auth_token :string not null
|
|
# content_templates :jsonb
|
|
# content_templates_last_updated :datetime
|
|
# medium :integer default("sms")
|
|
# messaging_service_sid :string
|
|
# phone_number :string
|
|
# twiml_app_sid :string
|
|
# voice_enabled :boolean default(FALSE), not null
|
|
# created_at :datetime not null
|
|
# updated_at :datetime not null
|
|
# account_id :integer not null
|
|
#
|
|
# Indexes
|
|
#
|
|
# index_channel_twilio_sms_on_account_sid_and_phone_number (account_sid,phone_number) UNIQUE
|
|
# index_channel_twilio_sms_on_messaging_service_sid (messaging_service_sid) UNIQUE
|
|
# index_channel_twilio_sms_on_phone_number (phone_number) UNIQUE
|
|
#
|
|
|
|
class Channel::TwilioSms < ApplicationRecord
|
|
include Channelable
|
|
include Rails.application.routes.url_helpers
|
|
|
|
self.table_name = 'channel_twilio_sms'
|
|
|
|
# TODO: Remove guard once encryption keys become mandatory (target 3-4 releases out).
|
|
encrypts :auth_token if Chatwoot.encryption_configured?
|
|
|
|
validates :account_sid, presence: true
|
|
# The same parameter is used to store api_key_secret if api_key authentication is opted
|
|
validates :auth_token, presence: true
|
|
|
|
EDITABLE_ATTRS = [
|
|
:account_sid,
|
|
:auth_token
|
|
].freeze
|
|
|
|
# Must have _one_ of messaging_service_sid _or_ phone_number, and messaging_service_sid is preferred
|
|
validates :messaging_service_sid, uniqueness: true, presence: true, unless: :phone_number?
|
|
validates :phone_number, absence: true, if: :messaging_service_sid?
|
|
validates :phone_number, uniqueness: true, allow_nil: true
|
|
|
|
enum medium: { sms: 0, whatsapp: 1 }
|
|
|
|
def name
|
|
medium == 'sms' ? 'Twilio SMS' : 'Whatsapp'
|
|
end
|
|
|
|
def send_message(to:, body:, media_url: nil)
|
|
params = send_message_from.merge(to: to, body: body)
|
|
params[:media_url] = media_url if media_url.present?
|
|
params[:status_callback] = twilio_delivery_status_index_url
|
|
client.messages.create(**params)
|
|
end
|
|
|
|
def client
|
|
if api_key_sid.present?
|
|
Twilio::REST::Client.new(api_key_sid, auth_token, account_sid)
|
|
else
|
|
Twilio::REST::Client.new(account_sid, auth_token)
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def send_message_from
|
|
if messaging_service_sid?
|
|
{ messaging_service_sid: messaging_service_sid }
|
|
else
|
|
{ from: phone_number }
|
|
end
|
|
end
|
|
end
|
|
|
|
Channel::TwilioSms.prepend_mod_with('Channel::TwilioSms')
|