activemerchant 1.129.0 → 1.133.0

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

@@ -2,6 +2,8 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class GlobalCollectGateway < Gateway
       class_attribute :preproduction_url
+      class_attribute :ogone_direct_test
+      class_attribute :ogone_direct_live
 
       self.display_name = 'GlobalCollect'
       self.homepage_url = 'http://www.globalcollect.com/'
@@ -9,6 +11,8 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://eu.sandbox.api-ingenico.com'
       self.preproduction_url = 'https://world.preprod.api-ingenico.com'
       self.live_url = 'https://world.api-ingenico.com'
+      self.ogone_direct_test = 'https://payment.preprod.direct.worldline-solutions.com'
+      self.ogone_direct_live = 'https://payment.direct.worldline-solutions.com'
 
       self.supported_countries = %w[AD AE AG AI AL AM AO AR AS AT AU AW AX AZ BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BR BS BT BW BY BZ CA CC CD CF CH CI CK CL CM CN CO CR CU CV CW CX CY CZ DE DJ DK DM DO DZ EC EE EG ER ES ET FI FJ FK FM FO FR GA GB GD GE GF GH GI GL GM GN GP GQ GR GS GT GU GW GY HK HN HR HT HU ID IE IL IM IN IS IT JM JO JP KE KG KH KI KM KN KR KW KY KZ LA LB LC LI LK LR LS LT LU LV MA MC MD ME MF MG MH MK MM MN MO MP MQ MR MS MT MU MV MW MX MY MZ NA NC NE NG NI NL NO NP NR NU NZ OM PA PE PF PG PH PL PN PS PT PW QA RE RO RS RU RW SA SB SC SE SG SH SI SJ SK SL SM SN SR ST SV SZ TC TD TG TH TJ TL TM TN TO TR TT TV TW TZ UA UG US UY UZ VC VE VG VI VN WF WS ZA ZM ZW]
       self.default_currency = 'USD'
@@ -114,7 +118,7 @@ module ActiveMerchant #:nodoc:
         post['order']['references']['invoiceData'] = {
           'invoiceNumber' => options[:invoice]
         }
-        add_airline_data(post, options)
+        add_airline_data(post, options) unless ogone_direct?
         add_lodging_data(post, options)
         add_number_of_installments(post, options) if options[:number_of_installments]
       end
@@ -248,9 +252,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_amount(post, money, options = {})
+        currency_ogone = 'EUR' if ogone_direct?
         post['amountOfMoney'] = {
           'amount' => amount(money),
-          'currencyCode' => options[:currency] || currency(money)
+          'currencyCode' => options[:currency] || currency_ogone || currency(money)
         }
       end
 
@@ -262,7 +267,7 @@ module ActiveMerchant #:nodoc:
         product_id = options[:payment_product_id] || BRAND_MAP[payment.brand]
         specifics_inputs = {
           'paymentProductId' => product_id,
-          'skipAuthentication' => 'true', # refers to 3DSecure
+          'skipAuthentication' => options[:skip_authentication] || 'true', # refers to 3DSecure
           'skipFraudService' => 'true',
           'authorizationMode' => pre_authorization
         }
@@ -377,18 +382,24 @@ module ActiveMerchant #:nodoc:
       def add_external_cardholder_authentication_data(post, options)
         return unless threeds_2_options = options[:three_d_secure]
 
-        authentication_data = {}
-        authentication_data[:acsTransactionId] = threeds_2_options[:acs_transaction_id] if threeds_2_options[:acs_transaction_id]
-        authentication_data[:cavv] = threeds_2_options[:cavv] if threeds_2_options[:cavv]
-        authentication_data[:cavvAlgorithm] = threeds_2_options[:cavv_algorithm] if threeds_2_options[:cavv_algorithm]
-        authentication_data[:directoryServerTransactionId] = threeds_2_options[:ds_transaction_id] if threeds_2_options[:ds_transaction_id]
-        authentication_data[:eci] = threeds_2_options[:eci] if threeds_2_options[:eci]
-        authentication_data[:threeDSecureVersion] = threeds_2_options[:version] if threeds_2_options[:version]
-        authentication_data[:validationResult] = threeds_2_options[:authentication_response_status] if threeds_2_options[:authentication_response_status]
-        authentication_data[:xid] = threeds_2_options[:xid] if threeds_2_options[:xid]
+        authentication_data = {
+          priorThreeDSecureData: { acsTransactionId: threeds_2_options[:acs_transaction_id] }.compact,
+          cavv: threeds_2_options[:cavv],
+          cavvAlgorithm: threeds_2_options[:cavv_algorithm],
+          directoryServerTransactionId: threeds_2_options[:ds_transaction_id],
+          eci: threeds_2_options[:eci],
+          threeDSecureVersion: threeds_2_options[:version] || options[:three_ds_version],
+          validationResult: threeds_2_options[:authentication_response_status],
+          xid: threeds_2_options[:xid],
+          acsTransactionId: threeds_2_options[:acs_transaction_id],
+          flow: threeds_2_options[:flow]
+        }.compact
 
         post['cardPaymentMethodSpecificInput'] ||= {}
         post['cardPaymentMethodSpecificInput']['threeDSecure'] ||= {}
+        post['cardPaymentMethodSpecificInput']['threeDSecure']['merchantFraudRate'] = threeds_2_options[:merchant_fraud_rate]
+        post['cardPaymentMethodSpecificInput']['threeDSecure']['exemptionRequest'] = threeds_2_options[:exemption_request]
+        post['cardPaymentMethodSpecificInput']['threeDSecure']['secureCorporatePayment'] = threeds_2_options[:secure_corporate_payment]
         post['cardPaymentMethodSpecificInput']['threeDSecure']['externalCardholderAuthenticationData'] = authentication_data unless authentication_data.empty?
       end
 
@@ -402,17 +413,28 @@ module ActiveMerchant #:nodoc:
 
       def url(action, authorization)
         return preproduction_url + uri(action, authorization) if @options[:url_override].to_s == 'preproduction'
+        return ogone_direct_url(action, authorization) if ogone_direct?
 
         (test? ? test_url : live_url) + uri(action, authorization)
       end
 
+      def ogone_direct_url(action, authorization)
+        (test? ? ogone_direct_test : ogone_direct_live) + uri(action, authorization)
+      end
+
+      def ogone_direct?
+        @options[:url_override].to_s == 'ogone_direct'
+      end
+
       def uri(action, authorization)
-        uri = "/v1/#{@options[:merchant_id]}/"
+        version = ogone_direct? ? 'v2' : 'v1'
+        uri = "/#{version}/#{@options[:merchant_id]}/"
         case action
         when :authorize
           uri + 'payments'
         when :capture
-          uri + "payments/#{authorization}/approve"
+          capture_name = ogone_direct? ? 'capture' : 'approve'
+          uri + "payments/#{authorization}/#{capture_name}"
         when :refund
           uri + "payments/#{authorization}/refund"
         when :void
@@ -423,7 +445,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def idempotency_key_for_signature(options)
-        "x-gcs-idempotence-key:#{options[:idempotency_key]}" if options[:idempotency_key]
+        "x-gcs-idempotence-key:#{options[:idempotency_key]}" if options[:idempotency_key] && !ogone_direct?
       end
 
       def commit(method, action, post, authorization: nil, options: {})
@@ -461,7 +483,7 @@ module ActiveMerchant #:nodoc:
           'Date' => date
         }
 
-        headers['X-GCS-Idempotence-Key'] = options[:idempotency_key] if options[:idempotency_key]
+        headers['X-GCS-Idempotence-Key'] = options[:idempotency_key] if options[:idempotency_key] && !ogone_direct?
         headers
       end
 
@@ -474,13 +496,13 @@ module ActiveMerchant #:nodoc:
           #{uri(action, authorization)}
         REQUEST
         data = data.each_line.reject { |line| line.strip == '' }.join
-        digest = OpenSSL::Digest.new('sha256')
+        digest = OpenSSL::Digest.new('SHA256')
         key = @options[:secret_api_key]
-        "GCS v1HMAC:#{@options[:api_key_id]}:#{Base64.strict_encode64(OpenSSL::HMAC.digest(digest, key, data))}"
+        "GCS v1HMAC:#{@options[:api_key_id]}:#{Base64.strict_encode64(OpenSSL::HMAC.digest(digest, key, data)).strip}"
       end
 
       def date
-        @date ||= Time.now.gmtime.strftime('%a, %d %b %Y %H:%M:%S %Z') # Must be same in digest and HTTP header
+        @date ||= Time.now.gmtime.strftime('%a, %d %b %Y %H:%M:%S GMT')
       end
 
       def content_type

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

@@ -2,7 +2,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class IpgGateway < Gateway
       self.test_url = 'https://test.ipg-online.com/ipgapi/services'
-      self.live_url = 'https://www5.ipg-online.com'
+      self.live_url = 'https://www5.ipg-online.com/ipgapi/services'
 
       self.supported_countries = %w(AR)
       self.default_currency = 'ARS'

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://api-uat.kushkipagos.com/'
       self.live_url = 'https://api.kushkipagos.com/'
 
-      self.supported_countries = %w[CL CO EC MX PE]
+      self.supported_countries = %w[BR CL CO EC MX PE]
       self.default_currency = 'USD'
       self.money_format = :dollars
       self.supported_cardtypes = %i[visa master american_express discover diners_club alia]

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

@@ -93,8 +93,7 @@ module ActiveMerchant #:nodoc:
         post_to_json_encrypt = encrypt(post_to_json, @options[:key_session])
 
         final_post = '<authorization>' + post_to_json_encrypt + '</authorization><dataID>' + @options[:user] + '</dataID>'
-        json_post = {}
-        json_post[:payload] = final_post
+        json_post = final_post
         commit('sale', json_post)
       end
 
@@ -114,8 +113,7 @@ module ActiveMerchant #:nodoc:
         post_to_json_encrypt = encrypt(post_to_json, @options[:key_session])
 
         final_post = '<capture>' + post_to_json_encrypt + '</capture><dataID>' + @options[:user] + '</dataID>'
-        json_post = {}
-        json_post[:payload] = final_post
+        json_post = final_post
         commit('capture', json_post)
       end
 
@@ -136,8 +134,7 @@ module ActiveMerchant #:nodoc:
         post_to_json_encrypt = encrypt(post_to_json, @options[:key_session])
 
         final_post = '<refund>' + post_to_json_encrypt + '</refund><dataID>' + @options[:user] + '</dataID>'
-        json_post = {}
-        json_post[:payload] = final_post
+        json_post = final_post
         commit('refund', json_post)
       end
 
@@ -145,10 +142,18 @@ module ActiveMerchant #:nodoc:
         true
       end
 
+      def extract_mit_responses_from_transcript(transcript)
+        groups = transcript.scan(/reading \d+ bytes(.*?)read \d+ bytes/m)
+        groups.map do |group|
+          group.first.scan(/-> "(.*?)"/).flatten.map(&:strip).join('')
+        end
+      end
+
       def scrub(transcript)
         ret_transcript = transcript
         auth_origin = ret_transcript[/<authorization>(.*?)<\/authorization>/, 1]
         unless auth_origin.nil?
+          auth_origin = auth_origin.gsub('\n', '')
           auth_decrypted = decrypt(auth_origin, @options[:key_session])
           auth_json = JSON.parse(auth_decrypted)
           auth_json['card'] = '[FILTERED]'
@@ -162,6 +167,7 @@ module ActiveMerchant #:nodoc:
 
         cap_origin = ret_transcript[/<capture>(.*?)<\/capture>/, 1]
         unless cap_origin.nil?
+          cap_origin = cap_origin.gsub('\n', '')
           cap_decrypted = decrypt(cap_origin, @options[:key_session])
           cap_json = JSON.parse(cap_decrypted)
           cap_json['apikey'] = '[FILTERED]'
@@ -173,6 +179,7 @@ module ActiveMerchant #:nodoc:
 
         ref_origin = ret_transcript[/<refund>(.*?)<\/refund>/, 1]
         unless ref_origin.nil?
+          ref_origin = ref_origin.gsub('\n', '')
           ref_decrypted = decrypt(ref_origin, @options[:key_session])
           ref_json = JSON.parse(ref_decrypted)
           ref_json['apikey'] = '[FILTERED]'
@@ -182,15 +189,10 @@ module ActiveMerchant #:nodoc:
           ret_transcript = ret_transcript.gsub(/<refund>(.*?)<\/refund>/, ref_tagged)
         end
 
-        res_origin = ret_transcript[/#{Regexp.escape('reading ')}(.*?)#{Regexp.escape('read')}/m, 1]
-        loop do
-          break if res_origin.nil?
-
-          resp_origin = res_origin[/#{Regexp.escape('"')}(.*?)#{Regexp.escape('"')}/m, 1]
-          resp_decrypted = decrypt(resp_origin, @options[:key_session])
-          ret_transcript[/#{Regexp.escape('reading ')}(.*?)#{Regexp.escape('read')}/m, 1] = resp_decrypted
-          ret_transcript = ret_transcript.sub('reading ', 'response: ')
-          res_origin = ret_transcript[/#{Regexp.escape('reading ')}(.*?)#{Regexp.escape('read')}/m, 1]
+        groups = extract_mit_responses_from_transcript(transcript)
+        groups.each do |group|
+          group_decrypted = decrypt(group, @options[:key_session])
+          ret_transcript = ret_transcript.gsub('Conn close', "\n" + group_decrypted + "\nConn close")
         end
 
         ret_transcript
@@ -219,9 +221,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, parameters)
-        json_str = JSON.generate(parameters)
-        cleaned_str = json_str.gsub('\n', '')
-        raw_response = ssl_post(live_url, cleaned_str, { 'Content-type' => 'application/json' })
+        raw_response = ssl_post(live_url, parameters, { 'Content-type' => 'text/plain' })
         response = JSON.parse(decrypt(raw_response, @options[:key_session]))
 
         Response.new(

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

@@ -149,6 +149,7 @@ module ActiveMerchant #:nodoc:
 
       def add_invoice(post, money, options)
         post[:amount] = amount(money)
+        post[:surcharge] = options[:surcharge] if options[:surcharge]
         post[:orderid] = options[:order_id]
         post[:orderdescription] = options[:description]
         post[:currency] = options[:currency] || currency(money)
@@ -232,6 +233,9 @@ module ActiveMerchant #:nodoc:
         end
 
         if (shipping_address = options[:shipping_address])
+          first_name, last_name = split_names(shipping_address[:name])
+          post[:shipping_firstname] = first_name if first_name
+          post[:shipping_lastname] = last_name if last_name
           post[:shipping_company] = shipping_address[:company]
           post[:shipping_address1] = shipping_address[:address1]
           post[:shipping_address2] = shipping_address[:address2]
@@ -240,6 +244,7 @@ module ActiveMerchant #:nodoc:
           post[:shipping_country] = shipping_address[:country]
           post[:shipping_zip] = shipping_address[:zip]
           post[:shipping_phone] = shipping_address[:phone]
+          post[:shipping_email] = options[:shipping_email] if options[:shipping_email]
         end
 
         if (descriptor = options[:descriptors])

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

@@ -108,6 +108,7 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'n2:PaymentAction', action
               xml.tag! 'n2:Token', options[:token]
               xml.tag! 'n2:PayerID', options[:payer_id]
+              xml.tag! 'n2:MsgSubID', options[:idempotency_key] if options[:idempotency_key]
               add_payment_details(xml, money, currency_code, options)
             end
           end
@@ -251,6 +252,7 @@ module ActiveMerchant #:nodoc:
               add_payment_details(xml, money, currency_code, options)
               xml.tag! 'n2:IPAddress', options[:ip]
               xml.tag! 'n2:MerchantSessionId', options[:merchant_session_id] if options[:merchant_session_id].present?
+              xml.tag! 'n2:MsgSubID', options[:idempotency_key] if options[:idempotency_key]
             end
           end
         end

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

@@ -455,7 +455,7 @@ module ActiveMerchant #:nodoc:
         when 'verify_credentials'
           response['error'] || 'FAILED'
         else
-          response['transactionResponse']['errorCode'] || response['transactionResponse']['responseCode'] if response['transactionResponse']
+          response['transactionResponse']['paymentNetworkResponseCode'] || response['transactionResponse']['errorCode'] if response['transactionResponse']
         end
       end
 

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

@@ -2,7 +2,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PaywayDotComGateway < Gateway
       self.test_url = 'https://paywaywsdev.com/PaywayWS/Payment/CreditCard'
-      self.live_url = 'https://paywayws.com/PaywayWS/Payment/CreditCard'
+      self.live_url = 'https://paywayws.net/PaywayWS/Payment/CreditCard'
 
       self.supported_countries = %w[US CA]
       self.default_currency = 'USD'

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

@@ -39,7 +39,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://sis.redsys.es/sis/operaciones'
       self.test_url = 'https://sis-t.redsys.es:25443/sis/operaciones'
 
-      self.supported_countries = ['ES']
+      self.supported_countries = %w[ES FR GB IT PL PT]
       self.default_currency    = 'EUR'
       self.money_format        = :cents
 
@@ -538,6 +538,7 @@ module ActiveMerchant #:nodoc:
             xml.DS_MERCHANT_COF_INI data[:DS_MERCHANT_COF_INI]
             xml.DS_MERCHANT_COF_TYPE data[:DS_MERCHANT_COF_TYPE]
             xml.DS_MERCHANT_COF_TXNID data[:DS_MERCHANT_COF_TXNID] if data[:DS_MERCHANT_COF_TXNID]
+            xml.DS_MERCHANT_DIRECTPAYMENT 'false' if options[:stored_credential][:initial_transaction]
           end
         end
       end

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

@@ -73,10 +73,10 @@ module ActiveMerchant #:nodoc:
         add_transaction_data('Credit', post, money, options.merge!({ currency: original_currency }))
         post[:sg_CreditType] = 2
         post[:sg_AuthCode] = auth
-        post[:sg_TransactionID] = transaction_id
         post[:sg_CCToken] = token
         post[:sg_ExpMonth] = exp_month
         post[:sg_ExpYear] = exp_year
+        post[:sg_TransactionID] = transaction_id unless options[:unreferenced_refund]
 
         commit(post)
       end
@@ -86,6 +86,7 @@ module ActiveMerchant #:nodoc:
 
         add_payment(post, payment, options)
         add_transaction_data('Credit', post, money, options)
+        add_customer_details(post, payment, options)
 
         post[:sg_CreditType] = 1
 

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

@@ -91,7 +91,7 @@ module ActiveMerchant #:nodoc:
         commit(action, post, options)
       end
 
-      def refund(money, authorization, options = {})
+      def refund(money, payment_method, options = {})
         post = {}
         action = 'refund'
 
@@ -99,12 +99,15 @@ module ActiveMerchant #:nodoc:
         add_invoice(post, money, options)
         add_clerk(post, options)
         add_transaction(post, options)
-        add_card(action, post, get_card_token(authorization), options)
+        card_token = payment_method.is_a?(CreditCard) ? get_card_token(payment_method) : payment_method
+        add_card(action, post, card_token, options)
         add_card_present(post, options)
 
         commit(action, post, options)
       end
 
+      alias credit refund
+
       def void(authorization, options = {})
         options[:invoice] = get_invoice(authorization)
         commit('invoice', {}, options)

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

@@ -652,18 +652,19 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def headers(options = {})
-        key = options[:key] || @api_key
-        idempotency_key = options[:idempotency_key]
+      def key(options = {})
+        options[:key] || @api_key
+      end
 
+      def headers(options = {})
         headers = {
-          'Authorization' => 'Basic ' + Base64.strict_encode64(key.to_s + ':').strip,
+          'Authorization' => 'Basic ' + Base64.strict_encode64(key(options).to_s + ':').strip,
           'User-Agent' => "Stripe/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
           'Stripe-Version' => api_version(options),
           'X-Stripe-Client-User-Agent' => stripe_client_user_agent(options),
           'X-Stripe-Client-User-Metadata' => { ip: options[:ip] }.to_json
         }
-        headers['Idempotency-Key'] = idempotency_key if idempotency_key
+        headers['Idempotency-Key'] = options[:idempotency_key] if options[:idempotency_key]
         headers['Stripe-Account'] = options[:stripe_account] if options[:stripe_account]
         headers
       end
@@ -694,6 +695,9 @@ module ActiveMerchant #:nodoc:
 
       def commit(method, url, parameters = nil, options = {})
         add_expand_parameters(parameters, options) if parameters
+
+        return Response.new(false, 'Invalid API Key provided') unless key_valid?(options)
+
         response = api_request(method, url, parameters, options)
         response['webhook_id'] = options[:webhook_id] if options[:webhook_id]
         success = success_from(response, options)
@@ -712,6 +716,18 @@ module ActiveMerchant #:nodoc:
           error_code: success ? nil : error_code_from(response))
       end
 
+      def key_valid?(options)
+        return true unless test?
+
+        %w(sk rk).each do |k|
+          if key(options).start_with?(k)
+            return false unless key(options).start_with?("#{k}_test")
+          end
+        end
+
+        true
+      end
+
       def authorization_from(success, url, method, response)
         return response.fetch('error', {})['charge'] unless success