Merge branch 'assignment_v2/migrations' into wip/assignment-import

app/services/twilio/incoming_message_service.rb

@@ -61,6 +61,9 @@ class Twilio::IncomingMessageService
 
     @contact_inbox = contact_inbox
     @contact = contact_inbox.contact
+
+    # Update existing contact name if ProfileName is available and current name is just phone number
+    update_contact_name_if_needed
   end
 
   def conversation_params
@@ -173,4 +176,18 @@ class Twilio::IncomingMessageService
       coordinates_long: params[:Longitude].to_f
     )
   end
+
+  def update_contact_name_if_needed
+    return if params[:ProfileName].blank?
+    return if @contact.name == params[:ProfileName]
+
+    # Only update if current name exactly matches the phone number or formatted phone number
+    return unless contact_name_matches_phone_number?
+
+    @contact.update!(name: params[:ProfileName])
+  end
+
+  def contact_name_matches_phone_number?
+    @contact.name == phone_number || @contact.name == formatted_phone_number
+  end
 end

app/services/whatsapp/embedded_signup_service.rb

@@ -1,10 +1,11 @@
 class Whatsapp::EmbeddedSignupService
-  def initialize(account:, code:, business_id:, waba_id:, phone_number_id:)
+  def initialize(account:, params:, inbox_id: nil)
     @account = account
-    @code = code
-    @business_id = business_id
-    @waba_id = waba_id
-    @phone_number_id = phone_number_id
+    @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
@@ -19,11 +20,19 @@ class Whatsapp::EmbeddedSignupService
     # Validate token has access to the WABA
     Whatsapp::TokenValidationService.new(access_token, @waba_id).perform
 
-    # Create channel
-    waba_info = { waba_id: @waba_id, business_name: phone_info[:business_name] }
-
-    # Webhook setup is now handled in the channel after_create_commit callback
-    Whatsapp::ChannelCreationService.new(@account, waba_info, phone_info, access_token).perform
+    # Reauthorization flow if inbox_id is present
+    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
+      # Create channel for new authorization
+      waba_info = { waba_id: @waba_id, business_name: phone_info[:business_name] }
+      Whatsapp::ChannelCreationService.new(@account, waba_info, phone_info, access_token).perform
+    end
   rescue StandardError => e
     Rails.logger.error("[WHATSAPP] Embedded signup failed: #{e.message}")
     raise e

app/services/whatsapp/facebook_api_client.rb

@@ -50,6 +50,16 @@ class Whatsapp::FacebookApiClient
     handle_response(response, 'Phone registration failed')
   end
 
+  def phone_number_verified?(phone_number_id)
+    response = HTTParty.get(
+      "#{BASE_URI}/#{@api_version}/#{phone_number_id}",
+      headers: request_headers
+    )
+
+    data = handle_response(response, 'Phone status check failed')
+    data['code_verification_status'] == 'VERIFIED'
+  end
+
   def subscribe_waba_webhook(waba_id, callback_url, verify_token)
     response = HTTParty.post(
       "#{BASE_URI}/#{@api_version}/#{waba_id}/subscribed_apps",

app/services/whatsapp/reauthorization_service.rb

@@ -0,0 +1,42 @@
+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 || {}
+    channel.provider_config = current_config.merge(
+      'api_key' => access_token,
+      'phone_number_id' => @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

app/services/whatsapp/webhook_setup_service.rb

@@ -8,7 +8,8 @@ class Whatsapp::WebhookSetupService
 
   def perform
     validate_parameters!
-    register_phone_number
+    # Since coexistence method does not need to register, we check it
+    register_phone_number unless phone_number_verified?
     setup_webhook
   end
 
@@ -64,4 +65,13 @@ class Whatsapp::WebhookSetupService
 
     "#{frontend_url}/webhooks/whatsapp/#{phone_number}"
   end
+
+  def phone_number_verified?
+    phone_number_id = @channel.provider_config['phone_number_id']
+
+    @api_client.phone_number_verified?(phone_number_id)
+  rescue StandardError => e
+    Rails.logger.error("[WHATSAPP] Phone registration status check failed, but continuing: #{e.message}")
+    false
+  end
 end