Fix Rapyd error on billing address

Author: jherreraa

lib/active_merchant/billing/gateways/rapyd.rb

@@ -124,7 +124,8 @@ def add_idempotency(options)
       end
 
       def add_address(post, creditcard, options)
-        return unless address = options[:billing_address]
+        address = options[:billing_address]
+        return unless valid_address?(address)
 
         post[:address] = {}
         # name and line_1 are required at the gateway
@@ -138,6 +139,15 @@ def add_address(post, creditcard, options)
         post[:address][:phone_number] = address[:phone].gsub(/\D/, '') if address[:phone]
       end
 
+      def valid_address?(address)
+        return false unless address
+
+        required_fields = %i[name address1 city state country zip]
+        missing_fields = required_fields.select { |field| address[field].nil? || address[field].to_s.strip.empty? }
+
+        missing_fields.any? ? false : true
+      end
+
       def add_invoice(post, money, options)
         post[:amount] = money.zero? ? 0 : amount(money).to_f.to_s
         post[:currency] = (options[:currency] || currency(money))
@@ -265,7 +275,6 @@ def add_customer_data(post, payment, options, action = '')
         phone_number = options.dig(:billing_address, :phone) || options.dig(:billing_address, :phone_number)
         post[:phone_number] = phone_number.gsub(/\D/, '') unless phone_number.nil?
         post[:receipt_email] = options[:email] if payment.is_a?(String) && options[:customer_id].present? && !send_customer_object?(options)
-
         return if payment.is_a?(String)
         return add_customer_id(post, options) if options[:customer_id]
 
@@ -283,12 +292,15 @@ def customer_fields(payment, options)
         customer_data = {}
         customer_data[:name] = "#{payment.first_name} #{payment.last_name}" unless payment.is_a?(String)
         customer_data[:email] = options[:email] unless payment.is_a?(String) && options[:customer_id].blank?
+        customer_data[:phone_number] = options.dig(:billing_address, :phone) || options.dig(:billing_address, :phone_number)
+        customer_data[:phone_number] = customer_data[:phone_number].gsub(/\D/, '') if customer_data[:phone_number]
         customer_data[:addresses] = [customer_address] if customer_address
         customer_data
       end
 
       def address(options)
-        return unless address = options[:billing_address]
+        address = options[:billing_address]
+        return unless valid_address?(address)
 
         formatted_address = {}
 

test/remote/gateways/remote_rapyd_test.rb

@@ -9,7 +9,7 @@ def setup
     @declined_card = credit_card('4111111111111105')
     @check = check
     @options = {
-      pm_type: 'us_debit_visa_card',
+      pm_type: 'GI_visa_card',
       currency: 'USD',
       complete_payment_url: 'www.google.com',
       error_payment_url: 'www.google.com',
@@ -70,6 +70,12 @@ def test_successful_purchase
     assert_equal 'SUCCESS', response.message
   end
 
+  def test_successful_purchase_without_address
+    response = @gateway.purchase(@amount, @credit_card, @options.merge(billing_address: { phone_number: '12125559999' }))
+    assert_success response
+    assert_equal 'SUCCESS', response.message
+  end
+
   def test_successful_purchase_for_idempotent_requests
     response = @gateway.purchase(@amount, @credit_card, @options.merge(idempotency_key: '1234567890'))
     assert_success response

test/unit/gateways/rapyd_test.rb

@@ -72,6 +72,19 @@ def test_successful_purchase
     assert_equal 'payment_716ce0efc63aa8d91579e873d29d9d5e', response.authorization.split('|')[0]
   end
 
+  def test_successful_purchase_without_address
+    response = stub_comms(@gateway, :ssl_request) do
+      @gateway.purchase(@amount, @credit_card, @options.merge(billing_address: { phone_number: '12125559999' }))
+    end.check_request do |_method, _endpoint, data, _headers|
+      assert_equal JSON.parse(data)['phone_number'], '12125559999'
+      assert_nil JSON.parse(data)['address']
+      assert_nil JSON.parse(data)['customer']['addresses']
+    end.respond_with(successful_purchase_response)
+
+    assert_success response
+    assert_equal 'payment_716ce0efc63aa8d91579e873d29d9d5e', response.authorization.split('|')[0]
+  end
+
   def test_send_month_and_year_with_two_digits
     credit_card = credit_card('4242424242424242', month: '9', year: '30')
     stub_comms(@gateway, :ssl_request) do