killbill-paypal-express 1.5.3 → 1.5.4

data/NEWS

@@ -1,6 +1,9 @@
-1.5.3
+1.5.4
     Fix issue #1
 
+1.5.3
+    Fix issue #1 (did not fix it)
+
 1.5.2
     Don't populate the second_payment_reference_id (see killbill/killbill-analytics-plugin#11)
 

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

data/lib/paypal_express/api.rb

@@ -31,7 +31,7 @@ module Killbill::PaypalExpress
 
       if options[:reference_id].blank?
         payment_method = PaypalExpressPaymentMethod.from_kb_payment_method_id(kb_payment_method_id)
-        options[:reference_id] = payment_method.paypal_express_baid unless payment_method.paypal_express_baid.nil?
+        options[:reference_id] = payment_method.paypal_express_baid
       end
 
       # Go to Paypal (DoReferenceTransaction call)
@@ -93,6 +93,13 @@ module Killbill::PaypalExpress
         response = save_response_and_transaction paypal_express_baid_response, :create_billing_agreement
         return false unless response.success?
 
+        if response.billing_agreement_id.blank?
+          # If the baid isn't specified (invalid token, maybe expired?), we won't be able to charge that payment method
+          # See https://github.com/killbill/killbill-paypal-express-plugin/issues/1
+          logger.warn "No BAID returned by the CreateBillingAgreement call for token #{token} (account #{kb_account_id})"
+          return false
+        end
+
         payment_method.kb_payment_method_id = kb_payment_method_id
         payment_method.paypal_express_payer_id = payer_id
         payment_method.paypal_express_baid = response.billing_agreement_id

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.ning.killbill.ruby</groupId>
     <artifactId>paypal-express-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.3</version>
+    <version>1.5.4</version>
     <name>paypal-express-plugin</name>
     <url>http://github.com/killbill/killbill-paypal-express-plugin</url>
     <description>Plugin for accessing paypal as a payment gateway</description>

data/spec/paypal_express/remote/integration_spec.rb

@@ -13,15 +13,45 @@ describe Killbill::PaypalExpress::PaymentPlugin do
     @plugin.logger = logger
 
     @plugin.start_plugin
-
-    @pm = create_payment_method
   end
 
   after(:each) do
     @plugin.stop_plugin
   end
 
+  it 'should be able to handle bad payment methods' do
+    amount = BigDecimal.new("100")
+    currency = 'USD'
+    kb_account_id = SecureRandom.uuid
+    kb_payment_id = SecureRandom.uuid
+    kb_payment_method_id = SecureRandom.uuid
+
+    # Create a dummy token (but never go to PayPal to validate it). This will create a dummy payment method, with no baid
+    token = create_token(kb_account_id).token
+
+    # Verify the add payment method call fails
+    pm_kv_info = Killbill::Plugin::Model::PaymentMethodKVInfo.new
+    pm_kv_info.key = 'token'
+    pm_kv_info.value = token
+    info = Killbill::Plugin::Model::PaymentMethodPlugin.new
+    info.properties = [pm_kv_info]
+    # Note: the call will fail because the payer_id is nil
+    # There is another failure scenario described by https://github.com/killbill/killbill-paypal-express-plugin/issues/1 when
+    # the CreateBillingAgreement fails. We cannot easily reproduce it though unfortunately
+    @plugin.add_payment_method(kb_account_id, kb_payment_method_id, info).should be_false
+
+    # Update the payment method (still without a baid) with a dummy kb_payment_method_id
+    # This should never happen though
+    payment_method = Killbill::PaypalExpress::PaypalExpressPaymentMethod.from_kb_account_id_and_token(kb_account_id, token).update_attribute(:kb_payment_method_id, kb_payment_method_id)
+
+    # Attempt a payment - verify the call goes through, without throwing an exception (invalid state, but we still want PAYMENT_FAILURE, not PLUGIN_FAILURE)
+    payment_response = @plugin.process_payment kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency
+    payment_response.status.should == :ERROR
+  end
+
   it 'should be able to charge and refund' do
+    @pm = create_payment_method
+
     amount = BigDecimal.new("100")
     currency = 'USD'
     kb_payment_id = SecureRandom.uuid
@@ -93,13 +123,18 @@ describe Killbill::PaypalExpress::PaymentPlugin do
 
   private
 
+  def create_token(kb_account_id)
+    private_plugin = Killbill::PaypalExpress::PrivatePaymentPlugin.instance
+    response = private_plugin.initiate_express_checkout kb_account_id
+    response.success.should be_true
+    response
+  end
+
   def create_payment_method
     kb_account_id = SecureRandom.uuid
-    private_plugin = Killbill::PaypalExpress::PrivatePaymentPlugin.instance
 
     # Initiate the setup process
-    response = private_plugin.initiate_express_checkout kb_account_id
-    response.success.should be_true
+    response = create_token(kb_account_id)
     token = response.token
 
     print "\nPlease go to #{response.to_express_checkout_url} to proceed and press any key to continue...

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 1.5.3
   prerelease:
+  version: 1.5.4
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -212,9 +212,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
+      hash: 2
       version: !binary |-
         MA==
-      hash: 2
   none: false
 requirements: []
 rubyforge_project: