activemerchant 1.98.0 → 1.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acfbb780d39dd416b823a9abef4cdcf4de902ec75210ed78e6771314d00b069b
-  data.tar.gz: 95e9bf94b3610b33d843fd82af8e4f204380e7c53557d24141b654c553160d9f
+  metadata.gz: cbb76da56e87639a3f9129d70297b78a0edabe9faf2300e682e06e872e019419
+  data.tar.gz: 94cb0693e867b03071fe55a7e71b3cfbaf53a7c340d480f24108948822e9e1e7
 SHA512:
-  metadata.gz: 6222cdad43482972e2a799981936dc1d8114ccbede88604880d350650f7b81422b6551a07375dd1a7e06ef562d4f128c332dabc2fc16ebb7b635f774de18a54e
-  data.tar.gz: 2f9fe3fe9dfe17fc045f0a3e97940ae4b38a461c48f0416a26ed4b5a4e2bb549464911fbe7527392c8dfbcbbee16bfa82266e3ad644060199ee9552b5b82659b
+  metadata.gz: aa96ed1337c57fa00d0405ff07a70b9423bac6a26ec69fde450d73bc9cabfc0ae27b75a46faddcdf3e79f2198db8214e8e6c5926468f0acb999bef43fc220a73
+  data.tar.gz: f672640992309d545629a41e4f89d505732d0bb88559648a96935ef01293bcff737de41c8a7b8992993dafdfdb71d29bcbf8b85133c3d9ae5311f7b720b7c9c7

data/CHANGELOG

@@ -1,6 +1,31 @@
 = ActiveMerchant CHANGELOG
 
 == HEAD
+== Version 1.99.0 (Sep 26, 2019)
+* Adyen: Add functionality to set 3DS exemptions via API [britth] #3331
+* Adyen: Send "NA" instead of "N/A" [leila-alderman] #3339
+* Stripe Payment Intents: Set application fee or transfer amount on capture  [britth] #3340
+* TNS: Support Europe endpoint [curiousepic] #3346
+* Redsys: Add 3DS support to gateway [britth] #3336
+* Worldpay: Allow multiple refunds per authorization [jknipp] #3349
+* MercadoPago: Add remote and unit tests for Naranja card [hdeters] #3345
+* CyberSource: Pass commerce indicator if present [curiousepic] #3350
+* Worldpay: Add 3DS2 Support [nfarve] #3344
+* Credorax: Add 3DS 2.0 [nfarve] #3342
+* TNS: Update verison and support pay mode [curiousepic] #3355
+* Stripe: Add supported countries [therufs] #3358
+* Stripe Payment Intents: Add supported countries [therufs] #3359
+* Mundipagg: Append error messages to the message response field [jasonxp] #3353
+* Redsys: Add ability to pass sca_exemption and moto fields to request exemptions [britth] #3354
+* Credorax: Add A Mandatory 3DS field [nfarve] #3360
+* CyberSource: Support 3DS2 pass-through fields [curiousepic] #3363
+* Credorax: Add support for MOTO flagging [britth] #3366
+* Credorax: Enable selecting a processor [leila-alderman] #3302
+* Adyen: Add Cabal card [leila-alderman] #3361
+* Decidir: Add remote tests for Cabal and Naranja [leila-alderman] #3337
+* Payflow: Pass correct field in Status for 3DS in Payflow [nebdil] #3362
+* CyberSource: Use 3DS hash for enrolled field [curiousepic] #3371
+
 == Version 1.98.0 (Sep 9, 2019)
 * Stripe Payment Intents: Add new gateway [britth] #3290
 * Stripe: Send cardholder name and address when creating sources for 3DS 1.0 [jknipp] #3300

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

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['AT', 'AU', 'BE', 'BG', 'BR', 'CH', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'GI', 'GR', 'HK', 'HU', 'IE', 'IS', 'IT', 'LI', 'LT', 'LU', 'LV', 'MC', 'MT', 'MX', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SG', 'SK', 'SI', 'US']
       self.default_currency = 'USD'
       self.currencies_without_fractions = %w(CVE DJF GNF IDR JPY KMF KRW PYG RWF UGX VND VUV XAF XOF XPF)
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb, :dankort, :maestro,  :discover, :elo, :naranja]
+      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb, :dankort, :maestro,  :discover, :elo, :naranja, :cabal]
 
       self.money_format = :cents
 
@@ -97,7 +97,14 @@ module ActiveMerchant #:nodoc:
         add_stored_credentials(post, credit_card, options)
         add_recurring_contract(post, options)
         add_address(post, options)
-        commit('authorise', post, options)
+
+        initial_response = commit('authorise', post, options)
+
+        if initial_response.success? && card_not_stored?(initial_response)
+          unsupported_failure_response(initial_response)
+        else
+          initial_response
+        end
       end
 
       def verify(credit_card, options={})
@@ -229,17 +236,17 @@ module ActiveMerchant #:nodoc:
         return unless post[:card]&.kind_of?(Hash)
         if (address = options[:billing_address] || options[:address]) && address[:country]
           post[:billingAddress] = {}
-          post[:billingAddress][:street] = address[:address1] || 'N/A'
-          post[:billingAddress][:houseNumberOrName] = address[:address2] || 'N/A'
+          post[:billingAddress][:street] = address[:address1] || 'NA'
+          post[:billingAddress][:houseNumberOrName] = address[:address2] || 'NA'
           post[:billingAddress][:postalCode] = address[:zip] if address[:zip]
-          post[:billingAddress][:city] = address[:city] || 'N/A'
+          post[:billingAddress][:city] = address[:city] || 'NA'
           post[:billingAddress][:stateOrProvince] = get_state(address)
           post[:billingAddress][:country] = address[:country] if address[:country]
         end
       end
 
       def get_state(address)
-        address[:state] && !address[:state].blank? ? address[:state] : 'N/A'
+        address[:state] && !address[:state].blank? ? address[:state] : 'NA'
       end
 
       def add_invoice(post, money, options)
@@ -336,6 +343,11 @@ module ActiveMerchant #:nodoc:
             add_browser_info(three_ds_2_options[:browser_info], post)
             post[:threeDS2RequestData] = { deviceChannel: device_channel, notificationURL: three_ds_2_options[:notification_url] }
           end
+
+          if options.has_key?(:execute_threed)
+            post[:additionalData][:executeThreeD] = options[:execute_threed]
+            post[:additionalData][:scaExemption] = options[:sca_exemption] if options[:sca_exemption]
+          end
         else
           return unless options[:execute_threed] || options[:threed_dynamic]
           post[:browserInfo] = { userAgent: options[:user_agent], acceptHeader: options[:accept_header] }
@@ -498,6 +510,23 @@ module ActiveMerchant #:nodoc:
           userAgent: browser_info[:user_agent]
         }
       end
+
+      def unsupported_failure_response(initial_response)
+        Response.new(
+          false,
+          'Recurring transactions are not supported for this card type.',
+          initial_response.params,
+          authorization: initial_response.authorization,
+          test: initial_response.test,
+          error_code: initial_response.error_code,
+          avs_result: initial_response.avs_result,
+          cvv_result: initial_response.cvv_result[:code]
+        )
+      end
+
+      def card_not_stored?(response)
+        response.authorization ? response.authorization.split('#')[2].nil? : true
+      end
     end
   end
 end

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

@@ -93,12 +93,15 @@ module ActiveMerchant #:nodoc:
 
       def void(authorization, options = {})
         reference, amount, type = split_auth(authorization)
-
-        post = {}
-        add_reference(post, reference)
-        add_original_amount(post, amount)
-        add_transaction_type(post, void_action(type))
-        commit(post)
+        if type == TRANSACTIONS[:authorization]
+          capture(0, authorization, options)
+        else
+          post = {}
+          add_reference(post, reference)
+          add_original_amount(post, amount)
+          add_transaction_type(post, void_action(type))
+          commit(post)
+        end
       end
 
       def verify(source, options={})

data/lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb

@@ -317,7 +317,7 @@ module ActiveMerchant #:nodoc:
         post[:status] = options[:status]
 
         billing_address = options[:billing_address] || options[:address]
-        post[:trnCardOwner] = billing_address[:name]
+        post[:trnCardOwner] = billing_address ? billing_address[:name] : nil
       end
 
       def add_recurring_amount(post, money)

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

@@ -135,6 +135,7 @@ module ActiveMerchant #:nodoc:
         add_echo(post, options)
         add_submerchant_id(post, options)
         add_transaction_type(post, options)
+        add_processor(post, options)
 
         commit(:purchase, post)
       end
@@ -149,6 +150,7 @@ module ActiveMerchant #:nodoc:
         add_echo(post, options)
         add_submerchant_id(post, options)
         add_transaction_type(post, options)
+        add_processor(post, options)
 
         commit(:authorize, post)
       end
@@ -160,6 +162,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_echo(post, options)
         add_submerchant_id(post, options)
+        add_processor(post, options)
 
         commit(:capture, post)
       end
@@ -171,6 +174,7 @@ module ActiveMerchant #:nodoc:
         add_echo(post, options)
         add_submerchant_id(post, options)
         post[:a1] = generate_unique_id
+        add_processor(post, options)
 
         commit(:void, post, reference_action)
       end
@@ -182,6 +186,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_echo(post, options)
         add_submerchant_id(post, options)
+        add_processor(post, options)
 
         commit(:refund, post)
       end
@@ -195,6 +200,7 @@ module ActiveMerchant #:nodoc:
         add_echo(post, options)
         add_submerchant_id(post, options)
         add_transaction_type(post, options)
+        add_processor(post, options)
 
         commit(:credit, post)
       end
@@ -270,6 +276,32 @@ module ActiveMerchant #:nodoc:
       def add_3d_secure(post, options)
         if options[:eci] && options[:xid]
           add_3d_secure_1_data(post, options)
+        elsif options[:execute_threed] && options[:three_ds_2]
+          three_ds_2_options = options[:three_ds_2]
+          browser_info = three_ds_2_options[:browser_info]
+          post[:'3ds_initiate'] = options[:three_ds_initiate] || '01'
+          post[:'3ds_purchasedate'] = Time.now.utc.strftime('%Y%m%d%I%M%S')
+          post[:'3ds_channel'] = '02'
+          post[:'3ds_redirect_url'] = three_ds_2_options[:notification_url]
+          post[:'3ds_challengewindowsize'] = options[:three_ds_challenge_window_size] || '03'
+          post[:'3ds_version'] = options[:three_ds_version] if options[:three_ds_version]
+          post[:d5] = browser_info[:user_agent]
+          post[:'3ds_transtype'] = options[:transaction_type] || '01'
+          post[:'3ds_browsertz'] = browser_info[:timezone]
+          post[:'3ds_browserscreenwidth'] = browser_info[:width]
+          post[:'3ds_browserscreenheight'] = browser_info[:height]
+          post[:'3ds_browsercolordepth'] = browser_info[:depth]
+          post[:d6] = browser_info[:language]
+          post[:'3ds_browserjavaenabled'] = browser_info[:java]
+          post[:'3ds_browseracceptheader'] = browser_info[:accept_header]
+          if (shipping_address = options[:shipping_address])
+            post[:'3ds_shipaddrstate'] = shipping_address[:state]
+            post[:'3ds_shipaddrpostcode'] = shipping_address[:zip]
+            post[:'3ds_shipaddrline2'] = shipping_address[:address2]
+            post[:'3ds_shipaddrline1'] = shipping_address[:address1]
+            post[:'3ds_shipaddrcountry'] = shipping_address[:country]
+            post[:'3ds_shipaddrcity'] = shipping_address[:city]
+          end
         elsif options[:three_d_secure]
           add_normalized_3d_secure_2_data(post, options)
         end
@@ -306,6 +338,12 @@ module ActiveMerchant #:nodoc:
 
       def add_transaction_type(post, options)
         post[:a9] = options[:transaction_type] if options[:transaction_type]
+        post[:a2] = '3' if options.dig(:metadata, :manual_entry)
+      end
+
+      def add_processor(post, options)
+        post[:r1] = options[:processor] || 'CREDORAX'
+        post[:r2] = options[:processor_merchant_id] if options[:processor_merchant_id]
       end
 
       ACTIONS = {
@@ -317,7 +355,8 @@ module ActiveMerchant #:nodoc:
         credit: '6',
         purchase_void: '7',
         refund_void: '8',
-        capture_void: '9'
+        capture_void: '9',
+        threeds_completion: '92'
       }
 
       def commit(action, params, reference_action = nil)

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

@@ -25,8 +25,8 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://ics2wsa.ic3.com/commerce/1.x/transactionProcessor'
 
       # Schema files can be found here: https://ics2ws.ic3.com/commerce/1.x/transactionProcessor/
-      TEST_XSD_VERSION = '1.156'
-      PRODUCTION_XSD_VERSION = '1.155'
+      TEST_XSD_VERSION = '1.159'
+      PRODUCTION_XSD_VERSION = '1.159'
 
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb, :dankort, :maestro, :elo]
       self.supported_countries = %w(US BR CA CN DK FI FR DE IN JP MX NO SE GB SG LB PK)
@@ -258,6 +258,7 @@ module ActiveMerchant #:nodoc:
       def build_auth_request(money, creditcard_or_reference, options)
         xml = Builder::XmlMarkup.new :indent => 2
         add_payment_method_or_subscription(xml, money, creditcard_or_reference, options)
+        add_threeds_2_ucaf_data(xml, creditcard_or_reference, options)
         add_decision_manager_fields(xml, options)
         add_mdd_fields(xml, options)
         add_auth_service(xml, creditcard_or_reference, options)
@@ -295,6 +296,7 @@ module ActiveMerchant #:nodoc:
       def build_purchase_request(money, payment_method_or_reference, options)
         xml = Builder::XmlMarkup.new :indent => 2
         add_payment_method_or_subscription(xml, money, payment_method_or_reference, options)
+        add_threeds_2_ucaf_data(xml, payment_method_or_reference, options)
         add_decision_manager_fields(xml, options)
         add_mdd_fields(xml, options)
         if !payment_method_or_reference.is_a?(String) && card_brand(payment_method_or_reference) == 'check'
@@ -530,19 +532,41 @@ module ActiveMerchant #:nodoc:
           add_auth_network_tokenization(xml, payment_method, options)
         else
           xml.tag! 'ccAuthService', {'run' => 'true'} do
-            check_for_stored_cred_commerce_indicator(xml, options)
+            if options[:three_d_secure]
+              add_normalized_threeds_2_data(xml, payment_method, options)
+            else
+              indicator = options[:commerce_indicator] || stored_credential_commerce_indicator(options)
+              xml.tag!('commerceIndicator', indicator) if indicator
+            end
           end
         end
       end
 
