activemerchant 1.129.0 → 1.130.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 415c09ab9b38e3503d10b38cd42959b50c131f8b47237f39b36a8da7bc044d82
-  data.tar.gz: 2b2cdd2955bd0ed6e2b808cad4fa31888749ee6cbe91b2a75c563f1cc09429d6
+  metadata.gz: 68d19e25c325eedb9f632b67713bd61ec67f09794560add0c22ba7b45c33cda6
+  data.tar.gz: 3c9405afcad2c9d066b76f1ad055d264e55569c14d9b9e322e2c6d3d83867b29
 SHA512:
-  metadata.gz: 104444c88b66340a16502ae980ae4c2795f25cd8f9d3a78a05d636d55730a462d9ead8a565291774096dd3fa75149961f64ec472d2a74c7499ce6b472ec6de95
-  data.tar.gz: bc738912b2788963721d232e43cf02675cc6a672c7aca913c6bd876fd73b72fd0cd0b7d43e734dca7f5494957e9092e8054d75b788b59ef3a2ca25a917d3d949
+  metadata.gz: e5c803983440bd24cbadd24fc5c689061ece449436010f3ad2f328dd3bdbaf2cc3c68c43dae86482f4fee84de454d2e626b89bacf54ad67468285410d8860610
+  data.tar.gz: 77458ab3d685b3ea7b7f3f1a26617d201eb071ef540414e6934677a1541166bbd68b132bc5f980dbf60656058d97877e70c907ab950b2314a2cfcf205e9e2de3

data/CHANGELOG

@@ -3,7 +3,29 @@
 
 == HEAD
 
-== Version 1.129.0 (April 24th, 2023)
+== Version 1.130.0 (June 13th, 2023)
+* Payu Latam - Update error code method to surface network code [yunnydang] #4773
+* CyberSource: Handling Canadian bank accounts [heavyblade] #4764
+* CyberSource Rest: Fixing currency detection [heavyblade] #4777
+* CyberSource: Allow business rules for requests with network tokens [aenand] #4764
+* Adyen: Update Mastercard error messaging [kylene-spreedly] #4770
+* Authorize.net: Update mapping for billing address phone number [jcreiff] #4778
+* Braintree: Update mapping for billing address phone number [jcreiff] #4779
+* CommerceHub: Enabling multi-use public key encryption [jherreraa] #4771
+* Ogone: Enable 3ds Global for Ogone Gateway [javierpedrozaing] #4776
+* Worldpay: Fix Google Pay [almalee24] #4774
+* Borgun change default TrCurrencyExponent and MerchantReturnUrl [naashton] #4788
+* Borgun: support for GBP currency [naashton] #4789
+* CyberSource: Enable auto void on r230 [aenand] #4794
+* Redsys: Set appropriate request fields for stored credentials with CITs and MITs [BritneyS] #4784
+* Stripe & Stripe PI: Validate API Key [almalee24] #4801
+* Add BIN for Maestro [jcreiff] #4799
+* D_Local: Add save field on card object [yunnydang] #4805
+* PayPal Express: Adds support for MsgSubID property on DoReferenceTransaction and DoExpressCheckoutPayment [wikiti] #4798
+* Checkout_v2: use credit_card?, not case equality with CreditCard [bbraschi] #4803
+* Shift4: Enable general credit feature [jherreraa] #4790
+
+== Version 1.129.0 (May 3rd, 2023)
 * Adyen: Update selectedBrand mapping for Google Pay [jcreiff] #4763
 * Shift4: Add vendorReference field [jcreiff] #4762
 * Shift4: Add OAuth error [aenand] #4760

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -109,7 +109,7 @@ module ActiveMerchant #:nodoc:
       MAESTRO_BINS = Set.new(
         %w[ 500057
             501018 501043 501045 501047 501049 501051 501072 501075 501083 501087 501089 501095
-            501500
+            501500 501623
             501879 502113 502120 502121 502301
             503175 503337 503645 503670
             504310 504338 504363 504533 504587 504620 504639 504656 504738 504781 504910

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

@@ -703,8 +703,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorize_message_from(response)
-        if response['refusalReason'] && response['additionalData'] && response['additionalData']['refusalReasonRaw']
-          "#{response['refusalReason']} | #{response['additionalData']['refusalReasonRaw']}"
+        if response['refusalReason'] && response['additionalData'] && (response['additionalData']['merchantAdviceCode'] || response['additionalData']['refusalReasonRaw'])
+          "#{response['refusalReason']} | #{response['additionalData']['merchantAdviceCode'] || response['additionalData']['refusalReasonRaw']}"
         else
           response['refusalReason'] || response['resultCode'] || response['message'] || response['result']
         end

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

@@ -604,6 +604,7 @@ module ActiveMerchant
           first_name, last_name = names_from(payment_source, address, options)
           state = state_from(address, options)
           full_address = "#{address[:address1]} #{address[:address2]}".strip
+          phone = address[:phone] || address[:phone_number] || ''
 
           xml.firstName(truncate(first_name, 50)) unless empty?(first_name)
           xml.lastName(truncate(last_name, 50)) unless empty?(last_name)
@@ -613,7 +614,7 @@ module ActiveMerchant
           xml.state(truncate(state, 40))
           xml.zip(truncate((address[:zip] || options[:zip]), 20))
           xml.country(truncate(address[:country], 60))
-          xml.phoneNumber(truncate(address[:phone], 25)) unless empty?(address[:phone])
+          xml.phoneNumber(truncate(phone, 25)) unless empty?(phone)
           xml.faxNumber(truncate(address[:fax], 25)) unless empty?(address[:fax])
         end
       end

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

@@ -96,6 +96,7 @@ module ActiveMerchant #:nodoc:
       CURRENCY_CODES['ISK'] = '352'
       CURRENCY_CODES['EUR'] = '978'
       CURRENCY_CODES['USD'] = '840'
+      CURRENCY_CODES['GBP'] = '826'
 
       def add_3ds_fields(post, options)
         post[:ThreeDSMessageId] = options[:three_ds_message_id] if options[:three_ds_message_id]
@@ -105,17 +106,17 @@ module ActiveMerchant #:nodoc:
 
       def add_3ds_preauth_fields(post, options)
         post[:SaleDescription] = options[:sale_description] || ''
-        post[:MerchantReturnURL] = options[:merchant_return_url] if options[:merchant_return_url]
+        post[:MerchantReturnURL] = options[:redirect_url] if options[:redirect_url]
       end
 
       def add_invoice(post, money, options)
         post[:TrAmount] = amount(money)
         post[:TrCurrency] = CURRENCY_CODES[options[:currency] || currency(money)]
         # The ISK currency must have a currency exponent of 2 on the 3DS request but not on the auth request
-        if post[:TrCurrency] == '352' && options[:apply_3d_secure] == '1'
-          post[:TrCurrencyExponent] = 2
-        else
+        if post[:TrCurrency] == '352' && options[:apply_3d_secure] != '1'
           post[:TrCurrencyExponent] = 0
+        else
+          post[:TrCurrencyExponent] = 2
         end
         post[:TerminalID] = options[:terminal_id] || '1'
       end

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

@@ -197,8 +197,7 @@ module ActiveMerchant #:nodoc:
             first_name: creditcard.first_name,
             last_name: creditcard.last_name,
             email: scrub_email(options[:email]),
-            phone: options[:phone] || (options[:billing_address][:phone] if options[:billing_address] &&
-              options[:billing_address][:phone]),
+            phone: phone_from(options),
             credit_card: credit_card_params)
           Response.new(result.success?, message_from_result(result),
             braintree_customer: (customer_hash(@braintree_gateway.customer.find(vault_id), :include_credit_cards) if result.success?),
@@ -267,8 +266,7 @@ module ActiveMerchant #:nodoc:
             first_name: creditcard.first_name,
             last_name: creditcard.last_name,
             email: scrub_email(options[:email]),
-            phone: options[:phone] || (options[:billing_address][:phone] if options[:billing_address] &&
-              options[:billing_address][:phone]),
+            phone: phone_from(options),
             id: options[:customer],
             device_data: options[:device_data]
           }.merge credit_card_params
@@ -348,6 +346,10 @@ module ActiveMerchant #:nodoc:
         parameters
       end
 
+      def phone_from(options)
+        options[:phone] || options.dig(:billing_address, :phone) || options.dig(:billing_address, :phone_number)
+      end
+
       def map_address(address)
         mapped = {
           street_address: address[:address1],
@@ -628,8 +630,7 @@ module ActiveMerchant #:nodoc:
           customer: {
             id: options[:store] == true ? '' : options[:store],
             email: scrub_email(options[:email]),
-            phone: options[:phone] || (options[:billing_address][:phone] if options[:billing_address] &&
-              options[:billing_address][:phone])
+            phone: phone_from(options)
           },
           options: {
             store_in_vault: options[:store] ? true : false,
@@ -932,7 +933,7 @@ module ActiveMerchant #:nodoc:
           first_name: payment_method.first_name,
           last_name: payment_method.last_name,
           email: scrub_email(options[:email]),
-          phone: options[:phone] || options.dig(:billing_address, :phone),
+          phone: phone_from(options),
           device_data: options[:device_data]
         }.compact
 

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

@@ -185,7 +185,7 @@ module ActiveMerchant #:nodoc:
           post[key][:token_type] = token_type
           post[key][:cryptogram] = cryptogram if cryptogram
           post[key][:eci] = eci if eci
-        when CreditCard
+        when ->(pm) { pm.try(:credit_card?) }
           post[key][:type] = 'card'
           post[key][:name] = payment_method.name
           post[key][:number] = payment_method.number

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

@@ -114,7 +114,7 @@ module ActiveMerchant #:nodoc:
         post[:transactionInteraction][:origin] = options[:origin] || 'ECOM'
         post[:transactionInteraction][:eciIndicator] = options[:eci_indicator] || 'CHANNEL_ENCRYPTED'
         post[:transactionInteraction][:posConditionCode] = options[:pos_condition_code] || 'CARD_NOT_PRESENT_ECOM'
-        post[:transactionInteraction][:posEntryMode] = options[:pos_entry_mode] || 'MANUAL'
+        post[:transactionInteraction][:posEntryMode] = (options[:pos_entry_mode] || 'MANUAL') unless options[:encryption_data].present?
         post[:transactionInteraction][:additionalPosInformation] = {}
         post[:transactionInteraction][:additionalPosInformation][:dataEntrySource] = options[:data_entry_source] || 'UNSPECIFIED'
       end
@@ -256,7 +256,12 @@ module ActiveMerchant #:nodoc:
         when NetworkTokenizationCreditCard
           add_decrypted_wallet(source, payment, options)
         when CreditCard
-          add_credit_card(source, payment, options)
+          if options[:encryption_data].present?
+            source[:sourceType] = 'PaymentCard'
+            source[:encryptionData] = options[:encryption_data]
+          else
+            add_credit_card(source, payment, options)
+          end
         when String
           add_payment_token(source, payment, options)
         end

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

@@ -519,11 +519,9 @@ module ActiveMerchant #:nodoc:
       def add_business_rules_data(xml, payment_method, options)
         prioritized_options = [options, @options]
 
-        unless network_tokenization?(payment_method)
-          xml.tag! 'businessRules' do
-            xml.tag!('ignoreAVSResult', 'true') if extract_option(prioritized_options, :ignore_avs).to_s == 'true'
-            xml.tag!('ignoreCVResult', 'true') if extract_option(prioritized_options, :ignore_cvv).to_s == 'true'
-          end
+        xml.tag! 'businessRules' do
+          xml.tag!('ignoreAVSResult', 'true') if extract_option(prioritized_options, :ignore_avs).to_s == 'true'
+          xml.tag!('ignoreCVResult', 'true') if extract_option(prioritized_options, :ignore_cvv).to_s == 'true'
         end
       end
 
@@ -705,8 +703,8 @@ module ActiveMerchant #:nodoc:
       def add_check(xml, check, options)
         xml.tag! 'check' do
           xml.tag! 'accountNumber', check.account_number
-          xml.tag! 'accountType', check.account_type[0]
-          xml.tag! 'bankTransitNumber', check.routing_number
+          xml.tag! 'accountType', check.account_type == 'checking' ? 'C' : 'S'
+          xml.tag! 'bankTransitNumber', format_routing_number(check.routing_number, options)
           xml.tag! 'secCode', options[:sec_code] if options[:sec_code]
         end
       end
@@ -1055,6 +1053,8 @@ module ActiveMerchant #:nodoc:
         message = message_from(response)
         authorization = success || in_fraud_review?(response) ? authorization_from(response, action, amount, options) : nil
 
+        message = auto_void?(authorization_from(response, action, amount, options), response, message, options)
+
         Response.new(success, message, response,
           test: test?,
           authorization: authorization,
@@ -1063,6 +1063,14 @@ module ActiveMerchant #:nodoc:
           cvv_result: response[:cvCode])
       end
 
+      def auto_void?(authorization, response, message, options = {})
+        return message unless response[:reasonCode] == '230' && options[:auto_void_230]
+
+        response = void(authorization, options)
+        response&.success? ? message += ' - transaction has been auto-voided.' : message += ' - transaction could not be auto-voided.'
+        message
+      end
+
       # Parse the SOAP response
       # Technique inspired by the Paypal Gateway
       def parse(xml)
@@ -1131,6 +1139,10 @@ module ActiveMerchant #:nodoc:
       def eligible_for_zero_auth?(payment_method, options = {})
         payment_method.is_a?(CreditCard) && options[:zero_amount_auth]
       end
+
+      def format_routing_number(routing_number, options)
+        options[:currency] == 'CAD' && routing_number.length > 8 ? routing_number[-8..-1] : routing_number
+      end
     end
   end
 end

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

@@ -112,7 +112,7 @@ module ActiveMerchant #:nodoc:
           add_code(post, options)
           add_payment(post, payment, options)
           add_mdd_fields(post, options)
-          add_amount(post, amount)
+          add_amount(post, amount, options)
           add_address(post, payment, options[:billing_address], options, :billTo)
           add_address(post, payment, options[:shipping_address], options, :shipTo)
           add_business_rules_data(post, payment, options)
@@ -125,7 +125,7 @@ module ActiveMerchant #:nodoc:
         { clientReferenceInformation: {}, orderInformation: {} }.tap do |post|
           add_code(post, options)
           add_mdd_fields(post, options)
-          add_amount(post, amount)
+          add_amount(post, amount, options)
           add_partner_solution_id(post)
         end.compact
       end
@@ -135,7 +135,7 @@ module ActiveMerchant #:nodoc:
           add_code(post, options)
           add_credit_card(post, payment)
           add_mdd_fields(post, options)
-          add_amount(post, amount)
+          add_amount(post, amount, options)
           add_address(post, payment, options[:billing_address], options, :billTo)
           add_merchant_description(post, options)
         end.compact
@@ -161,7 +161,7 @@ module ActiveMerchant #:nodoc:
         }
       end
 
-      def add_amount(post, amount)
+      def add_amount(post, amount, options)
         currency = options[:currency] || currency(amount)
         post[:orderInformation][:amountDetails] = {
           totalAmount: localized_amount(amount, currency),
@@ -413,10 +413,8 @@ module ActiveMerchant #:nodoc:
 
       def add_business_rules_data(post, payment, options)
         post[:processingInformation][:authorizationOptions] = {}
-        unless payment.is_a?(NetworkTokenizationCreditCard)
-          post[:processingInformation][:authorizationOptions][:ignoreAvsResult] = 'true' if options[:ignore_avs].to_s == 'true'
-          post[:processingInformation][:authorizationOptions][:ignoreCvResult] = 'true' if options[:ignore_cvv].to_s == 'true'
-        end
+        post[:processingInformation][:authorizationOptions][:ignoreAvsResult] = 'true' if options[:ignore_avs].to_s == 'true'
+        post[:processingInformation][:authorizationOptions][:ignoreCvResult] = 'true' if options[:ignore_cvv].to_s == 'true'
       end
 
       def add_mdd_fields(post, options)

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

@@ -188,6 +188,7 @@ module ActiveMerchant #:nodoc:
         post[:card][:installments] = options[:installments] if options[:installments]
         post[:card][:installments_id] = options[:installments_id] if options[:installments_id]
         post[:card][:force_type] = options[:force_type].to_s.upcase if options[:force_type]
+        post[:card][:save] = options[:save] if options[:save]
       end
 
       def parse(body)

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/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/redsys.rb

@@ -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/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') if test? && !key(options).start_with?('sk_test')
+
         response = api_request(method, url, parameters, options)
         response['webhook_id'] = options[:webhook_id] if options[:webhook_id]
         success = success_from(response, options)

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

@@ -683,7 +683,8 @@ module ActiveMerchant #:nodoc:
             'year' => format(payment_method.year, :four_digits_year)
           )
         end
-        xml.cardHolderName card_holder_name(payment_method, options)
+        name = card_holder_name(payment_method, options)
+        xml.cardHolderName name if name.present?
         xml.cvc payment_method.verification_value
 
         add_address(xml, (options[:billing_address] || options[:address]), options)
@@ -995,10 +996,10 @@ module ActiveMerchant #:nodoc:
         case payment_method
         when String
           token_type_and_details(payment_method)
-        when NetworkTokenizationCreditCard
-          { payment_type: :network_token }
         else
-          { payment_type: :credit }
+          type = payment_method.respond_to?(:source) ? :network_token : :credit
+
+          { payment_type: type }
         end
       end
 

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = '1.129.0'
+  VERSION = '1.130.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.129.0
+  version: 1.130.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -480,7 +480,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: Framework and tools for dealing with credit card transactions.