killbill-cybersource 0.0.4 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.0.4
+1.0.0

data/cybersource.yml

@@ -1,13 +1,34 @@
 :cybersource:
-  :test: true
-  :log_file: /var/tmp/cybersource.log
+  - :account_id: default
+    :test: true
+    :login: <%= ENV['LOGIN'] %>
+    :password: <%= ENV['PASSWORD'] %>
+  - :account_id: on_demand
+    :merchantID: <%= ENV['MERCHANT_ID'] %>
+    :username: <%= ENV['OD_USERNAME'] %>
+    :password: <%= ENV['OD_PASSWORD'] %>
 
 :database:
+# SQLite (development)
   :adapter: sqlite3
   :database: test.db
 # For MySQL
-#  :adapter: 'jdbc'
-#  :username: 'your-username'
-#  :password: 'your-password'
-#  :driver: 'com.mysql.jdbc.Driver'
-#  :url: 'jdbc:mysql://127.0.0.1:3306/your-database'
+#  :adapter: mysql
+#  :username: 'killbill'
+#  :password: 'killbill'
+#  :database: 'killbill' # or set the URL :
+#  #:url: jdbc:mysql://127.0.0.1:3306/killbill
+#  :driver: org.mariadb.jdbc.Driver # as in KB
+#  :pool: 30 # AR's default is max 5 connections
+# In Kill Bill
+#  :adapter: mysql
+#  :jndi: 'killbill/osgi/jdbc'
+#  :pool: false # false-pool (JNDI pool's max)
+#  # uncomment if pool does not support JDBC4 :
+#  #:connection_alive_sql: 'select 1'
+#  # MySQL adapter #configure_connection defaults :
+#  #    @@SESSION.sql_auto_is_null = 0,
+#  #    @@SESSION.wait_timeout = 2147483,
+#  #    @@SESSION.sql_mode = 'STRICT_ALL_TABLES'
+#  # ... can be disabled (on AR-JDBC 1.4) using :
+#  :configure_connection: false

data/db/ddl.sql

@@ -5,10 +5,10 @@ CREATE TABLE `cybersource_payment_methods` (
   `cc_first_name` varchar(255) DEFAULT NULL,
   `cc_last_name` varchar(255) DEFAULT NULL,
   `cc_type` varchar(255) DEFAULT NULL,
-  `cc_exp_month` int(11) DEFAULT NULL,
-  `cc_exp_year` int(11) DEFAULT NULL,
-  `cc_number` int(11) DEFAULT NULL,
-  `cc_last_4` int(11) DEFAULT NULL,
+  `cc_exp_month` varchar(255) DEFAULT NULL,
+  `cc_exp_year` varchar(255) DEFAULT NULL,
+  `cc_number` varchar(255) DEFAULT NULL,
+  `cc_last_4` varchar(255) DEFAULT NULL,
   `cc_start_month` varchar(255) DEFAULT NULL,
   `cc_start_year` varchar(255) DEFAULT NULL,
   `cc_issue_number` varchar(255) DEFAULT NULL,
@@ -37,9 +37,10 @@ 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),
-  `amount_in_cents` int(11),
-  `currency` varchar(255),
+  `payment_processor_account_id` varchar(255) DEFAULT NULL,
+  `txn_id` varchar(255) DEFAULT NULL,
+  `amount_in_cents` int(11) DEFAULT NULL,
+  `currency` varchar(255) DEFAULT NULL,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
   `kb_account_id` varchar(255) NOT NULL,
@@ -54,6 +55,7 @@ CREATE TABLE `cybersource_responses` (
   `kb_payment_id` varchar(255) DEFAULT NULL,
   `kb_payment_transaction_id` varchar(255) DEFAULT NULL,
   `transaction_type` varchar(255) DEFAULT NULL,
+  `payment_processor_account_id` varchar(255) DEFAULT NULL,
   `message` varchar(255) DEFAULT NULL,
   `authorization` varchar(255) DEFAULT NULL,
   `fraud_review` tinyint(1) DEFAULT NULL,

data/db/schema.rb

@@ -7,15 +7,15 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "cc_first_name"
     t.string   "cc_last_name"
     t.string   "cc_type"
-    t.integer  "cc_exp_month"
-    t.integer  "cc_exp_year"
-    t.integer  "cc_number"
-    t.integer  "cc_last_4"
-    t.integer  "cc_start_month"
-    t.integer  "cc_start_year"
-    t.integer  "cc_issue_number"
-    t.integer  "cc_verification_value"
-    t.integer  "cc_track_data"
+    t.string   "cc_exp_month"
+    t.string   "cc_exp_year"
+    t.string   "cc_number"
+    t.string   "cc_last_4"
+    t.string   "cc_start_month"
+    t.string   "cc_start_year"
+    t.string   "cc_issue_number"
+    t.string   "cc_verification_value"
+    t.string   "cc_track_data"
     t.string   "address1"
     t.string   "address2"
     t.string   "city"
@@ -38,7 +38,9 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "kb_payment_id",                  :null => false
     t.string   "kb_payment_transaction_id",      :null => false
     t.string   "transaction_type",               :null => false
+    t.string   "payment_processor_account_id"
     t.string   "txn_id"                          # cybersource transaction id
+    # Both null for void
     t.integer  "amount_in_cents"
     t.string   "currency"
     t.datetime "created_at",                     :null => false
@@ -54,6 +56,7 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "kb_payment_id"
     t.string   "kb_payment_transaction_id"
     t.string   "transaction_type"
+    t.string   "payment_processor_account_id"
     t.string   "message"
     t.string   "authorization"
     t.boolean  "fraud_review"

data/killbill-cybersource.gemspec

@@ -12,36 +12,40 @@ Gem::Specification.new do |s|
 
   s.author   = 'Kill Bill core team'
   s.email    = 'killbilling-users@googlegroups.com'
-  s.homepage = 'http://kill-bill.org'
+  s.homepage = 'http://killbill.io'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.bindir        = 'bin'
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
   s.rdoc_options << '--exclude' << '.'
 
-  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'
-  s.add_dependency 'actionview', '~> 4.1.0'
-  s.add_dependency 'activesupport', '~> 4.1.0'
-  s.add_dependency 'money', '~> 6.1.1'
-  s.add_dependency 'monetize', '~> 0.3.0'
+  s.add_dependency 'killbill', '~> 4.0.0'
+
   s.add_dependency 'sinatra', '~> 1.3.4'
+  s.add_dependency 'thread_safe', '~> 0.3.4'
+  s.add_dependency 'activerecord', '~> 4.1.0'
   if defined?(JRUBY_VERSION)
-    s.add_dependency 'activerecord-jdbcmysql-adapter', '~> 1.3.7'
+    s.add_dependency 'activerecord-bogacs', '~> 0.3'
+    s.add_dependency 'activerecord-jdbc-adapter', '~> 1.3'
     # Required to avoid errors like java.lang.NoClassDefFoundError: org/bouncycastle/asn1/DERBoolean
-    s.add_dependency 'jruby-openssl', '~> 0.9.4'
+    s.add_dependency 'jruby-openssl', '~> 0.9.6'
   end
+  s.add_dependency 'actionpack', '~> 4.1.0'
+  s.add_dependency 'actionview', '~> 4.1.0'
+  s.add_dependency 'activemerchant', '~> 1.48.0'
+  s.add_dependency 'offsite_payments', '~> 2.1.0'
+  s.add_dependency 'monetize', '~> 1.1.0'
+  s.add_dependency 'money', '~> 6.5.1'
 
-  s.add_development_dependency 'jbundler', '~> 0.4.1'
+  s.add_development_dependency 'jbundler', '~> 0.4.3'
   s.add_development_dependency 'rake', '>= 10.0.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'
   if defined?(JRUBY_VERSION)
-    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.3.7'
+    s.add_development_dependency 'jdbc-sqlite3', '~> 3.7'
+    s.add_development_dependency 'jdbc-mariadb', '~> 1.1'
   else
     s.add_development_dependency 'sqlite3', '~> 1.3.7'
   end

data/lib/cybersource.rb

@@ -1,3 +1,4 @@
+require 'openssl'
 require 'action_controller'
 require 'active_record'
 require 'action_view'
@@ -7,6 +8,7 @@ require 'base64'
 require 'bigdecimal'
 require 'money'
 require 'monetize'
+require 'offsite_payments'
 require 'pathname'
 require 'sinatra'
 require 'singleton'

data/lib/cybersource/api.rb

@@ -14,6 +14,14 @@ module Killbill #:nodoc:
               ::Killbill::Cybersource::CybersourceResponse)
       end
 
+      def on_event(event)
+        # Require to deal with per tenant configuration invalidation
+        super(event)
+        #
+        # Custom event logic could be added below...
+        #
+      end
+
       def start_plugin
         super
         gateway     = lookup_gateway(:on_demand)
@@ -26,6 +34,8 @@ module Killbill #:nodoc:
         # Pass extra parameters for the gateway here
         options = {}
 
+        add_required_options(kb_account_id, properties, options, context)
+
         properties = merge_properties(properties, options)
         super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
@@ -34,6 +44,8 @@ module Killbill #:nodoc:
         # Pass extra parameters for the gateway here
         options = {}
 
+        add_required_options(kb_account_id, properties, options, context)
+
         properties = merge_properties(properties, options)
         super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
@@ -42,6 +54,8 @@ module Killbill #:nodoc:
         # Pass extra parameters for the gateway here
         options = {}
 
+        add_required_options(kb_account_id, properties, options, context)
+
         properties = merge_properties(properties, options)
         super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
@@ -50,6 +64,8 @@ module Killbill #:nodoc:
         # Pass extra parameters for the gateway here
         options = {}
 
+        add_required_options(kb_account_id, properties, options, context)
+
         properties = merge_properties(properties, options)
         super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context)
       end
@@ -58,6 +74,8 @@ module Killbill #:nodoc:
         # Pass extra parameters for the gateway here
         options = {}
 
+        add_required_options(kb_account_id, properties, options, context)
+
         properties = merge_properties(properties, options)
         super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
@@ -66,6 +84,8 @@ module Killbill #:nodoc:
         # Pass extra parameters for the gateway here
         options = {}
 
+        add_required_options(kb_account_id, properties, options, context)
+
         properties = merge_properties(properties, options)
         super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
@@ -165,7 +185,7 @@ module Killbill #:nodoc:
       # Make calls idempotent
       def before_gateway(gateway, kb_transaction, last_transaction, payment_source, amount_in_cents, currency, options)
         super
-        return if @report_api.nil?
+        return if @report_api.nil? || options[:skip_gw]
 
         merchant_reference_code = options[:order_id]
         report                  = @report_api.single_transaction_report(merchant_reference_code, kb_transaction.created_date.strftime('%Y%m%d'))
@@ -181,6 +201,18 @@ module Killbill #:nodoc:
       rescue => e
         logger.warn "Error checking for duplicate payment: #{e.message}"
       end
+
+      def add_required_options(kb_account_id, properties, options, context)
+        if options[:email].nil?
+          email = find_value_from_properties(properties, 'email')
+          if email.nil?
+            # Note: we need to clone the context otherwise it will be transformed back to a Java one here
+            kb_account = @kb_apis.account_user_api.get_account_by_id(kb_account_id, @kb_apis.create_context(context.tenant_id))
+            email = kb_account.email
+          end
+          options[:email] = email
+        end
+      end
     end
   end
 end

data/lib/cybersource/application.rb

@@ -8,21 +8,17 @@ configure do
   # Usage: rackup -Ilib -E test
   if development? or test?
     # Make sure the plugin is initialized
-    plugin = ::Killbill::Cybersource::PaymentPlugin.new
-    plugin.logger = Logger.new(STDOUT)
+    plugin              = ::Killbill::Cybersource::PaymentPlugin.new
+    plugin.logger       = Logger.new(STDOUT)
     plugin.logger.level = Logger::INFO
-    plugin.conf_dir = File.dirname(File.dirname(__FILE__)) + '/..'
+    plugin.conf_dir     = File.dirname(File.dirname(__FILE__)) + '/..'
     plugin.start_plugin
   end
 end
 
 helpers do
   def plugin(session = {})
-    ::Killbill::Cybersource::PrivatePaymentPlugin.new(:cybersource,
-                                                            ::Killbill::Cybersource::CybersourcePaymentMethod,
-                                                            ::Killbill::Cybersource::CybersourceTransaction,
-                                                            ::Killbill::Cybersource::CybersourceResponse,
-                                                            session)
+    ::Killbill::Cybersource::PrivatePaymentPlugin.new(session)
   end
 end
 

data/lib/cybersource/models/response.rb

@@ -6,12 +6,13 @@ module Killbill #:nodoc:
 
       has_one :cybersource_transaction
 
