activemerchant 1.52.0 → 1.53.0

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

@@ -65,6 +65,16 @@ module ActiveMerchant #:nodoc:
         commit('void', post)
       end
 
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.gsub(%r((<PAN>)[^&]*(</PAN>))i, '\1[FILTERED]\2').
+          gsub(%r((<CVC2>)[^&]*(</CVC2>))i, '\1[FILTERED]\2').
+          gsub(%r(((?:\r\n)?Authorization: Basic )[^\r\n]+(\r\n)?), '\1[FILTERED]\2')
+      end
+
       private
 
       CURRENCY_CODES = Hash.new{|h,k| raise ArgumentError.new("Unsupported currency for HDFC: #{k}")}

data/lib/active_merchant/billing/gateways/braintree/braintree_common.rb

@@ -1,9 +1,21 @@
 module BraintreeCommon
   def self.included(base)
-    base.supported_countries = %w(US CA AU AD AT BE BG CY CZ DK EE FI FR GI DE GR HU IS IM IE IT LV LI LT LU MT MC NL NO PL PT RO SM SK SI ES SE CH TR GB)
+    base.supported_countries = %w(US CA AD AT BE BG HR CY CZ DK EE FI FR GI DE GR GG HU IS IM IE IT JE LV LI LT LU MT MC NL NO PL PT RO SM SK SI ES SE CH TR GB SG HK MY AU NZ)
     base.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club]
     base.homepage_url = 'http://www.braintreepaymentsolutions.com'
     base.display_name = 'Braintree'
     base.default_currency = 'USD'
   end
+
+  def supports_scrubbing
+    true
+  end
+
+  def scrub(transcript)
+    return "Not currently supported." if transcript.blank?
+    transcript.
+      gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+      gsub(%r((&?ccnumber=)\d*(&?)), '\1[FILTERED]\2').
+      gsub(%r((&?cvv=)\d*(&?)), '\1[FILTERED]\2')
+  end
 end

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

@@ -46,7 +46,7 @@ module ActiveMerchant #:nodoc:
 
         super
 
-        if wiredump_device
+        if wiredump_device.present?
           logger = ((Logger === wiredump_device) ? wiredump_device : Logger.new(wiredump_device))
           logger.level = Logger::DEBUG
         else
@@ -60,7 +60,7 @@ module ActiveMerchant #:nodoc:
           :private_key       => options[:private_key],
           :environment       => (options[:environment] || (test? ? :sandbox : :production)).to_sym,
           :custom_user_agent => "ActiveMerchant #{ActiveMerchant::VERSION}",
-          :logger            => logger,
+          :logger            => options[:logger] || logger,
         )
 
         @braintree_gateway = Braintree::Gateway.new( @configuration )

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

@@ -17,4 +17,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

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

@@ -1,6 +1,9 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class CardStreamGateway < Gateway
+
+      THREEDSECURE_REQUIRED_DEPRECATION_MESSAGE = "Specifying the :threeDSRequired initialization option is deprecated. Please use the `:threeds_required => true` *transaction* option instead."
+
       self.test_url = self.live_url = 'https://gateway.cardstream.com/direct/'
       self.money_format = :cents
       self.default_currency = 'GBP'
@@ -61,10 +64,10 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login, :shared_secret)
+        @threeds_required = false
         if (options[:threeDSRequired])
-          @threeDSRequired = options[:threeDSRequired]
-        else
-          @threeDSRequired = 'N'
+          ActiveMerchant.deprecated(THREEDSECURE_REQUIRED_DEPRECATION_MESSAGE)
+          @threeds_required = options[:threeDSRequired]
         end
         super
       end
@@ -74,7 +77,6 @@ module ActiveMerchant #:nodoc:
         add_amount(post, money, options)
         add_invoice(post, creditcard, money, options)
         add_creditcard(post, creditcard)
-        add_address(post, creditcard, options)
         add_customer_data(post, options)
         commit('PREAUTH', post)
       end
@@ -84,7 +86,6 @@ module ActiveMerchant #:nodoc:
         add_amount(post, money, options)
         add_invoice(post, creditcard, money, options)
         add_creditcard(post, creditcard)
-        add_address(post, creditcard, options)
         add_customer_data(post, options)
         commit('SALE', post)
       end
@@ -135,19 +136,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer_data(post, options)
-        address = options[:billing_address] || options[:address]
-        add_pair(post, :customerPostCode, address[:zip])
         add_pair(post, :customerEmail, options[:email])
