activemerchant 1.133.0 → 1.138.0

data/lib/active_merchant/billing/gateways/merchant_warrior.rb

@@ -1,8 +1,8 @@
 require 'digest/md5'
 require 'rexml/document'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class MerchantWarriorGateway < Gateway
       TOKEN_TEST_URL = 'https://base.merchantwarrior.com/token/'
       TOKEN_LIVE_URL = 'https://api.merchantwarrior.com/token/'
@@ -32,6 +32,8 @@ module ActiveMerchant #:nodoc:
         add_payment_method(post, payment_method)
         add_recurring_flag(post, options)
         add_soft_descriptors(post, options)
+        add_three_ds(post, options)
+        post['storeID'] = options[:store_id] if options[:store_id]
         commit('processAuth', post)
       end
 
@@ -43,6 +45,8 @@ module ActiveMerchant #:nodoc:
         add_payment_method(post, payment_method)
         add_recurring_flag(post, options)
         add_soft_descriptors(post, options)
+        add_three_ds(post, options)
+        post['storeID'] = options[:store_id] if options[:store_id]
         commit('processCard', post)
       end
 
@@ -111,9 +115,9 @@ module ActiveMerchant #:nodoc:
         post['customerCity'] = address[:city]
         post['customerAddress'] = address[:address1]
         post['customerPostCode'] = address[:zip]
-        post['customerIP'] = address[:ip]
-        post['customerPhone'] = address[:phone]
-        post['customerEmail'] = address[:email]
+        post['customerIP'] = address[:ip] || options[:ip]
+        post['customerPhone'] = address[:phone] || address[:phone_number]
+        post['customerEmail'] = address[:email] || options[:email]
       end
 
       def add_order_id(post, options)
@@ -184,6 +188,18 @@ module ActiveMerchant #:nodoc:
         )
       end
 
+      def add_three_ds(post, options)
+        return unless three_d_secure = options[:three_d_secure]
+
+        post.merge!({
+          threeDSEci: three_d_secure[:eci],
+          threeDSXid: three_d_secure[:xid] || three_d_secure[:ds_transaction_id],
+          threeDSCavv: three_d_secure[:cavv],
+          threeDSStatus: three_d_secure[:authentication_response_status],
+          threeDSV2Version: three_d_secure[:version]
+        }.compact)
+      end
+
       def parse(body)
         xml = REXML::Document.new(body)
 

data/lib/active_merchant/billing/gateways/mercury.rb

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # The Mercury gateway integration by default requires that the Mercury
     # account being used has tokenization turned. This enables the use of
     # capture/refund/void without having to pass the credit card back in each
@@ -302,12 +302,16 @@ module ActiveMerchant #:nodoc:
         success = SUCCESS_CODES.include?(response[:cmd_status])
         message = success ? 'Success' : message_from(response)
 
-        Response.new(success, message, response,
+        Response.new(
+          success,
+          message,
+          response,
           test: test?,
           authorization: authorization_from(response),
           avs_result: { code: response[:avs_result] },
           cvv_result: response[:cvv_result],
-          error_code: success ? nil : STANDARD_ERROR_CODE_MAPPING[response[:dsix_return_code]])
+          error_code: success ? nil : STANDARD_ERROR_CODE_MAPPING[response[:dsix_return_code]]
+        )
       end
 
       def message_from(response)
@@ -345,7 +349,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def unescape_xml(escaped_xml)
-        escaped_xml.gsub(/\&gt;/, '>').gsub(/\&lt;/, '<')
+        xml = escaped_xml.gsub(/\&gt;/, '>').gsub(/\r/, '').gsub(/\n/, '').gsub(/\t/, '').gsub('&lt;', '<')
+        xml.slice! "<?xml version=\"1.0\"?>" # rubocop:disable Style/StringLiterals
+        xml
       end
     end
   end

data/lib/active_merchant/billing/gateways/metrics_global.rb

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # For more information on the Metrics Global Payment Gateway, visit the {Metrics Global website}[www.metricsglobal.com].
     # Further documentation on AVS and CVV response codes are available under the support section of the Metrics Global
     # control panel.
@@ -175,12 +175,16 @@ module ActiveMerchant #:nodoc:
         #   (TESTMODE) Successful Sale
         test_mode = test? || message =~ /TESTMODE/
 
-        Response.new(success?(response), message, response,
+        Response.new(
+          success?(response),
+          message,
+          response,
           test: test_mode,
           authorization: response[:transaction_id],
           fraud_review: fraud_review?(response),
           avs_result: { code: response[:avs_result_code] },
-          cvv_result: response[:card_code])
+          cvv_result: response[:card_code]
+        )
       end
 
       def success?(response)
@@ -194,7 +198,7 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         fields = split(body)
 
-        results = {
+        {
           response_code: fields[RESPONSE_CODE].to_i,
           response_reason_code: fields[RESPONSE_REASON_CODE],
           response_reason_text: fields[RESPONSE_REASON_TEXT],
@@ -202,7 +206,6 @@ module ActiveMerchant #:nodoc:
           transaction_id: fields[TRANSACTION_ID],
           card_code: fields[CARD_CODE_RESPONSE_CODE]
         }
-        results
       end
 
       def post_data(action, parameters = {})
@@ -218,8 +221,7 @@ module ActiveMerchant #:nodoc:
         post[:encap_char]     = '$'
         post[:solution_ID]    = application_id if application_id
 
-        request = post.merge(parameters).collect { |key, value| "x_#{key}=#{CGI.escape(value.to_s)}" }.join('&')
-        request
+        post.merge(parameters).collect { |key, value| "x_#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
       def add_invoice(post, options)

data/lib/active_merchant/billing/gateways/micropayment.rb

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class MicropaymentGateway < Gateway
       self.display_name = 'micropayment'
       self.homepage_url = 'https://www.micropayment.de/'

data/lib/active_merchant/billing/gateways/migs/migs_codes.rb

@@ -71,6 +71,7 @@ module ActiveMerchant
 
       class CreditCardType
         attr_accessor :am_code, :migs_code, :migs_long_code, :name
+
         def initialize(am_code, migs_code, migs_long_code, name)
           @am_code        = am_code
           @migs_code      = migs_code
@@ -85,13 +86,13 @@ module ActiveMerchant
         # migs_code: Used in response for purchase/authorize/status
         # migs_long_code: Used to pre-select card for server_purchase_url
         # name: The nice display name
-        %w(american_express AE Amex American\ Express),
-        %w(diners_club DC Dinersclub Diners\ Club),
-        %w(jcb JC JCB JCB\ Card),
-        %w(maestro MS Maestro Maestro\ Card),
+        ['american_express', 'AE', 'Amex', 'American Express'],
+        ['diners_club', 'DC', 'Dinersclub', 'Diners Club'],
+        ['jcb', 'JC', 'JCB', 'JCB Card'],
+        ['maestro', 'MS', 'Maestro', 'Maestro Card'],
         %w(master MC Mastercard MasterCard),
-        %w(na PL PrivateLabelCard Private\ Label\ Card),
-        %w(visa VC Visa Visa\ Card)
+        ['na', 'PL', 'PrivateLabelCard', 'Private Label Card'],
+        ['visa', 'VC', 'Visa', 'Visa Card']
       ].map do |am_code, migs_code, migs_long_code, name|
         CreditCardType.new(am_code, migs_code, migs_long_code, name)
       end

data/lib/active_merchant/billing/gateways/migs.rb

@@ -1,7 +1,7 @@
 require 'active_merchant/billing/gateways/migs/migs_codes'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class MigsGateway < Gateway
       include MigsCodes
 
@@ -281,12 +281,16 @@ module ActiveMerchant #:nodoc:
         cvv_result_code = response[:CSCResultCode]
         cvv_result_code = 'P' if cvv_result_code == 'Unsupported'
 
-        Response.new(success?(response), response[:Message], response,
+        Response.new(
+          success?(response),
+          response[:Message],
+          response,
           test: test?,
           authorization: response[:TransactionNo],
           fraud_review: fraud_review?(response),
           avs_result: { code: avs_response_code },
-          cvv_result: cvv_result_code)
+          cvv_result: cvv_result_code
+        )
       end
 
       def success?(response)

data/lib/active_merchant/billing/gateways/mit.rb

@@ -3,10 +3,11 @@ require 'openssl'
 require 'digest'
 require 'base64'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class MitGateway < Gateway
       self.live_url = 'https://wpy.mitec.com.mx/ModuloUtilWS/activeCDP.htm'
+      self.test_url = 'https://shoppingrc.mitec.com.mx/ModuloUtilWS/activeCDP.htm'
 
       self.supported_countries = ['MX']
       self.default_currency = 'MXN'
@@ -41,7 +42,7 @@ module ActiveMerchant #:nodoc:
         # original message
         full_data = unpacked[0].bytes.slice(16, unpacked[0].bytes.length)
         # Creates the engine
-        engine = OpenSSL::Cipher::AES128.new(:CBC)
+        engine = OpenSSL::Cipher.new('aes-128-cbc')
         # Set engine as decrypt mode
         engine.decrypt
         # Converts the key from hex to bytes
@@ -54,7 +55,7 @@ module ActiveMerchant #:nodoc:
 
       def encrypt(val, keyinhex)
         # Creates the engine motor
-        engine = OpenSSL::Cipher::AES128.new(:CBC)
+        engine = OpenSSL::Cipher.new('aes-128-cbc')
         # Set engine as encrypt mode
         engine.encrypt
         # Converts the key from hex to bytes
@@ -220,8 +221,12 @@ module ActiveMerchant #:nodoc:
         post[:name_client] = [payment.first_name, payment.last_name].join(' ')
       end
 
+      def url
+        test? ? test_url : live_url
+      end
+
       def commit(action, parameters)
-        raw_response = ssl_post(live_url, parameters, { 'Content-type' => 'text/plain' })
+        raw_response = ssl_post(url, parameters, { 'Content-type' => 'text/plain' })
         response = JSON.parse(decrypt(raw_response, @options[:key_session]))
 
         Response.new(

data/lib/active_merchant/billing/gateways/modern_payments.rb

@@ -1,7 +1,7 @@
 require 'active_merchant/billing/gateways/modern_payments_cim'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class ModernPaymentsGateway < Gateway
       self.supported_countries = ModernPaymentsCimGateway.supported_countries
       self.supported_cardtypes = ModernPaymentsCimGateway.supported_cardtypes

data/lib/active_merchant/billing/gateways/modern_payments_cim.rb

@@ -1,6 +1,6 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
-    class ModernPaymentsCimGateway < Gateway #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
+    class ModernPaymentsCimGateway < Gateway # :nodoc:
       self.test_url = 'https://secure.modpay.com/netservices/test/ModpayTest.asmx'
       self.live_url = 'https://secure.modpay.com/ws/modpay.asmx'
 
@@ -111,13 +111,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_request(action, params)
+        envelope_obj = { 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
+          'xmlns:env' => 'http://schemas.xmlsoap.org/soap/envelope/',
+          'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance' }
         xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
-        xml.tag! 'env:Envelope',
-          { 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
-            'xmlns:env' => 'http://schemas.xmlsoap.org/soap/envelope/',
-            'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance' } do
-
+        xml.tag! 'env:Envelope', envelope_obj do
           xml.tag! 'env:Body' do
             xml.tag! action, { 'xmlns' => xmlns(action) } do
               xml.tag! 'clientId', @options[:login]
@@ -146,15 +145,24 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, params)
-        data = ssl_post(url(action), build_request(action, params),
-          { 'Content-Type' => 'text/xml; charset=utf-8',
-            'SOAPAction' => "#{xmlns(action)}#{action}" })
+        data = ssl_post(
+          url(action),
+          build_request(action, params),
+          {
+            'Content-Type' => 'text/xml; charset=utf-8',
+            'SOAPAction' => "#{xmlns(action)}#{action}"
+          }
+        )
 
         response = parse(action, data)
-        Response.new(successful?(action, response), message_from(action, response), response,
+        Response.new(
+          successful?(action, response),
+          message_from(action, response),
+          response,
           test: test?,
           authorization: authorization_from(action, response),
-          avs_result: { code: response[:avs_code] })
+          avs_result: { code: response[:avs_code] }
+        )
       end
 
       def authorization_from(action, response)

data/lib/active_merchant/billing/gateways/moka.rb

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class MokaGateway < Gateway
       self.test_url = 'https://service.refmoka.com'
       self.live_url = 'https://service.moka.com'

data/lib/active_merchant/billing/gateways/monei.rb

@@ -1,7 +1,7 @@
 require 'nokogiri'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     #
     # == Monei gateway
     # This class implements Monei gateway for Active Merchant. For more information about Monei
@@ -337,7 +337,7 @@ module ActiveMerchant #:nodoc:
         endpoint = translate_action_endpoint(action, options)
         headers = {
           'Content-Type': 'application/json;charset=UTF-8',
-          'Authorization': @options[:api_key],
+          Authorization: @options[:api_key],
           'User-Agent': 'MONEI/Shopify/0.1.0'
         }
 

data/lib/active_merchant/billing/gateways/moneris.rb

@@ -1,7 +1,7 @@
 require 'rexml/document'
 
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     # To learn more about the Moneris gateway, please contact
     # eselectplus@moneris.com for a copy of their integration guide. For
     # information on remote testing, please see "Test Environment Penny Value
@@ -54,6 +54,7 @@ module ActiveMerchant #:nodoc:
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
         add_external_mpi_fields(post, options)
         add_stored_credential(post, options)
+        add_cust_id(post, options)
         action = if post[:cavv] || options[:three_d_secure]
                    'cavv_preauth'
                  elsif post[:data_key].blank?
@@ -78,6 +79,7 @@ module ActiveMerchant #:nodoc:
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
         add_external_mpi_fields(post, options)
         add_stored_credential(post, options)
+        add_cust_id(post, options)
         action = if post[:cavv] || options[:three_d_secure]
                    'cavv_purchase'
                  elsif post[:data_key].blank?
@@ -216,7 +218,7 @@ module ActiveMerchant #:nodoc:
         three_d_secure_options = options[:three_d_secure]
 
         post[:threeds_version] = three_d_secure_options[:version]
-        post[:crypt_type] = three_d_secure_options[:eci]
+        post[:crypt_type] = three_d_secure_options.dig(:eci)&.to_s&.sub!(/^0/, '')
         post[:cavv] = three_d_secure_options[:cavv]
         post[:threeds_server_trans_id] = three_d_secure_options[:three_ds_server_trans_id]
         post[:ds_trans_id] = three_d_secure_options[:ds_transaction_id]
@@ -248,6 +250,10 @@ module ActiveMerchant #:nodoc:
         post[:payment_information] = options[:payment_information] if options[:payment_information]
       end
 
+      def add_cust_id(post, options)
+        post[:cust_id] = options[:cust_id] if options[:cust_id]
+      end
+
       def add_stored_credential(post, options)
         add_cof(post, options)
         # if any of :issuer_id, :payment_information, or :payment_indicator is not passed,
@@ -467,8 +473,8 @@ module ActiveMerchant #:nodoc:
           'indrefund' => %i[order_id cust_id amount pan expdate crypt_type],
           'completion' => %i[order_id comp_amount txn_number crypt_type],
           'purchasecorrection' => %i[order_id txn_number crypt_type],
-          'cavv_preauth' => %i[order_id cust_id amount pan expdate cavv crypt_type wallet_indicator],
-          'cavv_purchase' => %i[order_id cust_id amount pan expdate cavv crypt_type wallet_indicator],
+          'cavv_preauth' => %i[order_id cust_id amount pan expdate cavv crypt_type wallet_indicator threeds_version threeds_server_trans_id ds_trans_id],
+          'cavv_purchase' => %i[order_id cust_id amount pan expdate cavv crypt_type wallet_indicator threeds_version threeds_server_trans_id ds_trans_id],
           'card_verification' => %i[order_id cust_id pan expdate crypt_type avs_info cvd_info cof_info],
           'transact' => %i[order_id cust_id amount pan expdate crypt_type],
           'Batchcloseall' => [],

data/lib/active_merchant/billing/gateways/money_movers.rb

@@ -1,5 +1,5 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
+module ActiveMerchant # :nodoc:
+  module Billing # :nodoc:
     class MoneyMoversGateway < Gateway
       self.live_url = self.test_url = 'https://secure.mmoagateway.com/api/transact.php'
 
@@ -113,11 +113,15 @@ module ActiveMerchant #:nodoc:
         response = parse(data)
         message = message_from(response)
 
-        Response.new(success?(response), message, response,
+        Response.new(
+          success?(response),
+          message,
+          response,
           test: test?,
           authorization: response['transactionid'],
           avs_result: { code: response['avsresponse'] },
-          cvv_result: response['cvvresponse'])
+          cvv_result: response['cvvresponse']
+        )
       end
 
       def success?(response)