-      def self.from_response(api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, response, extra_params = {}, model = ::Killbill::Cybersource::CybersourceResponse)
+      def self.from_response(api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, payment_processor_account_id, kb_tenant_id, response, extra_params = {}, model = ::Killbill::Cybersource::CybersourceResponse)
         super(api_call,
               kb_account_id,
               kb_payment_id,
               kb_payment_transaction_id,
               transaction_type,
+              payment_processor_account_id,
               kb_tenant_id,
               response,
               {
@@ -33,6 +34,18 @@ module Killbill #:nodoc:
               }.merge!(extra_params),
               model)
       end
+
+      def first_reference_id
+        params_request_id
+      end
+
+      def second_reference_id
+        params_reconciliation_id
+      end
+
+      def gateway_error_code
+        params_reason_code
+      end
     end
   end
 end

data/lib/cybersource/private_api.rb

@@ -1,6 +1,13 @@
 module Killbill #:nodoc:
   module Cybersource #:nodoc:
     class PrivatePaymentPlugin < ::Killbill::Plugin::ActiveMerchant::PrivatePaymentPlugin
+      def initialize(session = {})
+        super(:cybersource,
+              ::Killbill::Cybersource::CybersourcePaymentMethod,
+              ::Killbill::Cybersource::CybersourceTransaction,
+              ::Killbill::Cybersource::CybersourceResponse,
+              session)
+      end
     end
   end
 end

data/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-~ Copyright 2014 The Billing Project, LLC
+~ Copyright 2014-2015 The Billing Project, LLC
 ~
 ~  The Billing Project licenses this file to you under the Apache License, version 2.0
 ~  (the "License"); you may not use this file except in compliance with the
@@ -25,7 +25,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>cybersource-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>0.0.4</version>
+    <version>1.0.0</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/release.sh

@@ -1,5 +1,8 @@
 set -e
 
+BUNDLE=${BUNDLE-"bundle exec"}
+MVN=${MVN-"mvn"}
+
 if [ 'GNU' != "$(tar --help | grep GNU | head -1 | awk '{print $1}')" ]; then
   echo 'Unable to release: make sure to use GNU tar'
   exit 1
@@ -14,28 +17,45 @@ else
 fi
 
 VERSION=`grep -E '<version>([0-9]+\.[0-9]+\.[0-9]+)</version>' pom.xml | sed 's/[\t \n]*<version>\(.*\)<\/version>[\t \n]*/\1/'`
-if [ "$VERSION" != "$(cat $PWD/VERSION)" ]; then
+if [[ -z "$NO_RELEASE" && "$VERSION" != "$(cat $PWD/VERSION)" ]]; then
   echo 'Unable to release: make sure the versions in pom.xml and VERSION match'
   exit 1
 fi
 
 echo 'Cleaning up'
-rake killbill:clean ; rake build
+$BUNDLE rake killbill:clean
+
+echo 'Building gem'
+$BUNDLE rake build
 
-echo 'Pushing the gem to Rubygems'
-rake release
+if [[ -z "$NO_RELEASE" ]]; then
+  echo 'Pushing the gem to Rubygems'
+  $BUNDLE rake release
+fi
 
 echo 'Building artifact'
-rake killbill:package
+$BUNDLE rake killbill:package
 
 ARTIFACT="$PWD/pkg/killbill-cybersource-$VERSION.tar.gz"
 echo "Pushing $ARTIFACT to Maven Central"
-mvn gpg:sign-and-deploy-file \
-    -DgroupId=org.kill-bill.billing.plugin.ruby \
-    -DartifactId=cybersource-plugin \
-    -Dversion=$VERSION \
-    -Dpackaging=tar.gz \
-    -DrepositoryId=ossrh-releases \
-    -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ \
-    -Dfile=$ARTIFACT \
-    -DpomFile=pom.xml
+
+if [[ -z "$NO_RELEASE" ]]; then
+  GOAL=gpg:sign-and-deploy-file
+  REPOSITORY_ID=ossrh-releases
+  URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+else
+  GOAL=deploy:deploy-file
+  REPOSITORY_ID=sonatype-nexus-snapshots
+  URL=https://oss.sonatype.org/content/repositories/snapshots/
+  VERSION="$VERSION-SNAPSHOT"
+fi
+
+$MVN $GOAL \
+     -DgroupId=org.kill-bill.billing.plugin.ruby \
+     -DartifactId=cybersource-plugin \
+     -Dversion=$VERSION \
+     -Dpackaging=tar.gz \
+     -DrepositoryId=$REPOSITORY_ID \
+     -Durl=$URL \
+     -Dfile=$ARTIFACT \
+     -DpomFile=pom.xml