-        add_pair(post, :customerPhone, options[:phone])
-      end
-
-      def add_address(post, creditcard, options)
-        address = options[:billing_address] || options[:address]
-
-        return if address.nil?
-
-        add_pair(post, :customerAddress, address[:address1] + " " + (address[:address2].nil? ? "" : address[:address2]))
-        add_pair(post, :customerPostCode, address[:zip])
+        if (address = options[:billing_address] || options[:address])
+          add_pair(post, :customerAddress, "#{address[:address1]} #{address[:address2]}".strip)
+          add_pair(post, :customerPostCode, address[:zip])
+          add_pair(post, :customerPhone, options[:phone])
+        end
       end
 
       def add_invoice(post, credit_card, money, options)
@@ -158,6 +152,9 @@ module ActiveMerchant #:nodoc:
           add_pair(post, :item1Description, (options[:description] || options[:order_id]).slice(0, 15))
           add_pair(post, :item1GrossValue, amount(money))
         end
+
+        add_pair(post, :threeDSRequired, (options[:threeds_required] || @threeds_required) ? 'Y' : 'N')
+        add_pair(post, :type, options[:type] || '1')
       end
 
       def add_creditcard(post, credit_card)
@@ -200,9 +197,7 @@ module ActiveMerchant #:nodoc:
         parameters.update(
           :merchantID => @options[:login],
           :action => action,
-          :type => '1', #Ecommerce
           :countryCode => self.supported_countries[0],
-          :threeDSRequired => @threeDSRequired #Disable 3d secure by default
         )
         # adds a signature to the post hash/array
         add_hmac(parameters)

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

@@ -94,6 +94,17 @@ module ActiveMerchant #:nodoc:
         commit(CECA_ACTION_REFUND, post)
       end
 
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r((&?pan=)[^&]*)i, '\1[FILTERED]').
+          gsub(%r((&?cvv2=)[^&]*)i, '\1[FILTERED]')
+      end
+
       private
 
       def add_creditcard(post, creditcard)
@@ -226,4 +237,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

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

@@ -148,7 +148,8 @@ module ActiveMerchant #:nodoc:
 
         data = build_request(post)
         begin
-          raw = parse(ssl_post(self.live_url, data, headers))
+          xml = ssl_post(self.live_url, data, headers)
+          raw = parse(xml)
         rescue ActiveMerchant::ResponseError => e
           if(e.response.code == "500" && e.response.body.start_with?("<s:Envelope"))
             raw = {
@@ -166,7 +167,9 @@ module ActiveMerchant #:nodoc:
           raw,
           authorization: authorization_from(post, raw),
           error_code: error_code_from(succeeded, raw),
-          test: test?
+          test: test?,
+          cvv_result: cvv_result_from_xml(xml),
+          avs_result: avs_result_from_xml(xml)
         )
       end
 
@@ -257,6 +260,63 @@ module ActiveMerchant #:nodoc:
       def error_code_from(succeeded, response)
         succeeded ? nil : STANDARD_ERROR_CODE_MAPPING[response[:result]]
       end
+
+      def cvv_result_from_xml(xml)
+        ActiveMerchant::Billing::CVVResult.new(cvv_result_code(xml))
+      end
+
+      def avs_result_from_xml(xml)
+        ActiveMerchant::Billing::AVSResult.new(code: avs_result_code(xml))
+      end
+
+      def cvv_result_code(xml)
+        cvv = validation_result_element(xml, "CVV")
+        return nil unless cvv
+        validation_result_matches?(*validation_result_element_text(cvv.parent)) ? 'M' : 'N'
+      end
+
+      def avs_result_code(xml)
+        billing_address_elem = validation_result_element(xml, "Billing Address")
+        zip_code_elem = validation_result_element(xml, "Zip Code")
+
+        return nil unless billing_address_elem && zip_code_elem
+
+        billing_matches = avs_result_matches(billing_address_elem)
+        zip_matches = avs_result_matches(zip_code_elem)
+
+        if billing_matches && zip_matches
+          'D'
+        elsif !billing_matches && zip_matches
+          'P'
+        elsif billing_matches && !zip_matches
+          'B'
+        else
+          'C'
+        end
+      end
+
+      def avs_result_matches(elem)
+        validation_result_matches?(*validation_result_element_text(elem.parent))
+      end
+
+      def validation_result_element(xml, name)
+        doc = Nokogiri::XML(xml)
+        doc.remove_namespaces!
+        doc.at_xpath("//ParameterValidationResultList//ParameterValidationResult//Name[text() = '#{name}']")
+      end
+
+      def validation_result_element_text(element)
+        result_text = element.elements.detect { |elem|
+          elem.name == "Result"
+        }.children.detect { |elem| elem.text }.text
+
+        result_text.split(";").collect(&:strip)
+      end
+
+      def validation_result_matches?(present, match)
+        present.downcase.start_with?('present') &&
+          match.downcase.start_with?('match')
+      end
     end
   end
 end

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'USD'
       self.money_format = :decimals
 
-      self.supported_countries = ['AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GR', 'HR', 'HU', 'IE', 'IS', 'IT', 'LI', 'LT', 'LU', 'LV', 'MT', 'MU', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK', 'US']
+      self.supported_countries = ['AD', 'AT', 'BE', 'BG', 'CH', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FO', 'FI', 'FR', 'GB', 'GI', 'GL', 'GR', 'HR', 'HU', 'IE', 'IS', 'IL', 'IT', 'LI', 'LT', 'LU', 'LV', 'MC', 'MT', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SI', 'SM', 'SK', 'SJ', 'TR', 'VA']
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club]
 
       self.homepage_url = 'https://www.checkout.com/'

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

@@ -3,10 +3,10 @@ module ActiveMerchant #:nodoc:
     class CheckoutV2Gateway < Gateway
       self.display_name = "Checkout.com V2 Gateway"
       self.homepage_url = "https://www.checkout.com/"
-      self.test_url = "https://api2.checkout.com/v2"
-      self.live_url = "http://sandbox.checkout.com/api2/v2"
+      self.live_url = "https://api2.checkout.com/v2"
+      self.test_url = "http://sandbox.checkout.com/api2/v2"
 
-      self.supported_countries = ['AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GR', 'HR', 'HU', 'IE', 'IS', 'IT', 'LI', 'LT', 'LU', 'LV', 'MT', 'MU', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK', 'US']
+      self.supported_countries = ['AD', 'AT', 'BE', 'BG', 'CH', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FO', 'FI', 'FR', 'GB', 'GI', 'GL', 'GR', 'HR', 'HU', 'IE', 'IS', 'IL', 'IT', 'LI', 'LT', 'LU', 'LV', 'MC', 'MT', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SI', 'SM', 'SK', 'SJ', 'TR', 'VA']
       self.default_currency = "USD"
       self.money_format = :cents
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club]

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

@@ -55,6 +55,17 @@ module ActiveMerchant #:nodoc:
         commit(:post, "charges/#{identifier}/refund", post)
       end
 
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r((&?card%5Bnumber%5D=)[^&]*)i, '\1[FILTERED]').
+          gsub(%r((&?card%5Bcvc%5D=)[^&]*)i, '\1[FILTERED]')
+      end
+
       private
 
       def add_order(post, money, options)
@@ -207,4 +218,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

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

@@ -0,0 +1,208 @@
+require 'nokogiri'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class CreditcallGateway < Gateway
+      self.test_url = 'https://test.cardeasexml.com/generic.cex'
+      self.live_url = 'https://live.cardeasexml.com/'
+
+      self.supported_countries = ['US']
+      self.default_currency = 'USD'
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+
+      self.homepage_url = 'https://www.creditcall.com'
+      self.display_name = 'Creditcall'
+
+      def initialize(options={})
+        requires!(options, :terminal_id, :transaction_key)
+        super
+      end
+
+      def purchase(money, payment_method, options={})
+        multi_response = MultiResponse.run do |r|
+          r.process { authorize(money, payment_method, options) }
+          r.process { capture(money, r.authorization, options) }
+        end
+
+        Response.new(
+          multi_response.primary_response.success?,
+          multi_response.primary_response.message,
+          multi_response.primary_response.params,
+          authorization: multi_response.responses.first.authorization,
+          test: test?
+        )
+      end
+
+      def authorize(money, payment_method, options={})
+        request = build_xml_request do |xml|
+          add_transaction_details(xml, money, nil, "Auth", options)
+          add_terminal_details(xml, options)
+          add_card_details(xml, payment_method, options)
+        end
+
+        commit(request)
+      end
+
+      def capture(money, authorization, options={})
+        request = build_xml_request do |xml|
+          add_transaction_details(xml, money, authorization, "Conf", options)
+          add_terminal_details(xml, options)
+        end
+
+        commit(request)
+      end
+
+      def refund(money, authorization, options={})
+        request = build_xml_request do |xml|
+          add_transaction_details(xml, money, authorization, "Refund", options)
+          add_terminal_details(xml, options)
+        end
+
+        commit(request)
+      end
+
+      def void(authorization, options={})
+        request = build_xml_request do |xml|
+          add_transaction_details(xml, nil, authorization, "Void", options)
+          add_terminal_details(xml, options)
+        end
+
+        commit(request)
+      end
+
+      def verify(credit_card, options={})
+        MultiResponse.run(:use_first_response) do |r|
+          r.process { authorize(100, credit_card, options) }
+          r.process(:ignore_result) { void(r.authorization, options) }
+        end
+      end
+
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((<TransactionKey>).+?(</TransactionKey>))i, '\1[FILTERED]\2').
+          gsub(%r((<PAN>).+?(</PAN>))i, '\1[FILTERED]\2').
+          gsub(%r((<CSC>).+?(</CSC>))i, '\1[FILTERED]\2')
+      end
+
+      private
+
+      def build_xml_request
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.Request(type: "CardEaseXML", version: "1.0.0") do
+            yield(xml)
+          end
+        end
+        builder.to_xml
+      end
+
+      def add_transaction_details(xml, amount, authorization, type, options={})
+        xml.TransactionDetails do
+          xml.MessageType type
+          xml.Amount(unit: "Minor"){ xml.text(amount) } if amount
+          xml.CardEaseReference authorization if authorization
+          xml.VoidReason "01" if type == "Void"
+        end
+      end
+
+      def add_terminal_details(xml, options={})
+        xml.TerminalDetails do
+          xml.TerminalID @options[:terminal_id]
+          xml.TransactionKey @options[:transaction_key]
+          xml.Software(version: "SoftwareVersion"){ xml.text("SoftwareName") }
+        end
+      end
+
+      def add_card_details(xml, payment_method, options={})
+        xml.CardDetails do
+          xml.Manual(type: "cnp") do
+            xml.PAN payment_method.number
+            xml.ExpiryDate exp_date(payment_method)
+            xml.CSC payment_method.verification_value
+          end
+
+          if address = options[:billing_address]
+            xml.AdditionalVerification do
+              xml.Address address[:address1]
+              xml.Zip address[:zip]
+            end
+          end
+        end
+      end
+
+      def exp_date(payment_method)
+        "#{format(payment_method.year, :two_digits)}#{format(payment_method.month, :two_digits)}"
+      end
+
+      def parse(body)
+        response = {}
+        xml = Nokogiri::XML(body)
+
+        node = xml.xpath("//Response/TransactionDetails")
+        node.children.each do |childnode|
+          response[childnode.name] = childnode.text
+        end
+
+        node = xml.xpath("//Response/Result")
+        node.children.each do |childnode|
+          if childnode.elements.empty?
+            response[childnode.name] = childnode.text
+          else
+            childnode_to_response(response, childnode)
+          end
+        end
+
+        response
+      end
+
+      def childnode_to_response(response, childnode)
+        childnode.elements.each do |element|
+          if element.name == "Error"
+            response["ErrorCode"] = element.attr("code")
+            response["ErrorMessage"] = element.text
+          else
+            response[element.name] = element.text
+          end
+        end
+      end
+
+      def commit(parameters)
+        response = parse(ssl_post(url, parameters))
+
+        Response.new(
+          success_from(response),
+          message_from(response),
+          response,
+          authorization: authorization_from(response),
+          avs_result: AVSResult.new(code: response["some_avs_response_key"]),
+          cvv_result: CVVResult.new(response["some_cvv_response_key"]),
+          test: test?
+        )
+      end
+
+      def url
+        test? ? test_url : live_url
+      end
+
+      def success_from(response)
+        response["LocalResult"] == "0" || response["LocalResult"] == "00"
+      end
+
+      def message_from(response)
+        if success_from(response)
+          "Succeeded"
+        else
+          response["ErrorMessage"]
+        end
+      end
+
+      def authorization_from(response)
+        response["CardEaseReference"]
+      end
+
+    end
+  end
+end