f93f2067b6
## Description Fixes WhatsApp embedded signup failing with "No WABA scope found in token." Meta recently changed which scopes embedded-signup tokens carry (whatsapp_business_manage_events instead of whatsapp_business_management), which tripped a brittle scope-string check. That check was redundant anyway — PhoneInfoService already verifies the token's access to the specific WABA by calling its /phone_numbers endpoint right before it. This removes the obsolete TokenValidationService and relies on the functional check. ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) ## Checklist: - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
87 lines
3.1 KiB
Ruby
87 lines
3.1 KiB
Ruby
class Whatsapp::EmbeddedSignupService
|
|
def initialize(account:, params:, inbox_id: nil)
|
|
@account = account
|
|
@code = params[:code]
|
|
@business_id = params[:business_id]
|
|
@waba_id = params[:waba_id]
|
|
@phone_number_id = params[:phone_number_id]
|
|
@inbox_id = inbox_id
|
|
end
|
|
|
|
def perform
|
|
validate_parameters!
|
|
|
|
access_token = exchange_code_for_token
|
|
phone_info = fetch_phone_info(access_token)
|
|
|
|
channel = create_or_reauthorize_channel(access_token, phone_info)
|
|
# NOTE: We call setup_webhooks explicitly here instead of relying on after_commit callback because:
|
|
# 1. Reauthorization flow updates an existing channel (not a create), so after_commit on: :create won't trigger
|
|
# 2. We need to run check_channel_health_and_prompt_reauth after webhook setup completes
|
|
# 3. The channel is marked with source: 'embedded_signup' to skip the after_commit callback
|
|
channel.setup_webhooks
|
|
# Skip health check during reauthorization — phone numbers in pending provisioning state
|
|
# (platform_type: NOT_APPLICABLE) would incorrectly trigger a disconnect email right after
|
|
# a successful reauth. Only run health check for new channel creation.
|
|
check_channel_health_and_prompt_reauth(channel) if @inbox_id.blank?
|
|
channel
|
|
|
|
rescue StandardError => e
|
|
Rails.logger.error("[WHATSAPP] Embedded signup failed: #{e.message}")
|
|
raise e
|
|
end
|
|
|
|
private
|
|
|
|
def exchange_code_for_token
|
|
Whatsapp::TokenExchangeService.new(@code).perform
|
|
end
|
|
|
|
def fetch_phone_info(access_token)
|
|
Whatsapp::PhoneInfoService.new(@waba_id, @phone_number_id, access_token).perform
|
|
end
|
|
|
|
def create_or_reauthorize_channel(access_token, phone_info)
|
|
if @inbox_id.present?
|
|
Whatsapp::ReauthorizationService.new(
|
|
account: @account,
|
|
inbox_id: @inbox_id,
|
|
phone_number_id: @phone_number_id,
|
|
business_id: @business_id
|
|
).perform(access_token, phone_info)
|
|
else
|
|
waba_info = { waba_id: @waba_id, business_name: phone_info[:business_name] }
|
|
Whatsapp::ChannelCreationService.new(@account, waba_info, phone_info, access_token).perform
|
|
end
|
|
end
|
|
|
|
def check_channel_health_and_prompt_reauth(channel)
|
|
health_data = Whatsapp::HealthService.new(channel).fetch_health_status
|
|
return unless health_data
|
|
|
|
if channel_in_pending_state?(health_data)
|
|
channel.prompt_reauthorization!
|
|
else
|
|
Rails.logger.info "[WHATSAPP] Channel #{channel.phone_number} health check passed"
|
|
end
|
|
rescue StandardError => e
|
|
Rails.logger.error "[WHATSAPP] Health check failed for channel #{channel.phone_number}: #{e.message}"
|
|
end
|
|
|
|
def channel_in_pending_state?(health_data)
|
|
health_data[:platform_type] == 'NOT_APPLICABLE' ||
|
|
health_data.dig(:throughput, 'level') == 'NOT_APPLICABLE'
|
|
end
|
|
|
|
def validate_parameters!
|
|
missing_params = []
|
|
missing_params << 'code' if @code.blank?
|
|
missing_params << 'business_id' if @business_id.blank?
|
|
missing_params << 'waba_id' if @waba_id.blank?
|
|
|
|
return if missing_params.empty?
|
|
|
|
raise ArgumentError, "Required parameters are missing: #{missing_params.join(', ')}"
|
|
end
|
|
end
|