activemerchant 1.121.0 → 1.123.0

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

@@ -143,6 +143,7 @@ module ActiveMerchant #:nodoc:
         post[:sg_Descriptor] = options[:merchant_descriptor] if options[:merchant_descriptor]
         post[:sg_MerchantPhoneNumber] = options[:merchant_phone_number] if options[:merchant_phone_number]
         post[:sg_MerchantName] = options[:merchant_name] if options[:merchant_name]
+        post[:sg_ProductID] = options[:product_id] if options[:product_id]
       end
 
       def add_payment(post, payment, options = {})
@@ -185,6 +186,7 @@ module ActiveMerchant #:nodoc:
         post[:sg_Xid] = options[:three_d_secure][:xid]
         post[:sg_IsExternalMPI] = 1
         post[:sg_EnablePartialApproval] = options[:is_partial_approval]
+        post[:sg_challengePreference] = options[:three_d_secure][:challenge_preference] if options[:three_d_secure][:challenge_preference]
       end
 
       def parse(xml)

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

@@ -254,11 +254,20 @@ module ActiveMerchant #:nodoc:
       end
 
       def childnode_to_response(response, node, childnode)
-        name = "#{node.name.downcase}_#{childnode.name.downcase}"
-        if name == 'payment_method_data' && !childnode.elements.empty?
-          response[name.to_sym] = Hash.from_xml(childnode.to_s).values.first
+        node_name = node.name.downcase
+        childnode_name = childnode.name.downcase
+        composed_name = "#{node_name}_#{childnode_name}"
+
+        childnodes_present = !childnode.elements.empty?
+
+        if childnodes_present && composed_name == 'payment_method_data'
+          response[composed_name.to_sym] = Hash.from_xml(childnode.to_s).values.first
+        elsif childnodes_present && node_name == 'gateway_specific_response_fields'
+          response[node_name.to_sym] = {
+            childnode_name => Hash.from_xml(childnode.to_s).values.first
+          }
         else
-          response[name.to_sym] = childnode.text
+          response[composed_name.to_sym] = childnode.text
         end
       end
 

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

@@ -31,6 +31,7 @@ module ActiveMerchant #:nodoc:
         setup_future_usage(post, options)
         add_exemption(post, options)
         add_stored_credentials(post, options)
+        add_ntid(post, options)
         add_error_on_requires_action(post, options)
         request_three_d_secure(post, options)
 
@@ -295,6 +296,11 @@ module ActiveMerchant #:nodoc:
         post[:payment_method_options][:card][:moto] = true if options[:moto]
       end
 
+      # Stripe Payment Intents does not pass any parameters for cardholder/merchant initiated
+      # it also does not support installments for any country other than Mexico (reason for this is unknown)
+      # The only thing that Stripe PI requires for stored credentials to work currently is the network_transaction_id
+      # network_transaction_id is created when the card is authenticated using the field `setup_for_future_usage` with the value `off_session` see def setup_future_usage below
+
       def add_stored_credentials(post, options = {})
         return unless options[:stored_credential] && !options[:stored_credential].values.all?(&:nil?)
 
@@ -304,8 +310,20 @@ module ActiveMerchant #:nodoc:
         post[:payment_method_options][:card][:mit_exemption] = {}
 
         # Stripe PI accepts network_transaction_id and ds_transaction_id via mit field under card.
-        post[:payment_method_options][:card][:mit_exemption][:network_transaction_id] = stored_credential[:network_transaction_id] if stored_credential[:network_transaction_id]
+        # The network_transaction_id can be sent in nested under stored credentials OR as its own field (add_ntid handles when it is sent in on its own)
+        # If it is sent is as its own field AND under stored credentials, the value sent under its own field is what will send.
         post[:payment_method_options][:card][:mit_exemption][:ds_transaction_id] = stored_credential[:ds_transaction_id] if stored_credential[:ds_transaction_id]
+        post[:payment_method_options][:card][:mit_exemption][:network_transaction_id] = stored_credential[:network_transaction_id] if stored_credential[:network_transaction_id]
+      end
+
+      def add_ntid(post, options = {})
+        return unless options[:network_transaction_id]
+
+        post[:payment_method_options] ||= {}
+        post[:payment_method_options][:card] ||= {}
+        post[:payment_method_options][:card][:mit_exemption] = {}
+
+        post[:payment_method_options][:card][:mit_exemption][:network_transaction_id] = options[:network_transaction_id] if options[:network_transaction_id]
       end
 
       def add_error_on_requires_action(post, options = {})

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

@@ -343,7 +343,7 @@ module ActiveMerchant #:nodoc:
         parameters[:software] = 'Active Merchant'
         parameters[:testmode] = (@options[:test] ? 1 : 0) unless parameters.has_key?(:testmode)
         seed = SecureRandom.hex(32).upcase
-        hash = Digest::SHA1.hexdigest("#{parameters[:command]}:#{@options[:password]}:#{parameters[:amount]}:#{parameters[:invoice]}:#{seed}")
+        hash = Digest::SHA1.hexdigest("#{parameters[:command]}:#{@options[:pin] || @options[:password]}:#{parameters[:amount]}:#{parameters[:invoice]}:#{seed}")
         parameters[:hash] = "s/#{seed}/#{hash}/n"
 
         parameters.collect { |key, value| "UM#{key}=#{CGI.escape(value.to_s)}" }.join('&')

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

@@ -63,6 +63,42 @@ module ActiveMerchant #:nodoc:
         commit(:pci_buy_rollback, post)
       end
 
+      def credit(money, payment, options = {})
+        # Not permitted for foreign cards.
+        commerce = options[:commerce] || @options[:commerce]
+        commerce_branch = options[:commerce_branch] || @options[:commerce_branch]
+
+        token = generate_token(@shop_process_id, 'refund', commerce, commerce_branch, amount(money), currency(money))
+        post = {}
+        post[:token] = token
+        post[:commerce] = commerce.to_i
+        post[:commerce_branch] = commerce_branch.to_i
+        post[:shop_process_id] = @shop_process_id
+        add_invoice(post, money, options)
+        add_card_data(post, payment)
+        add_customer_data(post, options)
+        post[:origin_shop_process_id] = options[:original_shop_process_id] if options[:original_shop_process_id]
+        commit(:refund, post)
+      end
+
+      def refund(money, authorization, options = {})
+        commerce = options[:commerce] || @options[:commerce]
+        commerce_branch = options[:commerce_branch] || @options[:commerce_branch]
+        shop_process_id = options[:shop_process_id] || @shop_process_id
+        _, original_shop_process_id = authorization.to_s.split('#')
+
+        token = generate_token(shop_process_id, 'refund', commerce, commerce_branch, amount(money), currency(money))
+        post = {}
+        post[:token] = token
+        post[:commerce] = commerce.to_i
+        post[:commerce_branch] = commerce_branch.to_i
+        post[:shop_process_id] = shop_process_id
+        add_invoice(post, money, options)
+        add_customer_data(post, options)
+        post[:origin_shop_process_id] = original_shop_process_id || options[:original_shop_process_id]
+        commit(:refund, post)
+      end
+
       def supports_scrubbing?
         true
       end
@@ -146,15 +182,22 @@ module ActiveMerchant #:nodoc:
       end
 
       def message_from(response)
-        response.dig('confirmation', 'extended_response_description') ||
-          response.dig('confirmation', 'response_description') ||
-          response.dig('confirmation', 'response_details') ||
-          response.dig('messages', 0, 'key')
+        %w(confirmation refund).each do |m|
+          message =
+            response.dig(m, 'extended_response_description') ||
+            response.dig(m, 'response_description') ||
+            response.dig(m, 'response_details')
+          return message if message
+        end
+        [response.dig('messages', 0, 'key'), response.dig('messages', 0, 'dsc')].join(':')
       end
 
       def authorization_from(response)
-        authorization_number = response.dig('confirmation', 'authorization_number')
-        shop_process_id = response.dig('confirmation', 'shop_process_id')
+        response_body = response.dig('confirmation') || response.dig('refund')
+        return unless response_body
+
+        authorization_number = response_body.dig('authorization_number') || response_body.dig('authorization_code')
+        shop_process_id = response_body.dig('shop_process_id')
 
         "#{authorization_number}##{shop_process_id}"
       end

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

@@ -115,8 +115,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def verify(payment_method, options = {})
+        amount = (eligible_for_0_auth?(payment_method, options) ? 0 : 100)
         MultiResponse.run(:use_first_response) do |r|
-          r.process { authorize(100, payment_method, options) }
+          r.process { authorize(amount, payment_method, options) }
           r.process(:ignore_result) { void(r.authorization, options.merge(authorization_validated: true)) }
         end
       end
@@ -130,6 +131,10 @@ module ActiveMerchant #:nodoc:
         true
       end
 
+      def supports_network_tokenization?
+        true
+      end
+
       def scrub(transcript)
         transcript.
           gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
@@ -140,7 +145,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def authorize_request(money, payment_method, options)
-        commit('authorize', build_authorization_request(money, payment_method, options), 'AUTHORISED', options)
+        commit('authorize', build_authorization_request(money, payment_method, options), 'AUTHORISED', 'CAPTURED', options)
       end
 
       def capture_request(money, authorization, options)
@@ -235,7 +240,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_void_request(authorization, options)
-        build_order_modify_request(authorization, &:cancel)
+        if options[:cancel_or_refund]
+          build_order_modify_request(authorization, &:cancelOrRefund)
+        else
+          build_order_modify_request(authorization, &:cancel)
+        end
       end
 
       def build_refund_request(money, authorization, options)
@@ -389,6 +398,8 @@ module ActiveMerchant #:nodoc:
               add_amount(xml, amount, options)
             end
           end
+        elsif options[:payment_type] == :network_token
+          add_network_tokenization_card(xml, payment_method)
         else
           xml.paymentDetails credit_fund_transfer_attribute(options) do
             if options[:payment_type] == :token
@@ -407,7 +418,6 @@ module ActiveMerchant #:nodoc:
               xml.session 'shopperIPAddress' => options[:ip] if options[:ip]
               xml.session 'id' => options[:session_id] if options[:session_id]
             end
-
             if three_d_secure = options[:three_d_secure]
               add_three_d_secure(three_d_secure, xml)
             end
@@ -415,10 +425,26 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_network_tokenization_card(xml, payment_method)
+        xml.paymentDetails do
+          xml.tag! 'EMVCO_TOKEN-SSL', 'type' => 'NETWORKTOKEN' do
+            xml.tokenNumber payment_method.number
+            xml.expiryDate do
+              xml.date(
+                'month' => format(payment_method.month, :two_digits),
+                'year' => format(payment_method.year, :four_digits_year)
+              )
+            end
+            xml.cryptogram payment_method.payment_cryptogram
+            xml.eciIndicator format(payment_method.eci, :two_digits)
+          end
+        end
+      end
+
       def add_three_d_secure(three_d_secure, xml)
         xml.info3DSecure do
           xml.threeDSVersion three_d_secure[:version]
-          if /^2/.match?(three_d_secure[:version])
+          if three_d_secure[:version] && three_d_secure[:ds_transaction_id]
             xml.dsTransactionId three_d_secure[:ds_transaction_id]
           else
             xml.xid three_d_secure[:xid]
@@ -433,7 +459,7 @@ module ActiveMerchant #:nodoc:
         xml.expiryDate do
           xml.date(
             'month' => format(payment_method.month, :two_digits),
-            'year' => format(payment_method.year, :four_digits)
+            'year' => format(payment_method.year, :four_digits_year)
           )
         end
 
@@ -730,7 +756,9 @@ module ActiveMerchant #:nodoc:
 
       def payment_details_from(payment_method)
         payment_details = {}
-        if payment_method.respond_to?(:number)
+        if payment_method.is_a?(NetworkTokenizationCreditCard) && payment_method.source == :network_token
+          payment_details[:payment_type] = :network_token
+        elsif payment_method.respond_to?(:number)
           payment_details[:payment_type] = :credit
         else
           token_details = token_details_from_authorization(payment_method)
@@ -766,6 +794,10 @@ module ActiveMerchant #:nodoc:
       def card_code_for(payment_method)
         CARD_CODES[card_brand(payment_method)] || CARD_CODES['unknown']
       end
+
+      def eligible_for_0_auth?(payment_method, options = {})
+        payment_method.is_a?(CreditCard) && %w(visa master).include?(payment_method.brand) && options[:zero_dollar_auth]
+      end
     end
   end
 end

data/lib/active_merchant/billing/three_d_secure_eci_mapper.rb

@@ -0,0 +1,27 @@
+module ActiveMerchant
+  module Billing
+    module ThreeDSecureEciMapper
+      NON_THREE_D_SECURE_TRANSACTION = :non_three_d_secure_transaction
+      ATTEMPTED_AUTHENTICATION_TRANSACTION = :attempted_authentication_transaction
+      FULLY_AUTHENTICATED_TRANSACTION = :fully_authenticated_transaction
+
+      ECI_00_01_02_MAP = { '00' => NON_THREE_D_SECURE_TRANSACTION, '01' => ATTEMPTED_AUTHENTICATION_TRANSACTION, '02' => FULLY_AUTHENTICATED_TRANSACTION }.freeze
+      ECI_05_06_07_MAP = { '05' => FULLY_AUTHENTICATED_TRANSACTION, '06' => ATTEMPTED_AUTHENTICATION_TRANSACTION, '07' => NON_THREE_D_SECURE_TRANSACTION }.freeze
+      BRAND_TO_ECI_MAP = {
+        american_express: ECI_05_06_07_MAP,
+        dankort: ECI_05_06_07_MAP,
+        diners_club: ECI_05_06_07_MAP,
+        discover: ECI_05_06_07_MAP,
+        elo: ECI_05_06_07_MAP,
+        jcb: ECI_05_06_07_MAP,
+        maestro: ECI_00_01_02_MAP,
+        master: ECI_00_01_02_MAP,
+        visa: ECI_05_06_07_MAP
+      }.freeze
+
+      def self.map(brand, eci)
+        BRAND_TO_ECI_MAP.dig(brand, eci)
+      end
+    end
+  end
+end

data/lib/active_merchant/billing.rb

@@ -13,3 +13,4 @@ require 'active_merchant/billing/apple_pay_payment_token'
 require 'active_merchant/billing/response'
 require 'active_merchant/billing/gateways'
 require 'active_merchant/billing/gateway'
+require 'active_merchant/billing/three_d_secure_eci_mapper'

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = '1.121.0'
+  VERSION = '1.123.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.121.0
+  version: 1.123.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -293,6 +293,7 @@ files:
 - lib/active_merchant/billing/gateways/migs/migs_codes.rb
 - lib/active_merchant/billing/gateways/modern_payments.rb
 - lib/active_merchant/billing/gateways/modern_payments_cim.rb
+- lib/active_merchant/billing/gateways/moka.rb
 - lib/active_merchant/billing/gateways/monei.rb
 - lib/active_merchant/billing/gateways/moneris.rb
 - lib/active_merchant/billing/gateways/money_movers.rb
@@ -316,12 +317,14 @@ files:
 - lib/active_merchant/billing/gateways/pac_net_raven.rb
 - lib/active_merchant/billing/gateways/pagarme.rb
 - lib/active_merchant/billing/gateways/pago_facil.rb
+- lib/active_merchant/billing/gateways/pay_arc.rb
 - lib/active_merchant/billing/gateways/pay_conex.rb
 - lib/active_merchant/billing/gateways/pay_gate_xml.rb
 - lib/active_merchant/billing/gateways/pay_hub.rb
 - lib/active_merchant/billing/gateways/pay_junction.rb
 - lib/active_merchant/billing/gateways/pay_junction_v2.rb
 - lib/active_merchant/billing/gateways/pay_secure.rb
+- lib/active_merchant/billing/gateways/pay_trace.rb
 - lib/active_merchant/billing/gateways/paybox_direct.rb
 - lib/active_merchant/billing/gateways/payeezy.rb
 - lib/active_merchant/billing/gateways/payex.rb
@@ -343,6 +346,7 @@ files:
 - lib/active_merchant/billing/gateways/paypal_digital_goods.rb
 - lib/active_merchant/billing/gateways/paypal_express.rb
 - lib/active_merchant/billing/gateways/paypal_express_common.rb
+- lib/active_merchant/billing/gateways/paysafe.rb
 - lib/active_merchant/billing/gateways/payscout.rb
 - lib/active_merchant/billing/gateways/paystation.rb
 - lib/active_merchant/billing/gateways/payu_in.rb
@@ -410,6 +414,7 @@ files:
 - lib/active_merchant/billing/payment_token.rb
 - lib/active_merchant/billing/rails.rb
 - lib/active_merchant/billing/response.rb
+- lib/active_merchant/billing/three_d_secure_eci_mapper.rb
 - lib/active_merchant/connection.rb
 - lib/active_merchant/country.rb
 - lib/active_merchant/empty.rb
@@ -445,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: Framework and tools for dealing with credit card transactions.