killbill-paypal-express 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0272226dd57a3807c6e6b92fa8ce4343170e5990
-  data.tar.gz: b270eedffc900003c247412f6ec23eb8270b833c
+  metadata.gz: 6d005c1bdd9b05742e9898d5fef94c1f72c0eb81
+  data.tar.gz: 683c9b2837efe00ff16d65f62c964b9e46020540
 SHA512:
-  metadata.gz: 7d914623be7ecbe94d1e47b128d75720610cd24d2b74224c9f7fa4c4e06d931678326d6f44bce61b7aa71320cc508c395d36ce105fc9d14548096c58a6ab8dfc
-  data.tar.gz: 1149ded1259435470009aec193e42b90d12b437211bd73e7511900ae875dbb088f7e224d67293b209ee72fa0d8cc4d5c4fb334c797ca40d174a824d95b67aa96
+  metadata.gz: b8c9c42cb7e253e38338107f86efdd8dbc27d762c2590dd7bc5f9718de8e9b1acf3b82c186930d1dd8f85fe1698aec7d7ede4ced070a3a0ea2d37730399f35fb
+  data.tar.gz: 03da6bfa63eaaa3631f48a40c07c99fff32ce0e58ff97a28b67a2bf2166bee83ca0546ab599e1cc91a0e6b8c0ef706631e5c35c5ae2e877b15dce200f8baf447

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-paypal-express (4.1.2)
+    killbill-paypal-express (4.1.3)
       actionpack (~> 4.1.0)
       actionview (~> 4.1.0)
       activemerchant (~> 1.53.0)
@@ -58,6 +58,8 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     builder (3.2.2)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     descendants_tracker (0.0.4)
@@ -65,7 +67,7 @@ GEM
     diff-lcs (1.1.3)
     equalizer (0.0.11)
     erubis (2.7.0)
-    ethon (0.8.1)
+    ethon (0.9.0)
       ffi (>= 1.3.0)
     ffi (1.9.10-java)
     i18n (0.7.0)
@@ -119,6 +121,11 @@ GEM
     ruby-maven (3.3.8)
       ruby-maven-libs (~> 3.3.1)
     ruby-maven-libs (3.3.3)
+    rubyzip (1.2.0)
+    selenium-webdriver (2.53.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
     sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
@@ -134,6 +141,7 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
+    websocket (1.2.3)
 
 PLATFORMS
   java
@@ -146,6 +154,7 @@ DEPENDENCIES
   killbill-paypal-express!
   rake (>= 10.0.0)
   rspec (~> 2.12.0)
+  selenium-webdriver (~> 2.53.0)
 
 BUNDLED WITH
    1.11.2

data/NEWS

@@ -1,3 +1,7 @@
+4.1.3
+    Add support for auth-only HPP flow
+    Add support for multiple merchant accounts
+
 4.1.2
     Configure ButtonSource parameter
 

data/README.md

@@ -217,4 +217,5 @@ Plugin properties
 | zip                          | Billing address zip code                                          |
 | state                        | Billing address state                                             |
 | country                      | Billing address country                                           |
-| max_amount                   | Maximum amount parameter (optional) for SetExpressCheckout call   |
+| max_amount                   | Maximum amount parameter (optional) for SetExpressCheckout call   |
+| auth_mode                    | If true, [Authorization Payment Action](https://developer.paypal.com/docs/classic/express-checkout/integration-guide/ECRelatedAPIOps/) is adopted. Otherwise, Sale Payment Action is used.|

data/VERSION

@@ -1 +1 @@
-4.1.2
+4.1.3

data/killbill-paypal-express.gemspec

@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'jbundler', '~> 0.9.2'
   s.add_development_dependency 'rake', '>= 10.0.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'
+  s.add_development_dependency 'selenium-webdriver', '~>2.53.0'
   if defined?(JRUBY_VERSION)
     s.add_development_dependency 'jdbc-sqlite3', '~> 3.7'
     s.add_development_dependency 'jdbc-mariadb', '~> 1.1'

data/lib/paypal_express/api.rb

@@ -29,20 +29,7 @@ module Killbill #:nodoc:
       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 = {}
-
-        add_required_options(kb_payment_transaction_id, kb_payment_method_id, context, options)
-
-        properties        = merge_properties(properties, options)
-
-        # Can't use default implementation: the authorize signature is for one-off payments only
-        #super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
-        gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
-          gateway.authorize_reference_transaction(amount_in_cents, options)
-        end
-
-        dispatch_to_gateways(:authorize, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc)
+        authorize_or_purchase_payment kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, true
       end
 
       def capture_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
@@ -58,73 +45,8 @@ module Killbill #:nodoc:
       end
 
       def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
-        payment_processor_account_id = find_value_from_properties(properties, 'payment_processor_account_id')
-
-        # Callback from the plugin itself (HPP flow)
-        if find_value_from_properties(properties, 'from_hpp') == 'true'
-          token = find_value_from_properties(properties, 'token')
-
-          response = @response_model.create(:api_call                     => :build_form_descriptor,
-                                            :kb_account_id                => kb_account_id,
-                                            :kb_payment_id                => kb_payment_id,
-                                            :kb_payment_transaction_id    => kb_payment_transaction_id,
-                                            :transaction_type             => :PURCHASE,
-                                            :authorization                => token,
-                                            :payment_processor_account_id => payment_processor_account_id,
-                                            :kb_tenant_id                 => context.tenant_id,
-                                            :success                      => true,
-                                            :created_at                   => Time.now.utc,
-                                            :updated_at                   => Time.now.utc,
-                                            :message                      => { :payment_plugin_status => :PENDING }.to_json)
-          transaction          = response.to_transaction_info_plugin(nil)
-          transaction.amount   = amount
-          transaction.currency = currency
-          transaction
-        else
-          options = {}
-          add_required_options(kb_payment_transaction_id, kb_payment_method_id, context, options)
-
-          # We have a baid on file
-          if options[:token]
-            gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
-              # Can't use default implementation: the purchase signature is for one-off payments only
-              gateway.reference_transaction(amount_in_cents, options)
-            end
-          else
-            # One-off payment
-            options[:token]    = find_value_from_properties(properties, 'token') || find_last_token(kb_account_id, context.tenant_id)
-            gateway_call_proc  = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
-              gateway.purchase(amount_in_cents, options)
-            end
-          end
-
-          # Populate the Payer id if missing
-          options[:payer_id] = find_value_from_properties(properties, 'payer_id')
-          begin
-            options[:payer_id] ||= find_payer_id(options[:token],
-                                                 kb_account_id,
-                                                 context.tenant_id,
-                                                 properties_to_hash(properties))
-          rescue => e
-            # Maybe invalid token?
-            response = @response_model.create(:api_call                     => :purchase,
-                                              :kb_account_id                => kb_account_id,
-                                              :kb_payment_id                => kb_payment_id,
-                                              :kb_payment_transaction_id    => kb_payment_transaction_id,
-                                              :transaction_type             => :PURCHASE,
-                                              :authorization                => nil,
-                                              :payment_processor_account_id => payment_processor_account_id,
-                                              :kb_tenant_id                 => context.tenant_id,
-                                              :success                      => false,
-                                              :created_at                   => Time.now.utc,
-                                              :updated_at                   => Time.now.utc,
-                                              :message                      => { :payment_plugin_status => :CANCELED, :exception_class => e.class.to_s, :exception_message => e.message }.to_json)
-            return response.to_transaction_info_plugin(nil)
-          end
-
-          properties = merge_properties(properties, options)
-          dispatch_to_gateways(:purchase, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc)
-        end
+        # by default, this call will purchase a payment
+        authorize_or_purchase_payment kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context
       end
 
       def void_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context)
@@ -151,7 +73,7 @@ module Killbill #:nodoc:
         linked_transaction_type = @transaction_model.purchases_from_kb_payment_id(kb_payment_id, context.tenant_id).size > 0 ? :PURCHASE : :CAPTURE
 
         # Pass extra parameters for the gateway here
-        options                 = {
+        options = {
             :linked_transaction_type => linked_transaction_type
         }
 
@@ -162,12 +84,14 @@ module Killbill #:nodoc:
       def get_payment_info(kb_account_id, kb_payment_id, properties, context)
         t_info_plugins = super(kb_account_id, kb_payment_id, properties, context)
 
-        # Completed purchases will have two rows in the responses table (one for api_call 'build_form_descriptor', one for api_call 'purchase')
+        # Completed purchases/authorizations will have two rows in the responses table (one for api_call 'build_form_descriptor', one for api_call 'purchase/authorize')
         # Other transaction types don't support the :PENDING state
-        is_purchase_pending = t_info_plugins.find { |t_info_plugin| t_info_plugin.transaction_type == :PURCHASE && t_info_plugin.status != :PENDING }.nil?
-        t_info_plugins_without_purchase_pending = t_info_plugins.reject { |t_info_plugin| t_info_plugin.transaction_type == :PURCHASE && t_info_plugin.status == :PENDING }
+        target_transaction_types = [:PURCHASE, :AUTHORIZE]
+        is_transaction_pending = t_info_plugins.find { |t_info_plugin| target_transaction_types.include?(t_info_plugin.transaction_type) && t_info_plugin.status != :PENDING }.nil?
+        t_info_plugins_without_pending = t_info_plugins.reject { |t_info_plugin| target_transaction_types.include?(t_info_plugin.transaction_type) && t_info_plugin.status == :PENDING }
 
-        is_purchase_pending ? t_info_plugins: t_info_plugins_without_purchase_pending
+        # If only pending transactions exist, return the pending one. Otherwise, only return those non-pending transaction.
+        is_transaction_pending ? t_info_plugins: t_info_plugins_without_pending
       end
 
       def search_payments(search_key, offset, limit, properties, context)
@@ -189,10 +113,13 @@ module Killbill #:nodoc:
           }
         else
           # Go to Paypal to get the Payer id (GetExpressCheckoutDetails call)
-          payer_id = find_payer_id(token, kb_account_id, context.tenant_id, properties_to_hash(properties))
+          payment_processor_account_id = find_value_from_properties(properties, :payment_processor_account_id)
+          payment_processor_account_id ||= find_payment_processor_id_from_initial_call(kb_account_id, context.tenant_id, token)
+          payer_id = find_payer_id(token, kb_account_id, context.tenant_id, payment_processor_account_id)
           options  = {
-              :paypal_express_token    => token,
-              :paypal_express_payer_id => payer_id
+              :paypal_express_token         => token,
+              :paypal_express_payer_id      => payer_id,
+              :payment_processor_account_id => payment_processor_account_id
           }
         end
 
@@ -260,22 +187,40 @@ module Killbill #:nodoc:
         # By default, pending payments are not created for HPP
         create_pending_payment = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :create_pending_payment)
         if create_pending_payment
-          custom_props = hash_to_properties(:from_hpp => true,
-                                            :token    => response.token)
+          payment_processor_account_id = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :payment_processor_account_id)
+          custom_props = hash_to_properties(:from_hpp                     => true,
+                                            :token                        => response.token,
+                                            :payment_processor_account_id => payment_processor_account_id)
           payment_external_key = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :payment_external_key)
           transaction_external_key = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :transaction_external_key)
 
           kb_payment_method = (@kb_apis.payment_api.get_account_payment_methods(kb_account_id, false, [], jcontext).find { |pm| pm.plugin_name == 'killbill-paypal-express' })
-          payment = @kb_apis.payment_api
-                            .create_purchase(kb_account.send(:__instance_object__),
-                                             kb_payment_method.id,
-                                             nil,
-                                             amount,
-                                             currency,
-                                             payment_external_key,
-                                             transaction_external_key,
-                                             custom_props,
-                                             jcontext)
+
+          auth_mode = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :auth_mode)
+          # By default, the SALE mode is used.
+          if auth_mode
+            payment = @kb_apis.payment_api
+                          .create_authorization(kb_account.send(:__instance_object__),
+                                                kb_payment_method.id,
+                                                nil,
+                                                amount,
+                                                currency,
+                                                payment_external_key,
+                                                transaction_external_key,
+                                                custom_props,
+                                                jcontext)
+          else
+            payment = @kb_apis.payment_api
+                          .create_purchase(kb_account.send(:__instance_object__),
+                                           kb_payment_method.id,
+                                           nil,
+                                           amount,
+                                           currency,
+                                           payment_external_key,
+                                           transaction_external_key,
+                                           custom_props,
+                                           jcontext)
+          end
 
           descriptor.properties << build_property('kb_payment_id', payment.id)
           descriptor.properties << build_property('kb_payment_external_key', payment.external_key)
@@ -318,11 +263,11 @@ module Killbill #:nodoc:
         @response_model.last_token(kb_account_id, kb_tenant_id)
       end
 
-      def find_payer_id(token, kb_account_id, kb_tenant_id, options = {})
+      def find_payer_id(token, kb_account_id, kb_tenant_id, payment_processor_account_id)
         raise 'Could not find the payer_id: the token is missing' if token.blank?
 
         # Go to Paypal to get the Payer id (GetExpressCheckoutDetails call)
-        payment_processor_account_id = options[:payment_processor_account_id] || :default
+        payment_processor_account_id = payment_processor_account_id || :default
         gateway                      = lookup_gateway(payment_processor_account_id, kb_tenant_id)
         gw_response                  = gateway.details_for(token)
         response, transaction        = save_response_and_transaction(gw_response, :details_for, kb_account_id, kb_tenant_id, payment_processor_account_id)
@@ -353,6 +298,7 @@ module Killbill #:nodoc:
         options = {}
         options[:return_url] = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :return_url)
         options[:cancel_return_url] = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :cancel_return_url)
+        options[:payment_processor_account_id] = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :payment_processor_account_id)
 
         max_amount_value = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :max_amount)
         if max_amount_value
@@ -373,6 +319,99 @@ module Killbill #:nodoc:
 
         response
       end
+
+      def authorize_or_purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, is_authorize = false)
+        payment_processor_account_id = find_value_from_properties(properties, 'payment_processor_account_id')
+        transaction_type = is_authorize ? :AUTHORIZE : :PURCHASE
+        api_call_type = is_authorize ? :authorize : :purchase
+
+        # Callback from the plugin itself (HPP flow)
+        if find_value_from_properties(properties, 'from_hpp') == 'true'
+          token = find_value_from_properties(properties, 'token')
+
+          response = @response_model.create(:api_call                     => :build_form_descriptor,
+                                            :kb_account_id                => kb_account_id,
+                                            :kb_payment_id                => kb_payment_id,
+                                            :kb_payment_transaction_id    => kb_payment_transaction_id,
+                                            :transaction_type             => transaction_type,
+                                            :authorization                => token,
+                                            :payment_processor_account_id => payment_processor_account_id,
+                                            :kb_tenant_id                 => context.tenant_id,
+                                            :success                      => true,
+                                            :created_at                   => Time.now.utc,
+                                            :updated_at                   => Time.now.utc,
+                                            :message                      => { :payment_plugin_status => :PENDING }.to_json)
+          transaction          = response.to_transaction_info_plugin(nil)
+          transaction.amount   = amount
+          transaction.currency = currency
+          transaction
+        else
+          options = {}
+          add_required_options(kb_payment_transaction_id, kb_payment_method_id, context, options)
+
+          # We have a baid on file
+          if options[:token]
+            if is_authorize
+              gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
+                # Can't use default implementation: the purchase signature is for one-off payments only
+                gateway.authorize_reference_transaction(amount_in_cents, options)
+              end
+            else
+              gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
+                # Can't use default implementation: the purchase signature is for one-off payments only
+                gateway.reference_transaction(amount_in_cents, options)
+              end
+            end
+          else
+            # One-off payment
+            options[:token] = find_value_from_properties(properties, 'token') || find_last_token(kb_account_id, context.tenant_id)
+            if is_authorize
+              gateway_call_proc  = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
+                gateway.authorize(amount_in_cents, options)
+              end
+            else
+              gateway_call_proc  = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
+                gateway.purchase(amount_in_cents, options)
+              end
+            end
+          end
+
+          # Find the payment_processor_id if not provided
+          payment_processor_account_id ||= find_payment_processor_id_from_initial_call(kb_account_id, context.tenant_id, options[:token])
+          options[:payment_processor_account_id] = payment_processor_account_id
+
+          # Populate the Payer id if missing
+          options[:payer_id] = find_value_from_properties(properties, 'payer_id')
+          begin
+            options[:payer_id] ||= find_payer_id(options[:token],
+                                                 kb_account_id,
+                                                 context.tenant_id,
+                                                 payment_processor_account_id)
+          rescue => e
+            # Maybe invalid token?
+            response = @response_model.create(:api_call                     => api_call_type,
+                                              :kb_account_id                => kb_account_id,
+                                              :kb_payment_id                => kb_payment_id,
+                                              :kb_payment_transaction_id    => kb_payment_transaction_id,
+                                              :transaction_type             => transaction_type,
+                                              :authorization                => nil,
+                                              :payment_processor_account_id => payment_processor_account_id,
+                                              :kb_tenant_id                 => context.tenant_id,
+                                              :success                      => false,
+                                              :created_at                   => Time.now.utc,
+                                              :updated_at                   => Time.now.utc,
+                                              :message                      => { :payment_plugin_status => :CANCELED, :exception_class => e.class.to_s, :exception_message => e.message }.to_json)
+            return response.to_transaction_info_plugin(nil)
+          end
+
+          properties = merge_properties(properties, options)
+          dispatch_to_gateways(api_call_type, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc)
+        end
+      end
+
+      def find_payment_processor_id_from_initial_call(kb_account_id, kb_tenant_id, token)
+        @response_model.initial_payment_account_processor_id kb_account_id, kb_tenant_id, token
+      end
     end
   end
 end

data/lib/paypal_express/models/response.rb

@@ -67,6 +67,16 @@ module Killbill #:nodoc:
         response.nil? ? nil : response.token
       end
 
+      def self.initial_payment_account_processor_id(kb_account_id, kb_tenant_id, token)
+        return nil if token.blank?
+        response = where(:api_call => 'initiate_express_checkout',
+                         :success => true,
+                         :kb_account_id => kb_account_id,
+                         :kb_tenant_id => kb_tenant_id,
+                         :token => token).last
+        response.nil? ? nil : response.payment_processor_account_id
+      end
+
       def to_transaction_info_plugin(transaction=nil)
         t_info_plugin = super(transaction)
 

data/pom.xml

@@ -26,7 +26,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>paypal-express-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>4.1.2</version>
+    <version>4.1.3</version>
     <name>paypal-express-plugin</name>
     <url>http://github.com/killbill/killbill-paypal-express-plugin</url>
     <description>Plugin for accessing Paypal Express Checkout as a payment gateway</description>

data/spec/paypal_express/remote/baid_spec.rb

@@ -1,53 +1,12 @@
 require 'spec_helper'
+require_relative 'build_plugin_helpers'
+require_relative 'baid_spec_helpers'
 
 ActiveMerchant::Billing::Base.mode = :test
 
-describe Killbill::PaypalExpress::PaymentPlugin do
-
-  include ::Killbill::Plugin::ActiveMerchant::RSpec
-
-  # Share the BAID
-  before(:all) do
-    @plugin = build_plugin(::Killbill::PaypalExpress::PaymentPlugin, 'paypal_express')
-    svcs = @plugin.kb_apis.proxied_services
-    svcs[:payment_api] = PaypalExpressJavaPaymentApi.new(@plugin)
-    @plugin.kb_apis = ::Killbill::Plugin::KillbillApi.new('paypal_express', svcs)
-    @plugin.start_plugin
-
-    @call_context = build_call_context
-
-    @properties = []
-    @amount = BigDecimal.new('100')
-    @currency = 'USD'
-
-    kb_account_id = SecureRandom.uuid
-    external_key, kb_account_id = create_kb_account(kb_account_id, @plugin.kb_apis.proxied_services[:account_user_api])
-
-    # Initiate the setup process
-    response = create_token(kb_account_id, @call_context.tenant_id)
-    token = response.token
-    print "\nPlease go to #{@plugin.to_express_checkout_url(response, @call_context.tenant_id)} to proceed and press any key to continue...
-Note: you need to log-in with a paypal sandbox account (create one here: https://developer.paypal.com/webapps/developer/applications/accounts)\n"
-    $stdin.gets
-
-    # Complete the setup process
-    @properties << build_property('token', token)
-    @pm = create_payment_method(::Killbill::PaypalExpress::PaypalExpressPaymentMethod, kb_account_id, @call_context.tenant_id, @properties)
-
-    # Verify our table directly. Note that @pm.token is the baid
-    payment_methods = ::Killbill::PaypalExpress::PaypalExpressPaymentMethod.from_kb_account_id_and_token(@pm.token, kb_account_id, @call_context.tenant_id)
-    payment_methods.size.should == 1
-    payment_method = payment_methods.first
-    payment_method.should_not be_nil
-    payment_method.paypal_express_payer_id.should_not be_nil
-    payment_method.token.should == @pm.token
-    payment_method.kb_payment_method_id.should == @pm.kb_payment_method_id
-  end
-
+shared_examples 'baid_spec_common' do
   before(:each) do
     ::Killbill::PaypalExpress::PaypalExpressTransaction.delete_all
-    ::Killbill::PaypalExpress::PaypalExpressResponse.delete_all
-
     kb_payment_id = SecureRandom.uuid
     1.upto(6) do
       @kb_payment = @plugin.kb_apis.proxied_services[:payment_api].add_payment(kb_payment_id)
@@ -70,6 +29,7 @@ Note: you need to log-in with a paypal sandbox account (create one here: https:/
     payment_infos[0].status.should == :PROCESSED
     payment_infos[0].gateway_error.should == 'Success'
     payment_infos[0].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
 
     # Try a full refund
     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)
@@ -87,6 +47,7 @@ Note: you need to log-in with a paypal sandbox account (create one here: https:/
     payment_infos[0].status.should == :PROCESSED
     payment_infos[0].gateway_error.should == 'Success'
     payment_infos[0].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
     payment_infos[1].kb_payment_id.should == @kb_payment.id
     payment_infos[1].transaction_type.should == :REFUND
     payment_infos[1].amount.should == @amount
@@ -94,6 +55,7 @@ Note: you need to log-in with a paypal sandbox account (create one here: https:/
     payment_infos[1].status.should == :PROCESSED
     payment_infos[1].gateway_error.should == 'Success'
     payment_infos[1].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[1].properties, 'payment_processor_account_id').should == @payment_processor_account_id
   end
 
   it 'should be able to auth, capture and refund' do
@@ -112,6 +74,7 @@ Note: you need to log-in with a paypal sandbox account (create one here: https:/
     payment_infos[0].status.should == :PROCESSED
     payment_infos[0].gateway_error.should == 'Success'
     payment_infos[0].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
 
     # Try multiple partial captures
     partial_capture_amount = BigDecimal.new('10')
@@ -131,6 +94,7 @@ Note: you need to log-in with a paypal sandbox account (create one here: https:/
       payment_infos[i].status.should == :PROCESSED
       payment_infos[i].gateway_error.should == 'Success'
       payment_infos[i].gateway_error_code.should be_nil
+      find_value_from_properties(payment_infos[i].properties, 'payment_processor_account_id').should == @payment_processor_account_id
     end
 
     # Try a partial refund
@@ -149,6 +113,7 @@ Note: you need to log-in with a paypal sandbox account (create one here: https:/
     payment_infos[4].status.should == :PROCESSED
     payment_infos[4].gateway_error.should == 'Success'
     payment_infos[4].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[4].properties, 'payment_processor_account_id').should == @payment_processor_account_id
 
     # Try to capture again
     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)
@@ -166,6 +131,7 @@ Note: you need to log-in with a paypal sandbox account (create one here: https:/
     payment_infos[5].status.should == :PROCESSED
     payment_infos[5].gateway_error.should == 'Success'
     payment_infos[5].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[5].properties, 'payment_processor_account_id').should == @payment_processor_account_id
   end
 
   it 'should be able to auth and void' do
@@ -184,6 +150,7 @@ Note: you need to log-in with a paypal sandbox account (create one here: https:/
     payment_infos[0].status.should == :PROCESSED
     payment_infos[0].gateway_error.should == 'Success'
     payment_infos[0].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
 
     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 eq(:PROCESSED), payment_response.gateway_error
@@ -199,6 +166,7 @@ Note: you need to log-in with a paypal sandbox account (create one here: https:/
     payment_infos[0].status.should == :PROCESSED
     payment_infos[0].gateway_error.should == 'Success'
     payment_infos[0].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
     payment_infos[1].kb_payment_id.should == @kb_payment.id
     payment_infos[1].transaction_type.should == :VOID
     payment_infos[1].amount.should be_nil
@@ -206,6 +174,7 @@ Note: you need to log-in with a paypal sandbox account (create one here: https:/
     payment_infos[1].status.should == :PROCESSED
     payment_infos[1].gateway_error.should == 'Success'
     payment_infos[1].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[1].properties, 'payment_processor_account_id').should == @payment_processor_account_id
   end
 
   it 'should be able to auth, partial capture and void' do
@@ -224,6 +193,7 @@ Note: you need to log-in with a paypal sandbox account (create one here: https:/
     payment_infos[0].status.should == :PROCESSED
     payment_infos[0].gateway_error.should == 'Success'
     payment_infos[0].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
 
     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)
@@ -241,6 +211,7 @@ Note: you need to log-in with a paypal sandbox account (create one here: https:/
     payment_infos[1].status.should == :PROCESSED
     payment_infos[1].gateway_error.should == 'Success'
     payment_infos[1].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[1].properties, 'payment_processor_account_id').should == @payment_processor_account_id
 
     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 eq(:PROCESSED), payment_response.gateway_error
@@ -256,32 +227,57 @@ Note: you need to log-in with a paypal sandbox account (create one here: https:/
     payment_infos[2].status.should == :PROCESSED
     payment_infos[2].gateway_error.should == 'Success'
     payment_infos[2].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[2].properties, 'payment_processor_account_id').should == @payment_processor_account_id
   end
 
   it 'should generate forms correctly' do
     context = @plugin.kb_apis.create_context(@call_context.tenant_id)
-    fields  = @plugin.hash_to_properties(
-                 :order_id => '1234',
-                 :amount   => 12,
-              )
+    fields = @plugin.hash_to_properties(
+        :order_id => '1234',
+        :amount => 12
+    )
 
     properties = @plugin.hash_to_properties(
-      :create_pending_payment => false
+        :create_pending_payment => false
     )
 
     form = @plugin.build_form_descriptor(@pm.kb_account_id, fields, properties, context)
 
     form.kb_account_id.should == @pm.kb_account_id
-    form.form_method.should   == 'GET'
+    form.form_method.should == 'GET'
     form.form_url.should start_with('https://www.sandbox.paypal.com/cgi-bin/webscr')
   end
 
-  private
+end
+
+describe Killbill::PaypalExpress::PaymentPlugin do
+  include ::Killbill::Plugin::ActiveMerchant::RSpec
+  include ::Killbill::PaypalExpress::BuildPluginHelpers
+  include ::Killbill::PaypalExpress::BaidSpecHelpers
+
+  context 'baid test with a single account' do
+    # Share the BAID
+    before(:all) do
+      # delete once here because we need to keep the initial response for later tests to find the payment processor account id
+      ::Killbill::PaypalExpress::PaypalExpressResponse.delete_all
+      @payment_processor_account_id = 'default'
+      @plugin = build_start_paypal_plugin
+      baid_setup
+    end
+
+    include_examples 'baid_spec_common'
+  end
+
+  context 'baid tests with multiple accounts' do
+    # Share the BAID
+    before(:all) do
+      # delete once here because we need to keep the initial response for later tests to find the payment processor account id
+      ::Killbill::PaypalExpress::PaypalExpressResponse.delete_all
+      @payment_processor_account_id = 'paypal_test_account'
+      @plugin = build_start_paypal_plugin @payment_processor_account_id
+      baid_setup @payment_processor_account_id
+    end
 
-  def create_token(kb_account_id, kb_tenant_id)
-    private_plugin = ::Killbill::PaypalExpress::PrivatePaymentPlugin.new
-    response       = private_plugin.initiate_express_checkout(kb_account_id, kb_tenant_id)
-    response.success.should be_true
-    response
+    include_examples 'baid_spec_common'
   end
 end