-      def check_for_stored_cred_commerce_indicator(xml, options)
-        return unless options[:stored_credential]
-        if commerce_indicator(options)
-          xml.tag!('commerceIndicator', commerce_indicator(options))
+      def add_normalized_threeds_2_data(xml, payment_method, options)
+        threeds_2_options = options[:three_d_secure]
+
+        xml.tag!('cavv', threeds_2_options[:cavv]) if threeds_2_options[:cavv] && card_brand(payment_method).to_sym != :master
+        xml.tag!('cavvAlgorithm', threeds_2_options[:cavv_algorithm]) if threeds_2_options[:cavv_algorithm]
+        xml.tag!('paSpecificationVersion', threeds_2_options[:version]) if threeds_2_options[:version]
+        xml.tag!('directoryServerTransactionID', threeds_2_options[:ds_transaction_id]) if threeds_2_options[:ds_transaction_id]
+        xml.tag!('commerceIndicator', options[:commerce_indicator]) if options[:commerce_indicator]
+        xml.tag!('eciRaw', threeds_2_options[:eci]) if threeds_2_options[:eci]
+        xml.tag!('xid', threeds_2_options[:xid]) if threeds_2_options[:xid]
+        xml.tag!('veresEnrolled', threeds_2_options[:enrolled]) if threeds_2_options[:enrolled]
+        xml.tag!('paresStatus', threeds_2_options[:authentication_response_status]) if threeds_2_options[:authentication_response_status]
+      end
+
+      def add_threeds_2_ucaf_data(xml, payment_method, options)
+        return unless options[:three_d_secure] && card_brand(payment_method).to_sym == :master
+
+        xml.tag! 'ucaf' do
+          xml.tag!('authenticationData', options[:three_d_secure][:cavv])
+          xml.tag!('collectionIndicator', options[:collection_indicator]) if options[:collection_indicator]
         end
       end
 
-      def commerce_indicator(options)
+      def stored_credential_commerce_indicator(options)
+        return unless options[:stored_credential]
         return if options[:stored_credential][:initial_transaction]
         case options[:stored_credential][:reason_type]
         when 'installment' then 'install'

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

@@ -106,7 +106,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def add_auth_purchase_params(post, money, credit_card, options)
-        post[:payment_method_id] =  options[:payment_method_id] ? options[:payment_method_id].to_i : 1
+        post[:payment_method_id] = add_payment_method_id(credit_card)
         post[:site_transaction_id] = options[:order_id]
         post[:bin] = credit_card.number[0..5]
         post[:payment_type] = options[:payment_type] || 'single'
@@ -119,6 +119,18 @@ module ActiveMerchant #:nodoc:
         add_payment(post, credit_card, options)
       end
 
+      def add_payment_method_id(credit_card)
+        if options[:payment_method_id]
+          options[:payment_method_id].to_i
+        elsif CreditCard.brand?(credit_card.number) == 'cabal'
+          63
+        elsif CreditCard.brand?(credit_card.number) == 'naranja'
+          24
+        else
+          1
+        end
+      end
+
       def add_invoice(post, money, options)
         add_amount(post, money, options)
         post[:currency] = (options[:currency] || currency(money))

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

@@ -7,9 +7,20 @@ module ActiveMerchant
       end
 
       def purchase(amount, payment_method, options={})
-        MultiResponse.run do |r|
-          r.process { authorize(amount, payment_method, options) }
-          r.process { capture(amount, r.authorization, options) }
+        if options[:pay_mode]
+          post = new_post
+          add_invoice(post, amount, options)
+          add_reference(post, *new_authorization)
+          add_payment_method(post, payment_method)
+          add_customer_data(post, payment_method, options)
+          add_3dsecure_id(post, options)
+
+          commit('pay', post)
+        else
+          MultiResponse.run do |r|
+            r.process { authorize(amount, payment_method, options) }
+            r.process { capture(amount, r.authorization, options) }
+          end
         end
       end
 
@@ -206,9 +217,23 @@ module ActiveMerchant
 
       def base_url
         if test?
-          @options[:region] == 'asia_pacific' ? test_ap_url : test_na_url
+          case @options[:region]
+          when 'asia_pacific'
+            test_ap_url
+          when 'europe'
+            test_eu_url
+          when 'north_america', nil
+            test_na_url
+          end
         else
-          @options[:region] == 'asia_pacific' ? live_ap_url : live_na_url
+          case @options[:region]
+          when 'asia_pacific'
+            live_ap_url
+          when 'europe'
+            live_eu_url
+          when 'north_america', nil
+            live_na_url
+          end
         end
       end
 

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

@@ -249,7 +249,8 @@ module ActiveMerchant #:nodoc:
           error_code: error_code_from(response)
         )
       rescue ResponseError => e
