killbill-cybersource 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb1cd0b317eb7b2b5338490d98587da7856373e0
-  data.tar.gz: 6c4564dafa4d2b35963a464e285819c99b41faa0
+  metadata.gz: 1afabdf22905f7fad77d239026e4a3182831b7d5
+  data.tar.gz: eee1798b1e2bf264a2bd96023076755f24aa8929
 SHA512:
-  metadata.gz: 2bb15e9bd4cf28cd9417a3f8e8d73c616a06cab43265c14b0fabfe6c0e8b1d6839e6f32b52925a1dcd1ebd8f03d978490b0c1991ce966a14796e6deb20d8a179
-  data.tar.gz: 8db2e3193a6a4db09192016599939b35c75d8fee670c2fe210e226b8da923491381da00fe6f5f1435284520249a6ca6363742bb61a85b1b46da26b1a209cab5c
+  metadata.gz: ecc764a9caa40931a26495c1d4122b71c80a0467ae97c42ab25b3d83b4b04427409792e63d6c2e0148ca3e042b7d6dffc19113eaeff9aefc928b315b13ff2a63
+  data.tar.gz: 7a251ccb11d31b1a127ec6de804a8c4c22b672c23b9a09cb358ea5c4200ad2c64bcb477b947d565402e869ee24dcd8a99ddfe878cbc95d8ccdf825ee6ab0d576

data/Gemfile

@@ -3,4 +3,3 @@ source 'http://rubygems.org'
 gemspec
 
 #gem 'killbill', :path => '../killbill-plugin-framework-ruby'
-

data/NEWS

@@ -1,3 +1,10 @@
+0.0.4
+    Update killbill gem to 3.1.11
+
+0.0.3
+    DDL: remove constraints in cybersource_transactions
+    Make payment calls idempotent using the CyberSource OnDemand API
+
 0.0.2
     Upgrade killbill framework for connection leaks
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

data/db/ddl.sql

@@ -37,9 +37,9 @@ CREATE TABLE `cybersource_transactions` (
   `kb_payment_id` varchar(255) NOT NULL,
   `kb_payment_transaction_id` varchar(255) NOT NULL,
   `transaction_type` varchar(255) NOT NULL,
-  `txn_id` varchar(255) NOT NULL,
-  `amount_in_cents` int(11) NOT NULL,
-  `currency` varchar(255) NOT NULL,
+  `txn_id` varchar(255),
+  `amount_in_cents` int(11),
+  `currency` varchar(255),
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
   `kb_account_id` varchar(255) NOT NULL,

data/db/schema.rb

@@ -39,8 +39,8 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "kb_payment_transaction_id",      :null => false
     t.string   "transaction_type",               :null => false
     t.string   "txn_id"                          # cybersource transaction id
-    t.integer  "amount_in_cents",                :null => false
-    t.string   "currency",                       :null => false
+    t.integer  "amount_in_cents"
+    t.string   "currency"
     t.datetime "created_at",                     :null => false
     t.datetime "updated_at",                     :null => false
     t.string   "kb_account_id",                  :null => false

data/killbill-cybersource.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 3.1.9'
+  s.add_dependency 'killbill', '~> 3.1.11'
   s.add_dependency 'activemerchant', '~> 1.42.9'
   s.add_dependency 'activerecord', '~> 4.1.0'
   s.add_dependency 'actionpack', '~> 4.1.0'

data/lib/cybersource/api.rb

@@ -14,6 +14,14 @@ module Killbill #:nodoc:
               ::Killbill::Cybersource::CybersourceResponse)
       end
 
+      def start_plugin
+        super
+        gateway     = lookup_gateway(:on_demand)
+        @report_api = CyberSourceOnDemand.new(gateway, logger)
+      rescue => e
+        @report_api = nil
+      end
+
       def authorize_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
         # Pass extra parameters for the gateway here
         options = {}
@@ -153,6 +161,26 @@ module Killbill #:nodoc:
           # gw_notification.entity =
         end
       end
+
+      # Make calls idempotent
+      def before_gateway(gateway, kb_transaction, last_transaction, payment_source, amount_in_cents, currency, options)
+        super
+        return if @report_api.nil?
+
+        merchant_reference_code = options[:order_id]
+        report                  = @report_api.single_transaction_report(merchant_reference_code, kb_transaction.created_date.strftime('%Y%m%d'))
+
+        if !report.nil? &&
+            !report['Report'].nil? &&
+            !report['Report']['Requests'].nil? &&
+            !report['Report']['Requests']['Request'].nil? &&
+            report['Report']['Requests']['Request']['MerchantReferenceNumber'] == merchant_reference_code
+          logger.info "Skipping gateway call for existing transaction #{kb_transaction.id}, merchant reference code #{merchant_reference_code}"
+          options[:skip_gw] = true
+        end
+      rescue => e
+        logger.warn "Error checking for duplicate payment: #{e.message}"
+      end
     end
   end
 end

data/lib/cybersource/cyber_source_on_demand.rb

@@ -0,0 +1,46 @@
+module Killbill #:nodoc:
+  module Cybersource #:nodoc:
+    class CyberSourceOnDemand
+
+      @@live_url = 'https://ebc.cybersource.com/ebc/Query'
+      @@test_url = 'https://ebctest.cybersource.com/ebctest/Query'
+
+      def initialize(gateway, logger)
+        @gateway = gateway
+        @logger  = logger
+      end
+
+      def single_transaction_report(merchant_reference_code, target_date)
+        params = {
+            :merchantID              => @gateway.config[:merchantID],
+            :merchantReferenceNumber => merchant_reference_code,
+            :targetDate              => target_date,
+            :type                    => 'transaction',
+            :subtype                 => 'transactionDetail',
+            :versionNumber           => '1.7',
+        }
+
+        headers = {
+            # Don't use symbols or it will confuse Net/HTTP
+            'Authorization' => 'Basic ' + Base64.encode64("#{@gateway.config[:username]}:#{@gateway.config[:password]}").chomp
+        }
+
+        data     = URI.encode_www_form(params)
+        endpoint = @gateway.test? ? @@test_url : @@live_url
+
+        # Will raise ResponseError if the response code is > 300
+        parse(@gateway.ssl_post(endpoint, data, headers))
+      end
+
+      private
+
+      def parse(body)
+        # Thanks ActiveSupport!
+        Hash.from_xml(body)
+      rescue # Parser error - request failed
+        @logger.warn "Error checking for duplicate payment, CyberSource response: #{body}"
+        nil
+      end
+    end
+  end
+end

data/lib/cybersource.rb

@@ -3,17 +3,20 @@ require 'active_record'
 require 'action_view'
 require 'active_merchant'
 require 'active_support'
+require 'base64'
 require 'bigdecimal'
 require 'money'
 require 'monetize'
 require 'pathname'
 require 'sinatra'
 require 'singleton'
+require 'uri'
 require 'yaml'
 
 require 'killbill'
 require 'killbill/helpers/active_merchant'
 
+require 'cybersource/cyber_source_on_demand'
 require 'cybersource/api'
 require 'cybersource/private_api'
 

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>cybersource-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>0.0.2</version>
+    <version>0.0.4</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/remote/integration_spec.rb

@@ -10,10 +10,11 @@ describe Killbill::Cybersource::PaymentPlugin do
     @plugin = Killbill::Cybersource::PaymentPlugin.new
 
     @account_api    = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaUserAccountApi.new
-    svcs            = {:account_user_api => @account_api}
+    @payment_api    = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaPaymentApi.new
+    svcs            = {:account_user_api => @account_api, :payment_api => @payment_api}
     @plugin.kb_apis = Killbill::Plugin::KillbillApi.new('cybersource', svcs)
 
-    @call_context           = Killbill::Plugin::Model::CallContext.new
+    @call_context           = ::Killbill::Plugin::Model::CallContext.new
     @call_context.tenant_id = '00000011-0022-0033-0044-000000000055'
     @call_context           = @call_context.to_ruby(@call_context)
 
@@ -21,72 +22,129 @@ describe Killbill::Cybersource::PaymentPlugin do
     @plugin.logger.level = Logger::INFO
     @plugin.conf_dir     = File.expand_path(File.dirname(__FILE__) + '../../../../')
     @plugin.start_plugin
+
+    @pm         = create_payment_method(::Killbill::Cybersource::CybersourcePaymentMethod, nil, @call_context.tenant_id)
+    @amount     = BigDecimal.new('100')
+    @currency   = 'USD'
+    @properties = []
+
+    kb_payment_id = SecureRandom.uuid
+    1.upto(6) do
+      @kb_payment = @payment_api.add_payment(kb_payment_id)
+    end
   end
 
   after(:each) do
     @plugin.stop_plugin
   end
 
-  it 'should be able to charge a Credit Card directly' do
-    properties = build_pm_properties
-    amount     = BigDecimal.new("100")
-    currency   = 'USD'
+  it 'should be able to charge a Credit Card directly and calls should be idempotent' do
+    # We created the payment method, hence the rows
+    Killbill::Cybersource::CybersourceResponse.all.size.should == 1
+    Killbill::Cybersource::CybersourceTransaction.all.size.should == 0
+
+    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
+    payment_response.transaction_type.should == :PURCHASE
 
-    payment_response = @plugin.purchase_payment SecureRandom.uuid, SecureRandom.uuid, SecureRandom.uuid, nil, amount, currency, properties, @call_context
-    payment_response.amount.should == amount
+    responses = Killbill::Cybersource::CybersourceResponse.all
+    responses.size.should == 2
+    responses[0].api_call.should == 'add_payment_method'
+    responses[0].message.should == 'Successful transaction'
+    responses[1].api_call.should == 'purchase'
+    responses[1].message.should == 'Successful transaction'
+    transactions = Killbill::Cybersource::CybersourceTransaction.all
+    transactions.size.should == 1
+    transactions[0].api_call.should == 'purchase'
+
+    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
     payment_response.transaction_type.should == :PURCHASE
+
+    responses = Killbill::Cybersource::CybersourceResponse.all
+    responses.size.should == 3
+    responses[0].api_call.should == 'add_payment_method'
+    responses[0].message.should == 'Successful transaction'
+    responses[1].api_call.should == 'purchase'
+    responses[1].message.should == 'Successful transaction'
+    responses[2].api_call.should == 'purchase'
+    responses[2].message.should == 'Skipped Gateway call'
+    transactions = Killbill::Cybersource::CybersourceTransaction.all
+    transactions.size.should == 2
+    transactions[0].api_call.should == 'purchase'
+    transactions[0].txn_id.should_not be_nil
+    transactions[1].api_call.should == 'purchase'
+    transactions[1].txn_id.should be_nil
   end
 
   it 'should be able to charge and refund' do
-    pm                        = create_payment_method(Killbill::Cybersource::CybersourcePaymentMethod, nil, @call_context.tenant_id)
-    amount                    = BigDecimal.new("100")
-    currency                  = 'USD'
-    kb_payment_id             = SecureRandom.uuid
-    kb_payment_transaction_id = SecureRandom.uuid
-
-    payment_response = @plugin.purchase_payment pm.kb_account_id, kb_payment_id, kb_payment_transaction_id, pm.kb_payment_method_id, amount, currency, [], @call_context
-    payment_response.amount.should == amount
+    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
     payment_response.transaction_type.should == :PURCHASE
 
     # Try a full refund
-    refund_response = @plugin.refund_payment pm.kb_account_id, kb_payment_id, kb_payment_transaction_id, pm.kb_payment_method_id, amount, currency, [], @call_context
-    refund_response.amount.should == amount
+    refund_response = @plugin.refund_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[1].id, @pm.kb_payment_method_id, @amount, @currency, @properties, @call_context)
+    refund_response.amount.should == @amount
     refund_response.status.should == :PROCESSED
     refund_response.transaction_type.should == :REFUND
   end
 
   it 'should be able to auth, capture and refund' do
-    pm            = create_payment_method(Killbill::Cybersource::CybersourcePaymentMethod, nil, @call_context.tenant_id)
-    amount        = BigDecimal.new("100")
-    currency      = 'USD'
-    kb_payment_id = SecureRandom.uuid
-
-    payment_response = @plugin.authorize_payment pm.kb_account_id, kb_payment_id, SecureRandom.uuid, pm.kb_payment_method_id, amount, currency, [], @call_context
-    payment_response.amount.should == amount
+    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)
+    payment_response.amount.should == @amount
     payment_response.status.should == :PROCESSED
     payment_response.transaction_type.should == :AUTHORIZE
 
     # Try multiple partial captures
-    partial_capture_amount = BigDecimal.new("10")
-    1.upto(3) do
-      payment_response = @plugin.capture_payment pm.kb_account_id, kb_payment_id, SecureRandom.uuid, pm.kb_payment_method_id, partial_capture_amount, currency, [], @call_context
+    partial_capture_amount = BigDecimal.new('10')
+    1.upto(3) do |i|
+      payment_response = @plugin.capture_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[i].id, @pm.kb_payment_method_id, partial_capture_amount, @currency, @properties, @call_context)
       payment_response.amount.should == partial_capture_amount
       payment_response.status.should == :PROCESSED
       payment_response.transaction_type.should == :CAPTURE
     end
 
     # Try a partial refund
-    refund_response = @plugin.refund_payment pm.kb_account_id, kb_payment_id, SecureRandom.uuid, pm.kb_payment_method_id, partial_capture_amount, currency, [], @call_context
+    refund_response = @plugin.refund_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[4].id, @pm.kb_payment_method_id, partial_capture_amount, @currency, @properties, @call_context)
     refund_response.amount.should == partial_capture_amount
     refund_response.status.should == :PROCESSED
     refund_response.transaction_type.should == :REFUND
 
     # Try to capture again
-    payment_response = @plugin.capture_payment pm.kb_account_id, kb_payment_id, SecureRandom.uuid, pm.kb_payment_method_id, partial_capture_amount, currency, [], @call_context
+    payment_response = @plugin.capture_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[5].id, @pm.kb_payment_method_id, partial_capture_amount, @currency, @properties, @call_context)
+    payment_response.amount.should == partial_capture_amount
+    payment_response.status.should == :PROCESSED
+    payment_response.transaction_type.should == :CAPTURE
+  end
+
+  it 'should be able to auth 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)
+    payment_response.amount.should == @amount
+    payment_response.status.should == :PROCESSED
+    payment_response.transaction_type.should == :AUTHORIZE
+
+    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)
+    payment_response.status.should == :PROCESSED
+    payment_response.transaction_type.should == :VOID
+  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)
+    payment_response.amount.should == @amount
+    payment_response.status.should == :PROCESSED
+    payment_response.transaction_type.should == :AUTHORIZE
+
+    partial_capture_amount = BigDecimal.new('10')
+    payment_response       = @plugin.capture_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[1].id, @pm.kb_payment_method_id, partial_capture_amount, @currency, @properties, @call_context)
     payment_response.amount.should == partial_capture_amount
     payment_response.status.should == :PROCESSED
     payment_response.transaction_type.should == :CAPTURE
+
+    payment_response = @plugin.void_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[2].id, @pm.kb_payment_method_id, @properties, @call_context)
+    payment_response.status.should == :PROCESSED
+    payment_response.transaction_type.should == :VOID
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-cybersource
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.9
+        version: 3.1.11
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.9
+        version: 3.1.11
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -244,6 +244,7 @@ files:
 - lib/cybersource.rb
 - lib/cybersource/api.rb
 - lib/cybersource/application.rb
+- lib/cybersource/cyber_source_on_demand.rb
 - lib/cybersource/models/payment_method.rb
 - lib/cybersource/models/response.rb
 - lib/cybersource/models/transaction.rb