7c7459b734
## Description Move WhatsApp webhook callback override from WABA level to phone number level, allowing multiple phone numbers on the same WABA to have independent callback URLs. ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? - Connect a WhatsApp Cloud inbox via embedded signup - Verify webhook setup succeeds and messages are received - Connect a second phone number on the same WABA — both should receive messages independently - Delete an inbox and verify only that phone number's override is cleared ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [x] I have commented on my code, particularly in hard-to-understand areas - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes --------- Co-authored-by: tds-1 <tds-1@users.noreply.github.com> Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
46 lines
1.5 KiB
Ruby
46 lines
1.5 KiB
Ruby
class Whatsapp::ReauthorizationService
|
|
def initialize(account:, inbox_id:, phone_number_id:, business_id:)
|
|
@account = account
|
|
@inbox_id = inbox_id
|
|
@phone_number_id = phone_number_id
|
|
@business_id = business_id
|
|
end
|
|
|
|
def perform(access_token, phone_info)
|
|
inbox = @account.inboxes.find(@inbox_id)
|
|
channel = inbox.channel
|
|
|
|
# Validate phone number matches for reauthorization
|
|
if phone_info[:phone_number] != channel.phone_number
|
|
raise StandardError, "Phone number mismatch. Expected #{channel.phone_number}, got #{phone_info[:phone_number]}"
|
|
end
|
|
|
|
# Update channel configuration
|
|
update_channel_config(channel, access_token, phone_info)
|
|
# Mark as reauthorized
|
|
channel.reauthorized! if channel.respond_to?(:reauthorized!)
|
|
|
|
channel
|
|
end
|
|
|
|
private
|
|
|
|
def update_channel_config(channel, access_token, phone_info)
|
|
current_config = channel.provider_config || {}
|
|
# Legacy clients may omit phone_number_id; fall back to the value just fetched from Meta.
|
|
resolved_phone_number_id = @phone_number_id.presence || phone_info[:phone_number_id]
|
|
|
|
channel.provider_config = current_config.merge(
|
|
'api_key' => access_token,
|
|
'phone_number_id' => resolved_phone_number_id,
|
|
'business_account_id' => @business_id,
|
|
'source' => 'embedded_signup'
|
|
)
|
|
channel.save!
|
|
|
|
# Update inbox name if business name changed
|
|
business_name = phone_info[:business_name] || phone_info[:verified_name]
|
|
channel.inbox.update!(name: business_name) if business_name.present?
|
|
end
|
|
end
|