-        message = get_error_message(e)
+        message = get_error_messages(e)
+
         return Response.new(
           false,
           "#{STANDARD_ERROR_MESSAGE_MAPPING[e.response.code]} #{message}",
@@ -263,15 +264,41 @@ module ActiveMerchant #:nodoc:
         %w[pending paid processing canceled active].include? response['status']
       end
 
-      def get_error_message(error)
-        JSON.parse(error.response.body)['message']
-      end
-
       def message_from(response)
+        return gateway_response_errors(response) if gateway_response_errors?(response)
         return response['message'] if response['message']
         return response['last_transaction']['acquirer_message'] if response['last_transaction']
       end
 
+      def get_error_messages(error)
+        parsed_response_body = parse(error.response.body)
+        message = parsed_response_body['message']
+
+        parsed_response_body['errors']&.each do |type, descriptions|
+          message += ' | '
+          message += descriptions.join(', ')
+        end
+
+        message
+      end
+
+      def gateway_response_errors?(response)
+        response.try(:[], 'last_transaction').try(:[], 'gateway_response').try(:[], 'errors').present?
+      end
+
+      def gateway_response_errors(response)
+        error_string = ''
+
+        response['last_transaction']['gateway_response']['errors']&.each do |error|
+          error.each do |key, value|
+            error_string += ' | ' unless error_string.blank?
+            error_string += value
+          end
+        end
+
+        error_string
+      end
+
       def authorization_from(response, action)
         return "#{response['customer']['id']}|#{response['id']}" if action == 'store'
         response['id']

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

@@ -262,23 +262,35 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'NameOnCard', credit_card.first_name
           xml.tag! 'CVNum', credit_card.verification_value if credit_card.verification_value?
 
-          if options[:three_d_secure]
-            three_d_secure = options[:three_d_secure]
-            xml.tag! 'BuyerAuthResult' do
-              xml.tag! 'Status', three_d_secure[:status] unless three_d_secure[:status].blank?
-              xml.tag! 'AuthenticationId', three_d_secure[:authentication_id] unless three_d_secure[:authentication_id].blank?
-              xml.tag! 'PAReq', three_d_secure[:pareq] unless three_d_secure[:pareq].blank?
-              xml.tag! 'ACSUrl', three_d_secure[:acs_url] unless three_d_secure[:acs_url].blank?
-              xml.tag! 'ECI', three_d_secure[:eci] unless three_d_secure[:eci].blank?
-              xml.tag! 'CAVV', three_d_secure[:cavv] unless three_d_secure[:cavv].blank?
-              xml.tag! 'XID', three_d_secure[:xid] unless three_d_secure[:xid].blank?
-            end
-          end
+          add_three_d_secure(options, xml)
 
           xml.tag! 'ExtData', 'Name' => 'LASTNAME', 'Value' =>  credit_card.last_name
         end
       end
 
+      def add_three_d_secure(options, xml)
+        if options[:three_d_secure]
+          three_d_secure = options[:three_d_secure]
+          xml.tag! 'BuyerAuthResult' do
+            authentication_status(three_d_secure, xml)
+            xml.tag! 'AuthenticationId', three_d_secure[:authentication_id] unless three_d_secure[:authentication_id].blank?
+            xml.tag! 'PAReq', three_d_secure[:pareq] unless three_d_secure[:pareq].blank?
+            xml.tag! 'ACSUrl', three_d_secure[:acs_url] unless three_d_secure[:acs_url].blank?
+            xml.tag! 'ECI', three_d_secure[:eci] unless three_d_secure[:eci].blank?
+            xml.tag! 'CAVV', three_d_secure[:cavv] unless three_d_secure[:cavv].blank?
+            xml.tag! 'XID', three_d_secure[:xid] unless three_d_secure[:xid].blank?
+          end
+        end
+      end
+
+      def authentication_status(three_d_secure, xml)
+        if three_d_secure[:authentication_response_status].present?
+          xml.tag! 'Status', three_d_secure[:authentication_response_status]
+        elsif three_d_secure[:directory_response_status].present?
+          xml.tag! 'Status', three_d_secure[:directory_response_status]
+        end
+      end
+
       def credit_card_type(credit_card)
         return '' if card_brand(credit_card).blank?
 

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

@@ -193,28 +193,32 @@ module ActiveMerchant #:nodoc:
         requires!(options, :order_id)
 
         data = {}
-        add_action(data, :purchase)
+        add_action(data, :purchase, options)
         add_amount(data, money, options)
         add_order(data, options[:order_id])
         add_payment(data, payment)
+        add_threeds(data, options) if options[:execute_threed]
         data[:description] = options[:description]
         data[:store_in_vault] = options[:store]
+        data[:sca_exemption] = options[:sca_exemption]
 
-        commit data
+        commit data, options
       end
 
       def authorize(money, payment, options = {})
         requires!(options, :order_id)
 
         data = {}
-        add_action(data, :authorize)
+        add_action(data, :authorize, options)
         add_amount(data, money, options)
         add_order(data, options[:order_id])
         add_payment(data, payment)
+        add_threeds(data, options) if options[:execute_threed]
         data[:description] = options[:description]
         data[:store_in_vault] = options[:store]
+        data[:sca_exemption] = options[:sca_exemption]
 
-        commit data
+        commit data, options
       end
 
       def capture(money, authorization, options = {})
@@ -225,7 +229,7 @@ module ActiveMerchant #:nodoc:
         add_order(data, order_id)
         data[:description] = options[:description]
 
-        commit data
+        commit data, options
       end
 
       def void(authorization, options = {})
@@ -236,7 +240,7 @@ module ActiveMerchant #:nodoc:
         add_order(data, order_id)
         data[:description] = options[:description]
 
-        commit data
+        commit data, options
       end
 
       def refund(money, authorization, options = {})
@@ -247,7 +251,7 @@ module ActiveMerchant #:nodoc:
         add_order(data, order_id)
         data[:description] = options[:description]
 
-        commit data
+        commit data, options
       end
 
       def verify(creditcard, options = {})
@@ -278,8 +282,8 @@ module ActiveMerchant #:nodoc:
 
       private
 
-      def add_action(data, action)
-        data[:action] = transaction_code(action)
+      def add_action(data, action, options = {})
+        data[:action] = options[:execute_threed].present? ? '0' : transaction_code(action)
       end
 
       def add_amount(data, money, options)
@@ -295,6 +299,10 @@ module ActiveMerchant #:nodoc:
         test? ? test_url : live_url
       end
 
+      def threeds_url
+        test? ? 'https://sis-t.redsys.es:25443/sis/services/SerClsWSEntradaV2': 'https://sis.redsys.es/sis/services/SerClsWSEntradaV2'
+      end
+
       def add_payment(data, card)
         if card.is_a?(String)
           data[:credit_card_token] = card
@@ -311,21 +319,57 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def commit(data)
-        parse(ssl_post(url, "entrada=#{CGI.escape(xml_request_from(data))}", headers))
+      def add_threeds(data, options)
+        if options[:execute_threed] == true
+          data[:threeds] = {threeDSInfo: 'CardData'}
+        end
+      end
+
+      def determine_3ds_action(threeds_hash)
+        return 'iniciaPeticion' if threeds_hash[:threeDSInfo] == 'CardData'
+        return 'trataPeticion' if threeds_hash[:threeDSInfo] == 'AuthenticationData' ||
+                                  threeds_hash[:threeDSInfo] == 'ChallengeResponse'
+      end
+
+      def commit(data, options = {})
+        if data[:threeds]
+          action = determine_3ds_action(data[:threeds])
+          request = <<-EOS
+            <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://webservice.sis.sermepa.es" xmlns:intf="http://webservice.sis.sermepa.es" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+            <soapenv:Header/>
+            <soapenv:Body>
+              <intf:#{action} xmlns:intf="http://webservice.sis.sermepa.es">
+                <intf:datoEntrada>
+                <![CDATA[#{xml_request_from(data, options)}]]>
+                </intf:datoEntrada>
+              </intf:#{action}>
+            </soapenv:Body>
+          </soapenv:Envelope>
+          EOS
+          parse(ssl_post(threeds_url, request, headers(action)), action)
+        else
+          parse(ssl_post(url, "entrada=#{CGI.escape(xml_request_from(data, options))}", headers), action)
+        end
       end
 
-      def headers
-        {
-          'Content-Type' => 'application/x-www-form-urlencoded'
-        }
+      def headers(action=nil)
+        if action
+          {
+            'Content-Type' => 'text/xml',
+            'SOAPAction'    => action
+          }
+        else
+          {
+            'Content-Type' => 'application/x-www-form-urlencoded'
+          }
+        end
       end
 
-      def xml_request_from(data)
+      def xml_request_from(data, options = {})
         if sha256_authentication?
-          build_sha256_xml_request(data)
+          build_sha256_xml_request(data, options)
         else
-          build_sha1_xml_request(data)
+          build_sha1_xml_request(data, options)
         end
       end
 
@@ -351,30 +395,30 @@ module ActiveMerchant #:nodoc:
         Digest::SHA1.hexdigest(str)
       end
 
-      def build_sha256_xml_request(data)
+      def build_sha256_xml_request(data, options = {})
         xml = Builder::XmlMarkup.new
         xml.instruct!
         xml.REQUEST do
-          build_merchant_data(xml, data)
+          build_merchant_data(xml, data, options)
           xml.DS_SIGNATUREVERSION 'HMAC_SHA256_V1'
-          xml.DS_SIGNATURE sign_request(merchant_data_xml(data), data[:order_id])
+          xml.DS_SIGNATURE sign_request(merchant_data_xml(data, options), data[:order_id])
         end
         xml.target!
       end
 
-      def build_sha1_xml_request(data)
+      def build_sha1_xml_request(data, options = {})
         xml = Builder::XmlMarkup.new :indent => 2
-        build_merchant_data(xml, data)
+        build_merchant_data(xml, data, options)
         xml.target!
       end
 
-      def merchant_data_xml(data)
+      def merchant_data_xml(data, options = {})
         xml = Builder::XmlMarkup.new
-        build_merchant_data(xml, data)
+        build_merchant_data(xml, data, options)
         xml.target!
       end
 
-      def build_merchant_data(xml, data)
+      def build_merchant_data(xml, data, options = {})
         xml.DATOSENTRADA do
           # Basic elements
           xml.DS_Version 0.1
@@ -383,9 +427,10 @@ module ActiveMerchant #:nodoc:
           xml.DS_MERCHANT_ORDER              data[:order_id]
           xml.DS_MERCHANT_TRANSACTIONTYPE    data[:action]
           xml.DS_MERCHANT_PRODUCTDESCRIPTION data[:description]
-          xml.DS_MERCHANT_TERMINAL           @options[:terminal]
+          xml.DS_MERCHANT_TERMINAL           options[:terminal] || @options[:terminal]
           xml.DS_MERCHANT_MERCHANTCODE       @options[:login]
           xml.DS_MERCHANT_MERCHANTSIGNATURE  build_signature(data) unless sha256_authentication?
+          xml.DS_MERCHANT_EXCEP_SCA          data[:sca_exemption] if data[:sca_exemption]
 
           # Only when card is present
           if data[:card]
@@ -398,22 +443,42 @@ module ActiveMerchant #:nodoc:
             xml.DS_MERCHANT_IDENTIFIER data[:credit_card_token]
             xml.DS_MERCHANT_DIRECTPAYMENT 'true'
           end
+
+          # Set moto flag only if explicitly requested via moto field
+          # Requires account configuration to be able to use
+          if options.dig(:moto) && options.dig(:metadata, :manual_entry)
+            xml.DS_MERCHANT_DIRECTPAYMENT 'moto'
+          end
+
+          if data[:threeds]
+            xml.DS_MERCHANT_EMV3DS data[:threeds].to_json
+          end
         end
       end
 
-      def parse(data)
+      def parse(data, action)
         params  = {}
         success = false
         message = ''
         options = @options.merge(:test => test?)
         xml     = Nokogiri::XML(data)
         code    = xml.xpath('//RETORNOXML/CODIGO').text
-        if code == '0'
+
+        if ['iniciaPeticion', 'trataPeticion'].include?(action)
+          vxml = Nokogiri::XML(data).remove_namespaces!.xpath("//Envelope/Body/#{action}Response/#{action}Return").inner_text
+          xml = Nokogiri::XML(vxml)
+          node = (action == 'iniciaPeticion' ? 'INFOTARJETA' : 'OPERACION')
+          op = xml.xpath("//RETORNOXML/#{node}")
+          op.children.each do |element|
+            params[element.name.downcase.to_sym] = element.text
+          end
+          message = response_text_3ds(xml, params)
+          success = params.size > 0 && is_success_response?(params[:ds_response])
+        elsif code == '0'
           op = xml.xpath('//RETORNOXML/OPERACION')
           op.children.each do |element|
             params[element.name.downcase.to_sym] = element.text
           end
-
           if validate_signature(params)
             message = response_text(params[:ds_response])
             options[:authorization] = build_authorization(params)
@@ -474,6 +539,20 @@ module ActiveMerchant #:nodoc:
         RESPONSE_TEXTS[code] || 'Unkown code, please check in manual'
       end
 
+      def response_text_3ds(xml, params)
+        code = xml.xpath('//RETORNOXML/CODIGO').text
+        message = ''
+        if code != '0'
+          message = "#{code} ERROR"
+        elsif params[:ds_emv3ds]
+          three_ds_data = JSON.parse(params[:ds_emv3ds])
+          message = three_ds_data['threeDSInfo']
+        elsif params[:ds_response]
+          message = response_text(params[:ds_response])
+        end
+        message
+      end
+
       def is_success_response?(code)
         (code.to_i < 100) || [400, 481, 500, 900].include?(code.to_i)
       end
@@ -523,6 +602,10 @@ module ActiveMerchant #:nodoc:
           xml_signed_fields += data[:ds_cardnumber]
         end
 
+        if data[:ds_emv3ds]
+          xml_signed_fields += data[:ds_emv3ds]
+        end
+
         xml_signed_fields + data[:ds_transactiontype] + data[:ds_securepayment]
       end
 

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

@@ -25,7 +25,7 @@ module ActiveMerchant #:nodoc:
 
       DEFAULT_API_VERSION = '2015-04-07'
 
-      self.supported_countries = %w(AT AU BE BR CA CH DE DK ES FI FR GB HK IE IT JP LU MX NL NO NZ PT SE SG US)
+      self.supported_countries = %w(AT AU BE BR CA CH DE DK EE ES FI FR GB GR HK IE IT JP LT LU LV MX NL NO NZ PL PT SE SG SI SK US)
       self.default_currency = 'USD'
       self.money_format = :cents
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club, :maestro]

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
     # For the legacy API, see the Stripe gateway
     class StripePaymentIntentsGateway < StripeGateway
 
-      self.supported_countries = %w(AT AU BE BR CA CH DE DK ES FI FR GB HK IE IT JP LU MX NL NO NZ PT SE SG US)
+      self.supported_countries = %w(AT AU BE BR CA CH DE DK EE ES FI FR GB GR HK IE IT JP LT LU LV MX NL NO NZ PL PT SE SG SI SK US)
 
       ALLOWED_METHOD_STATES = %w[automatic manual].freeze
       ALLOWED_CANCELLATION_REASONS = %w[duplicate fraudulent requested_by_customer abandoned].freeze
@@ -92,7 +92,11 @@ module ActiveMerchant #:nodoc:
       def capture(money, intent_id, options = {})
         post = {}
         post[:amount_to_capture] = money
-        add_connected_account(post, options)
+        if options[:transfer_amount]
+          post[:transfer_data] = {}
+          post[:transfer_data][:amount] = options[:transfer_amount]
+        end
+        post[:application_fee_amount] = options[:application_fee] if options[:application_fee]
         commit(:post, "payment_intents/#{intent_id}/capture", post, options)
       end
 

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

@@ -3,13 +3,18 @@ module ActiveMerchant
     class TnsGateway < Gateway
       include MastercardGateway
 
-      class_attribute :live_na_url, :live_ap_url, :test_na_url, :test_ap_url
+      class_attribute :live_na_url, :live_ap_url, :live_eu_url, :test_na_url, :test_ap_url, :test_eu_url
 
-      self.live_na_url = 'https://secure.na.tnspayments.com/api/rest/version/36/'
-      self.test_na_url = 'https://secure.na.tnspayments.com/api/rest/version/36/'
+      VERSION = '52'
 
-      self.live_ap_url = 'https://secure.ap.tnspayments.com/api/rest/version/36/'
-      self.test_ap_url = 'https://secure.ap.tnspayments.com/api/rest/version/36/'
+      self.live_na_url = "https://secure.na.tnspayments.com/api/rest/version/#{VERSION}/"
+      self.test_na_url = "https://secure.na.tnspayments.com/api/rest/version/#{VERSION}/"
+
+      self.live_ap_url = "https://secure.ap.tnspayments.com/api/rest/version/#{VERSION}/"
+      self.test_ap_url = "https://secure.ap.tnspayments.com/api/rest/version/#{VERSION}/"
+
+      self.live_eu_url = "https://secure.eu.tnspayments.com/api/rest/version/#{VERSION}/"
+      self.test_eu_url = "https://secure.eu.tnspayments.com/api/rest/version/#{VERSION}/"
 
       self.display_name = 'TNS'
       self.homepage_url = 'http://www.tnsi.com/'

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

@@ -88,7 +88,7 @@ module ActiveMerchant #:nodoc:
       def refund(money, authorization, options = {})
         authorization = order_id_from_authorization(authorization.to_s)
         response = MultiResponse.run do |r|
-          r.process { inquire_request(authorization, options, 'CAPTURED', 'SETTLED', 'SETTLED_BY_MERCHANT') }
+          r.process { inquire_request(authorization, options, 'CAPTURED', 'SETTLED', 'SETTLED_BY_MERCHANT') } unless options[:authorization_validated]
           r.process { refund_request(money, authorization, options) }
         end
 
@@ -208,6 +208,8 @@ module ActiveMerchant #:nodoc:
                 add_instalments_data(xml, options)
               end
               add_moto_flag(xml, options) if options.dig(:metadata, :manual_entry)
+              add_additional_3ds_data(xml, options) if options[:execute_threed] && options[:three_ds_version] && options[:three_ds_version] =~ /^2/
+              add_3ds_exemption(xml, options) if options[:exemption_type]
             end
           end
         end
@@ -257,6 +259,14 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_additional_3ds_data(xml, options)
+        xml.tag! 'additional3DSData', 'dfReferenceId' => options[:session_id]
+      end
+
+      def add_3ds_exemption(xml, options)
+        xml.tag! 'exemption', 'type' => options[:exemption_type], 'placement' => options[:exemption_placement] || 'AUTHORISATION'
+      end
+
       def add_amount(xml, money, options)
         currency = options[:currency] || currency(money)
 
@@ -329,7 +339,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'date', 'month' => format(payment_method.month, :two_digits), 'year' => format(payment_method.year, :four_digits)
         end
 
-        xml.tag! 'cardHolderName', options[:execute_threed] ? '3D' : payment_method.name
+        xml.tag! 'cardHolderName', options[:execute_threed] && (options[:three_ds_version] =~ /[^2]/).nil? ? '3D' : payment_method.name
         xml.tag! 'cvc', payment_method.verification_value
 
         add_address(xml, (options[:billing_address] || options[:address]))
@@ -481,6 +491,7 @@ module ActiveMerchant #:nodoc:
         if options[:execute_threed]
           raw[:cookie] = @cookie
           raw[:session_id] = options[:session_id]
+          raw[:is3DSOrder] = true
         end
         success = success_from(action, raw, success_criteria)
         message = message_from(success, raw, success_criteria)

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = '1.98.0'
+  VERSION = '1.99.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.98.0
+  version: 1.99.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport