activemerchant 1.106.0 → 1.107.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f734d2204b43b893e645e5c47b9afe26506c0c383b355af486ac93cd6a8677ed
-  data.tar.gz: 611450e08256619a1d8aea5bc5795c47ff9220f0abde707f0facc82dd76e1661
+  metadata.gz: 88249628bc56fb775fc6cc669fceea51b9040ced2f7c2dea503cd276a37202d1
+  data.tar.gz: f538ae45a677ec066b40dbb68742b1df9ccea5e7d45e0bd9e28d88968ae77334
 SHA512:
-  metadata.gz: 98fa68d855a398089f9a088d8fa12edae2b34e8ed9fecab64511dc7e64b1ead409977adc00c3bc6aaf18f3f552f2b1fa3a38b8ceb5779d4a32a91e171a5556c8
-  data.tar.gz: 78a05f047cb7de339104b39785394b75ca51be7d33368ba44549006e2429e3d2a2796a10d30a18a38fae4aff34e6f4a605f862ec3103ad101c9805c09af586f7
+  metadata.gz: 06c755605d7633a83cc1e2b9cfbf0cdf00d320e8bcd345cfdb6539ad814b9795ac4e33e075941f9b0761768ae9a6f3cb2bad90dd2ed35eca0fce7a8aa9642f55
+  data.tar.gz: e35ac5cfa97a22fdc416c0031e20f398b62189bb091e20b9c17fc815d2db2d481aa5463d047a5d718ec07574249c57acf1defec69c5ff7156f9be80220361b3d

data/CHANGELOG

@@ -2,6 +2,25 @@
 
 == HEAD
 
+== Version 1.107.1 (Apr 1, 2020)
+* Add `allowed_push_host` to gemspec [mdeloupy]
+
+== Version 1.107.0 (Apr 1, 2020)
+* Stripe Payment Intents: Early return failed `payment_methods` response [chinhle23] #3570
+* Borgun: Support `passengerItineraryData` [therufs] #3572
+* Ingenico GlobalCollect: support optional `requires_approval` field [fatcatt316] #3571
+* CenPOS: Update failing remote tests [britth] #3575
+* Realex: Update remote tests [britth] #3576
+* FirstData e4 v27: Properly tag stored credential initiation field in request [britth] #3578
+* Orbital: Fix stored credentials [chinhle23] #3579
+* Acapture(Opp): Update gateway credentials [molbrown] #3574
+* Ingenico GlobalCollect: support `requires_approval` field [fatcatt316] #3577
+* CyberSource: Fix `void` for `purchase` transactions [chinhle23] #3581
+* Checkout V2: Begin to add support for using network tokens for transactions. [arbianchi] #3580
+* Opp: Update remote test fixtures [ccarruitero] #3582
+* Optimal Payment: Add support for store [britth] #3585
+* SecurePay Australia : Update test URL (#3586)
+
 == Version 1.106.0 (Mar 10, 2020)
 * PayJunctionV2: Send billing address in `auth` and `purchase` transactions [naashton] #3538
 * Adyen: Fix some remote tests [curiousepic] #3541

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

@@ -34,7 +34,7 @@ module ActiveMerchant #:nodoc:
         post[:TransType] = '5'
         add_invoice(post, money, options)
         add_payment_method(post, payment)
-        commit('authonly', post)
+        commit('authonly', post, options)
       end
 
       def capture(money, authorization, options={})
@@ -125,12 +125,12 @@ module ActiveMerchant #:nodoc:
         response
       end
 
-      def commit(action, post)
+      def commit(action, post, options={})
         post[:Version] = '1000'
         post[:Processor] = @options[:processor]
         post[:MerchantID] = @options[:merchant_id]
 
-        request = build_request(action, post)
+        request = build_request(action, post, options)
         raw = ssl_post(url(action), request, headers)
         pairs = parse(raw)
         success = success_from(pairs)
@@ -180,7 +180,7 @@ module ActiveMerchant #:nodoc:
         }
       end
 
-      def build_request(action, post)
+      def build_request(action, post, options={})
         mode = action == 'void' ? 'cancel' : 'get'
         xml = Builder::XmlMarkup.new indent: 18
         xml.instruct!(:xml, version: '1.0', encoding: 'utf-8')
@@ -188,11 +188,22 @@ module ActiveMerchant #:nodoc:
           post.each do |field, value|
             xml.tag!(field, value)
           end
+          build_airline_xml(xml, options[:passenger_itinerary_data]) if options[:passenger_itinerary_data]
         end
         inner = CGI.escapeHTML(xml.target!)
         envelope(mode).sub(/{{ :body }}/, inner)
       end
 
+      def build_airline_xml(xml, airline_data)
+        xml.tag!('PassengerItineraryData') do
+          xml.tag!('A1') do
+            airline_data.each do |field, value|
+              xml.tag!(field, value)
+            end
+          end
+        end
+      end
+
       def envelope(mode)
         <<-EOS
           <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:aut="http://Borgun/Heimir/pub/ws/Authorization">

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

@@ -102,13 +102,21 @@ module ActiveMerchant #:nodoc:
 
       def add_payment_method(post, payment_method, options)
         post[:source] = {}
-        post[:source][:type] = 'card'
-        post[:source][:name] = payment_method.name
-        post[:source][:number] = payment_method.number
-        post[:source][:cvv] = payment_method.verification_value
+        if payment_method.is_a?(NetworkTokenizationCreditCard) && payment_method.source == :network_token
+          post[:source][:type] = 'network_token'
+          post[:source][:token] = payment_method.number
+          post[:source][:token_type] = payment_method.brand == 'visa' ? 'vts' : 'mdes'
+          post[:source][:cryptogram] = payment_method.payment_cryptogram
+          post[:source][:eci] = options[:eci] || '05'
+        else
+          post[:source][:type] = 'card'
+          post[:source][:name] = payment_method.name
+          post[:source][:number] = payment_method.number
+          post[:source][:cvv] = payment_method.verification_value
+          post[:source][:stored] = 'true' if options[:card_on_file] == true
+        end
         post[:source][:expiry_year] = format(payment_method.year, :four_digits)
         post[:source][:expiry_month] = format(payment_method.month, :two_digits)
-        post[:source][:stored] = 'true' if options[:card_on_file] == true
       end
 
       def add_customer_data(post, options)

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

@@ -325,7 +325,8 @@ module ActiveMerchant #:nodoc:
         options[:order_id] = order_id
 
         xml = Builder::XmlMarkup.new indent: 2
-        if action == 'capture'
+        case action
+        when 'capture', 'purchase'
           add_mdd_fields(xml, options)
           add_void_service(xml, request_id, request_token)
         else

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

@@ -319,7 +319,7 @@ module ActiveMerchant #:nodoc:
         xml.tag! 'StoredCredentials' do
           xml.tag! 'Indicator', stored_credential_indicator(xml, card, options)
           if initiator = options.dig(:stored_credential, :initiator)
-            xml.tag! initiator == 'merchant' ? 'M' : 'C'
+            xml.tag! 'Initiation', initiator == 'merchant' ? 'M' : 'C'
           end
           if reason_type = options.dig(:stored_credential, :reason_type)
             xml.tag! 'Schedule', reason_type == 'unscheduled' ? 'U' : 'S'

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

@@ -7,10 +7,10 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://eu.sandbox.api-ingenico.com'
       self.live_url = 'https://api.globalcollect.com'
 
-      self.supported_countries = ['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.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'
       self.money_format = :cents
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :naranja, :cabal]
+      self.supported_cardtypes = %i[visa master american_express discover naranja cabal]
 
       def initialize(options={})
         requires!(options, :merchant_id, :api_key_id, :secret_api_key)
@@ -20,7 +20,7 @@ module ActiveMerchant #:nodoc:
       def purchase(money, payment, options={})
         MultiResponse.run do |r|
           r.process { authorize(money, payment, options) }
-          r.process { capture(money, r.authorization, options) } unless capture_requested?(r)
+          r.process { capture(money, r.authorization, options) } if should_request_capture?(r, options[:requires_approval])
         end
       end
 
@@ -32,7 +32,6 @@ module ActiveMerchant #:nodoc:
         add_address(post, payment, options)
         add_creator_info(post, options)
         add_fraud_fields(post, options)
-
         commit(:authorize, post)
       end
 
@@ -161,6 +160,8 @@ module ActiveMerchant #:nodoc:
           'skipFraudService' => 'true',
           'authorizationMode' => pre_authorization
         }
+        post['cardPaymentMethodSpecificInput']['requiresApproval'] = options[:requires_approval] unless options[:requires_approval].nil?
+
         post['cardPaymentMethodSpecificInput']['card'] = {
           'cvv' => payment.verification_value,
           'cardNumber' => payment.number,
@@ -283,7 +284,7 @@ module ActiveMerchant #:nodoc:
 
       def headers(action, post, authorization = nil)
         {
-          'Content-Type'  => content_type,
+          'Content-Type' => content_type,
           'Authorization' => auth_digest(action, post, authorization),
           'Date' => date
         }
@@ -314,18 +315,16 @@ POST
       end
 
       def message_from(succeeded, response)
-        if succeeded
-          'Succeeded'
+        return 'Succeeded' if succeeded
+
+        if errors = response['errors']
+          errors.first.try(:[], 'message')
+        elsif response['error_message']
+          response['error_message']
+        elsif response['status']
+          'Status: ' + response['status']
         else
-          if errors = response['errors']
-            errors.first.try(:[], 'message')
-          elsif response['error_message']
-            response['error_message']
-          elsif response['status']
-            'Status: ' + response['status']
-          else
-            'No message available'
-          end
+          'No message available'
         end
       end
 
@@ -340,14 +339,14 @@ POST
       end
 
       def error_code_from(succeeded, response)
-        unless succeeded
-          if errors = response['errors']
-            errors.first.try(:[], 'code')
-          elsif status = response.try(:[], 'statusOutput').try(:[], 'statusCode')
-            status.to_s
-          else
-            'No error code available'
-          end
+        return if succeeded
+
+        if errors = response['errors']
+          errors.first.try(:[], 'code')
+        elsif status = response.try(:[], 'statusOutput').try(:[], 'statusCode')
+          status.to_s
+        else
+          'No error code available'
         end
       end
 
@@ -355,6 +354,13 @@ POST
         Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
       end
 
+      # Capture hasn't already been requested,
+      # and
+      # `requires_approval` is not false
+      def should_request_capture?(response, requires_approval)
+        !capture_requested?(response) && requires_approval != false
+      end
+
       def capture_requested?(response)
         response.params.try(:[], 'payment').try(:[], 'status') == 'CAPTURE_REQUESTED'
       end

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

@@ -13,8 +13,7 @@ module ActiveMerchant #:nodoc:
       # == Usage
       #
       #   gateway = ActiveMerchant::Billing::OppGateway.new(
-      #      user_id: 'merchant user id',
-      #      password: 'password',
+      #      access_token: 'access_token',
       #      entity_id: 'entity id',
       #   )
       #
@@ -119,7 +118,7 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'Open Payment Platform'
 
       def initialize(options={})
-        requires!(options, :user_id, :password, :entity_id)
+        requires!(options, :access_token, :entity_id)
         super
       end
 
@@ -167,7 +166,7 @@ module ActiveMerchant #:nodoc:
 
       def scrub(transcript)
         transcript.
-          gsub(%r((authentication\.password=)\w+), '\1[FILTERED]').
+          gsub(%r((Authorization: Bearer )\w+)i, '\1[FILTERED]').
           gsub(%r((card\.number=)\d+), '\1[FILTERED]').
           gsub(%r((card\.cvv=)\d+), '\1[FILTERED]')
       end
@@ -203,7 +202,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_authentication(post)
-        post[:authentication] = { entityId: @options[:entity_id], password: @options[:password], userId: @options[:user_id]}
+        post[:authentication] = { entityId: @options[:entity_id] }
       end
 
       def add_customer_data(post, payment, options)
@@ -316,7 +315,7 @@ module ActiveMerchant #:nodoc:
               ssl_post(
                 url,
                 post.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&'),
-                'Content-Type' => 'application/x-www-form-urlencoded;charset=UTF-8'
+                headers
               )
             )
           rescue ResponseError => e
@@ -335,6 +334,13 @@ module ActiveMerchant #:nodoc:
         )
       end
 
+      def headers
+        {
+          'Content-Type' => 'application/x-www-form-urlencoded;charset=UTF-8',
+          'Authorization' => "Bearer #{@options[:access_token]}"
+        }
+      end
+
       def parse(body)
         JSON.parse(body)
       rescue JSON::ParserError

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

@@ -65,6 +65,10 @@ module ActiveMerchant #:nodoc:
         commit('ccVerification', 0, options)
       end
 
+      def store(credit_card, options = {})
+        verify(credit_card, options)
+      end
+
       def supports_scrubbing?
         true
       end

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

@@ -569,7 +569,7 @@ module ActiveMerchant #:nodoc:
 
         initiator =
           case parameters[:stored_credential][:initiator]
-          when 'customer' then 'C'
+          when 'cardholder', 'customer' then 'C'
           when 'merchant' then 'M'
           end
         reason =

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
 
       class_attribute :test_periodic_url, :live_periodic_url
 
-      self.test_url = 'https://api.securepay.com.au/test/payment'
+      self.test_url = 'https://test.api.securepay.com.au/xmlapi/payment'
       self.live_url = 'https://api.securepay.com.au/xmlapi/payment'
 
       self.test_periodic_url = 'https://test.securepay.com.au/xmlapi/periodic'

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

@@ -20,7 +20,9 @@ module ActiveMerchant #:nodoc:
         add_capture_method(post, options)
         add_confirmation_method(post, options)
         add_customer(post, options)
-        add_payment_method_token(post, payment_method, options)
+        payment_method = add_payment_method_token(post, payment_method, options)
+        return payment_method if payment_method.is_a?(ActiveMerchant::Billing::Response)
+
         add_metadata(post, options)
         add_return_url(post, options)
         add_connected_account(post, options)
@@ -41,7 +43,9 @@ module ActiveMerchant #:nodoc:
 
       def confirm_intent(intent_id, payment_method, options = {})
         post = {}
-        add_payment_method_token(post, payment_method, options)
+        payment_method = add_payment_method_token(post, payment_method, options)
+        return payment_method if payment_method.is_a?(ActiveMerchant::Billing::Response)
+
         CONFIRM_INTENT_ATTRIBUTES.each do |attribute|
           add_whitelisted_attribute(post, options, attribute)
         end
@@ -65,7 +69,9 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
 
-        add_payment_method_token(post, payment_method, options)
+        payment_method = add_payment_method_token(post, payment_method, options)
+        return payment_method if payment_method.is_a?(ActiveMerchant::Billing::Response)
+
         add_payment_method_types(post, options)
         add_customer(post, options)
         add_metadata(post, options)
@@ -121,7 +127,9 @@ module ActiveMerchant #:nodoc:
         # If customer option is provided, create a payment method and attach to customer id
         # Otherwise, create a customer, then attach
         if payment_method.is_a?(StripePaymentToken) || payment_method.is_a?(ActiveMerchant::Billing::CreditCard)
-          add_payment_method_token(params, payment_method, options)
+          payment_method = add_payment_method_token(params, payment_method, options)
+          return payment_method if payment_method.is_a?(ActiveMerchant::Billing::Response)
+
           if options[:customer]
             customer_id = options[:customer]
           else
@@ -191,6 +199,8 @@ module ActiveMerchant #:nodoc:
 
         if payment_method.is_a?(ActiveMerchant::Billing::CreditCard)
           p = create_payment_method(payment_method, options)
+          return p unless p.success?
+
           payment_method = p.params['id']
         end
 

data/lib/active_merchant/billing/network_tokenization_credit_card.rb

@@ -17,7 +17,7 @@ module ActiveMerchant #:nodoc:
       attr_accessor :payment_cryptogram, :eci, :transaction_id
       attr_writer :source
 
-      SOURCES = %i(apple_pay android_pay google_pay)
+      SOURCES = %i(apple_pay android_pay google_pay network_token)
 
       def source
         if defined?(@source) && SOURCES.include?(@source)

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = '1.106.0'
+  VERSION = '1.107.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.106.0
+  version: 1.107.1
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -412,7 +412,8 @@ files:
 homepage: http://activemerchant.org/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths: