killbill-cybersource 4.0.6 → 4.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8478664d561af5bbb03aa2fe320f238995d914b4
-  data.tar.gz: 798bc353760c87feb1b0402acc058e1224fe5d2b
+  metadata.gz: 7471ac43901ed2efb3ebeaa6b6ed62a28a38286f
+  data.tar.gz: 4a697cfdb6b8fad42f07c13df1a8ae1d4ce1f808
 SHA512:
-  metadata.gz: 4297a35bd9a0c3d11904073530cb5ef32e453e960bf0a16ace61ecb688581091b2ba213aece6f33cdf871023c0d52ec36f739c00cb7d1212fcf6e516ca96f5be
-  data.tar.gz: 38b18109fb61c1955c07dc13e7cde92938d547d7f270f5309cf9943ccac505a23abe93b142e17694069c092d23b59006329de981e0c30d9f18455fbd686f54f7
+  metadata.gz: 05e6ea3dba262e59947a316d7b26e4fa31388762ae3f79e308c11798cdeff366f64439b05c7241288918d4e807d9719ff95619dae073d81c28784b4221dab5d0
+  data.tar.gz: 61e4584909179d697d4ba137f4928b3a5a1d1af3dc0eff91289832c8f058d3a2390f6b00d01236b64c883f450c86e7d9231d4b0b74f9d6ef88ec20d80f3908c3

data/.travis.yml

@@ -6,7 +6,7 @@ cache: bundler
 before_script:
   - bundle exec jbundle install
 
-script: 'bundle exec rake test:spec test:remote:spec'
+script: 'bundle exec rake test:ci:spec'
 
 notifications:
   email:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-cybersource (4.0.6)
+    killbill-cybersource (4.0.7)
       actionpack (~> 4.1.0)
       actionview (~> 4.1.0)
       activemerchant (~> 1.48.0)
@@ -80,7 +80,7 @@ GEM
     jdbc-sqlite3 (3.8.11.2)
     jruby-openssl (0.9.16-java)
     json (1.8.3-java)
-    killbill (7.0.3)
+    killbill (7.0.6)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)

data/NEWS

@@ -1,3 +1,10 @@
+4.0.7
+    Fix auth reversal in non-USD
+    Cancel old UNDEFINED transactions that cannot be found in CyberSource
+
+4.0.6
+    Fix NPE when message is null in the response
+
 4.0.5
     Fix ApplePay MasterCard implementation
 

data/Rakefile

@@ -20,6 +20,15 @@ namespace :test do
       task.pattern = './spec/*/remote/*_spec.rb'
     end
   end
+
+  namespace :ci do
+    desc 'Run RSpec CI tests'
+    RSpec::Core::RakeTask.new do |task|
+      task.name = 'spec'
+      task.pattern = './spec/**/*_spec.rb'
+      task.rspec_opts = '--tag ~ci_skip'
+    end
+  end
 end
 
 # Install tasks to package the plugin for Killbill

data/VERSION

@@ -1 +1 @@
-4.0.6
+4.0.7

data/lib/cybersource/api.rb

@@ -2,6 +2,7 @@ module Killbill #:nodoc:
   module Cybersource #:nodoc:
     class PaymentPlugin < ::Killbill::Plugin::ActiveMerchant::PaymentPlugin
 
+      SEVEN_DAYS_AGO = (7 * 86400)
       SIXTY_DAYS_AGO = (60 * 86400)
 
       def initialize
@@ -121,7 +122,10 @@ module Killbill #:nodoc:
           next unless transaction_info_plugin.status == :UNDEFINED
 
           cybersource_response_id = find_value_from_properties(transaction_info_plugin.properties, 'cybersourceResponseId')
-          next if cybersource_response_id.nil?
+          if cybersource_response_id.nil?
+            logger.warn("Unable to fix UNDEFINED kb_transaction_id='#{transaction_info_plugin.kb_transaction_payment_id}' (cybersource_response_id not specified)")
+            next
+          end
 
           report_date = transaction_info_plugin.created_date
           authorization = find_value_from_properties(transaction_info_plugin.properties, 'authorization')
@@ -142,23 +146,34 @@ module Killbill #:nodoc:
             report = get_report(order_id, report_date, options, context)
           end
 
-          # Report API not configured or skip_gw=true
+          # Report API not configured, connection problem or skip_gw=true
           next if report.nil?
 
-          # Report not found
-          if report.empty?
-            logger.info("Unable to fix UNDEFINED transaction #{transaction_info_plugin.kb_transaction_payment_id} (not found in CyberSource)")
+          threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :cancel_threshold) || SEVEN_DAYS_AGO).to_i
+          should_cancel_payment = (now - report_date) >= threshold
+          if report.empty? && !should_cancel_payment
+            # We'll retry later
+            logger.info("Unable to fix UNDEFINED kb_transaction_id='#{transaction_info_plugin.kb_transaction_payment_id}' (not found in CyberSource)")
             next
-          end
-
-          # Update our rows
-          response = CybersourceResponse.find_by(:id => cybersource_response_id)
-          next if response.nil?
+          else
+            # Update our rows
+            response = CybersourceResponse.find_by(:id => cybersource_response_id)
+            if response.nil?
+              logger.warn("Unable to fix UNDEFINED kb_transaction_id='#{transaction_info_plugin.kb_transaction_payment_id}' (CyberSource response='#{cybersource_response_id}' not found)")
+              next
+            end
 
-          logger.info("Fixing UNDEFINED transaction #{transaction_info_plugin.kb_transaction_payment_id}: success? = #{report.response.success?}")
+            if should_cancel_payment
+              # At this point, it's safe to assume the payment never happened
+              logger.info("Canceling UNDEFINED kb_transaction_id='#{transaction_info_plugin.kb_transaction_payment_id}'")
+              response.cancel
+            else
+              logger.info("Fixing UNDEFINED kb_transaction_id='#{transaction_info_plugin.kb_transaction_payment_id}', success='#{report.response.success?}'")
+              response.update_and_create_transaction(report.response)
+            end
 
-          response.update_and_create_transaction(report.response)
-          stale = true
+            stale = true
+          end
         end
 
         # If we updated the state, re-fetch the latest data
@@ -258,8 +273,6 @@ module Killbill #:nodoc:
 
         threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :auto_credit_threshold) || SIXTY_DAYS_AGO).to_i
 
-        # we might want a 'util' function to make the conversion joda DateTime to a ruby Time object
-        now = Time.parse(@clock.get_clock.get_utc_now.to_s)
         (now - transaction.created_at) >= threshold
       end
 
@@ -292,8 +305,20 @@ module Killbill #:nodoc:
         get_single_transaction_report(report_api, merchant_reference_code, date)
       end
 
-      def get_single_transaction_report(report_api, merchant_reference_code, date)
-        report_api.single_transaction_report(merchant_reference_code, date.strftime('%Y%m%d'))
+      def get_single_transaction_report(report_api, merchant_reference_code, date, fuzzy_date=true)
+        if fuzzy_date
+          report = get_single_transaction_report(report_api, merchant_reference_code, date, false)
+          report = get_single_transaction_report(report_api, merchant_reference_code, date - 1.day, false) if report.nil? || report.empty?
+          report = get_single_transaction_report(report_api, merchant_reference_code, date + 1.day, false) if report.nil? || report.empty?
+          return report
+        end
+
+        begin
+          report_api.single_transaction_report(merchant_reference_code, date.strftime('%Y%m%d'))
+        rescue => e
+          logger.warn "Error retrieving report for merchant_reference_code='#{merchant_reference_code}', target_date='#{date}': #{e.message}\n#{e.backtrace.join("\n")}"
+          nil
+        end
       end
 
       def add_required_options(kb_account_id, properties, options, context)
@@ -364,6 +389,11 @@ module Killbill #:nodoc:
 
         new_auth_response
       end
+
+      def now
+        # We might want a 'util' function to make the conversion Joda DateTime to a Ruby Time object
+        Time.parse(@clock.get_clock.get_utc_now.to_s)
+      end
     end
   end
 end

data/lib/cybersource/cyber_source_on_demand.rb

@@ -31,6 +31,8 @@ module Killbill #:nodoc:
 
         data = URI.encode_www_form(params)
 
+        @logger.info "Retrieving report for merchant_reference_code='#{merchant_reference_code}', target_date='#{target_date}', merchant_id='#{@config[:merchantID]}'"
+
         # Will raise ResponseError if the response code is > 300
         CyberSourceOnDemandTransactionReport.new(ssl_post(endpoint, data, headers), @logger)
       end

data/lib/cybersource/models/response.rb

@@ -42,6 +42,27 @@ module Killbill #:nodoc:
         }
       end
 
+      def cancel
+        begin
+          error_details = JSON.parse(message)
+          original_message = nil
+        rescue
+          error_details = {}
+          original_message = message
+        end
+        error_details['original_message'] = original_message unless original_message.blank?
+        error_details['payment_plugin_status'] = 'CANCELED'
+
+        updated_attributes = {
+            :message => error_details.to_json,
+            :success => false,
+            :updated_at => Time.now.utc
+        }
+
+        # Update the response row
+        update!(updated_attributes)
+      end
+
       def update_and_create_transaction(gw_response)
         updated_attributes = {
             :message => gw_response.message,
@@ -108,7 +129,7 @@ module Killbill #:nodoc:
 
       def set_correct_status(t_info_plugin)
         # Respect the existing status if the payment was successful, if overridden or if there is no error code
-        return if success || (message && message.strip.start_with?('{'))   || gateway_error_code.blank?
+        return if success || (message && message.strip.start_with?('{')) || gateway_error_code.blank?
 
         if CANCELED_ERROR_CODES.include?(gateway_error_code.to_i)
           t_info_plugin.status = :CANCELED

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>cybersource-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>4.0.6</version>
+    <version>4.0.7</version>
     <name>cybersource-plugin</name>
     <url>http://github.com/killbill/killbill-cybersource-plugin</url>
     <description>Plugin for accessing Cybersource as a payment gateway</description>

data/spec/cybersource/base_plugin_spec.rb

@@ -61,7 +61,7 @@ describe Killbill::Cybersource::PaymentPlugin do
 
     with_transaction(kb_payment_id, :AUTHORIZE, 61.days.ago, context) do
       @plugin.should_credit?(kb_payment_id, context, {:disable_auto_credit => true}).should be_false
-      @plugin.should_credit?(kb_payment_id, context, {:auto_credit_threshold => 61 * 86400}).should be_false
+      @plugin.should_credit?(kb_payment_id, context, {:auto_credit_threshold => 61 * 86400 + 10}).should be_false
       @plugin.should_credit?(kb_payment_id, context).should be_true
     end
   end
@@ -168,6 +168,32 @@ describe Killbill::Cybersource::PaymentPlugin do
       payment_response.gateway_error.should == 'One or more fields contains invalid data'
       payment_response.gateway_error_code.should == '102'
     end
+
+    it 'cancels UNDEFINED transactions with a JSON message' do
+      response = Killbill::Cybersource::CybersourceResponse.create(:api_call => 'authorization',
+                                                                   :message => '{"exception_message":"Timeout","payment_plugin_status":"UNDEFINED"}',
+                                                                   :created_at => Time.now,
+                                                                   :updated_at => Time.now)
+      response.cancel
+      response.message.should == '{"exception_message":"Timeout","payment_plugin_status":"CANCELED"}'
+    end
+
+    it 'cancels UNDEFINED transactions with a plain test message' do
+      response = Killbill::Cybersource::CybersourceResponse.create(:api_call => 'authorization',
+                                                                   :message => 'Internal error',
+                                                                   :created_at => Time.now,
+                                                                   :updated_at => Time.now)
+      response.cancel
+      response.message.should == '{"original_message":"Internal error","payment_plugin_status":"CANCELED"}'
+    end
+
+    it 'cancels UNDEFINED transactions with no message' do
+      response = Killbill::Cybersource::CybersourceResponse.create(:api_call => 'authorization',
+                                                                   :created_at => Time.now,
+                                                                   :updated_at => Time.now)
+      response.cancel
+      response.message.should == '{"payment_plugin_status":"CANCELED"}'
+    end
   end
 
   private

data/spec/cybersource/remote/integration_spec.rb

@@ -61,6 +61,9 @@ describe Killbill::Cybersource::PaymentPlugin do
     # Skip the rest of the test if the report API isn't configured to check for duplicates
     break unless with_report_api && report_api.check_for_duplicates?
 
+    # The report API can be delayed
+    await { !@plugin.get_single_transaction_report(report_api, @kb_payment.transactions[0].id, Time.now.utc).empty? }
+
     payment_response = @plugin.purchase_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[0].id, @pm.kb_payment_method_id, @amount, @currency, @properties, @call_context)
     payment_response.amount.should == @amount
     payment_response.status.should == :PROCESSED
@@ -203,6 +206,9 @@ describe Killbill::Cybersource::PaymentPlugin do
 
     # Skip if the report API isn't configured
     if with_report_api
+      # The report API can be delayed
+      await { !@plugin.get_single_transaction_report(report_api, @kb_payment.transactions[0].id, Time.now.utc).empty? }
+
       # Fix it
       transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, @properties, @call_context)
       transaction_info_plugins.size.should == 1
@@ -240,6 +246,50 @@ describe Killbill::Cybersource::PaymentPlugin do
     new_response.message.should == (with_report_api ? 'Request was processed successfully.' : '{"payment_plugin_status":"UNDEFINED"}')
   end
 
+  it 'should eventually cancel UNDEFINED payments' do
+    response = Killbill::Cybersource::CybersourceResponse.create(:api_call => 'authorization',
+                                                                 :kb_account_id => @pm.kb_account_id,
+                                                                 :kb_payment_id => @kb_payment.id,
+                                                                 :kb_payment_transaction_id => @kb_payment.transactions[0].id,
+                                                                 :kb_tenant_id => @call_context.tenant_id,
+                                                                 :message => '{"exception_message":"Timeout","payment_plugin_status":"UNDEFINED"}',
+                                                                 :created_at => Time.now,
+                                                                 :updated_at => Time.now)
+
+    # Set skip_gw=true, to avoid calling the report API
+    skip_gw = Killbill::Plugin::Model::PluginProperty.new
+    skip_gw.key = 'skip_gw'
+    skip_gw.value = 'true'
+    properties_with_cancel_threshold = @properties.clone
+    properties_with_cancel_threshold << skip_gw
+    transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, properties_with_cancel_threshold, @call_context)
+    transaction_info_plugins.size.should == 1
+    transaction_info_plugins.first.status.should eq(:UNDEFINED)
+
+    # Call the reporting API (if configured) and verify the state still cannot be fixed
+    transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, @properties, @call_context)
+    transaction_info_plugins.size.should == 1
+    transaction_info_plugins.first.status.should eq(:UNDEFINED)
+
+    # Transition to CANCEL won't work if the reporting API isn't configured
+    break unless with_report_api
+
+    # Force a transition to CANCEL
+    cancel_threshold = Killbill::Plugin::Model::PluginProperty.new
+    cancel_threshold.key = 'cancel_threshold'
+    cancel_threshold.value = '0'
+    properties_with_cancel_threshold = @properties.clone
+    properties_with_cancel_threshold << cancel_threshold
+    transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, properties_with_cancel_threshold, @call_context)
+    transaction_info_plugins.size.should == 1
+    transaction_info_plugins.first.status.should eq(:CANCELED)
+
+    # Verify the state is sticky
+    transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, @properties, @call_context)
+    transaction_info_plugins.size.should == 1
+    transaction_info_plugins.first.status.should eq(:CANCELED)
+  end
+
   it 'should be able to charge and refund' do
     payment_response = @plugin.purchase_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[0].id, @pm.kb_payment_method_id, @amount, @currency, @properties, @call_context)
     check_response(payment_response, @amount, :PURCHASE, :PROCESSED, 'Successful transaction', '100')
@@ -277,6 +327,14 @@ describe Killbill::Cybersource::PaymentPlugin do
     check_response(payment_response, nil, :VOID, :PROCESSED, 'Successful transaction', '100')
   end
 
+  it 'should be able to auth and void in CAD', :ci_skip => true do
+    payment_response = @plugin.authorize_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[0].id, @pm.kb_payment_method_id, @amount, 'CAD', @properties, @call_context)
+    check_response(payment_response, @amount, :AUTHORIZE, :PROCESSED, 'Successful transaction', '100')
+
+    payment_response = @plugin.void_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[1].id, @pm.kb_payment_method_id, @properties, @call_context)
+    check_response(payment_response, nil, :VOID, :PROCESSED, 'Successful transaction', '100')
+  end
+
   it 'should be able to auth, partial capture and void' do
     payment_response = @plugin.authorize_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[0].id, @pm.kb_payment_method_id, @amount, @currency, @properties, @call_context)
     check_response(payment_response, @amount, :AUTHORIZE, :PROCESSED, 'Successful transaction', '100')
@@ -507,4 +565,12 @@ describe Killbill::Cybersource::PaymentPlugin do
     end
     kb_payment
   end
+
+  def await(timeout=15)
+    timeout.times do
+      return if block_given? && yield
+      sleep(1)
+    end
+    fail('Timeout')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-cybersource
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.0.7
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill