killbill-paypal-express 4.0.0 → 4.1.0

data/spec/paypal_express/remote/hpp_spec.rb

@@ -0,0 +1,256 @@
+require 'spec_helper'
+
+ActiveMerchant::Billing::Base.mode = :test
+
+describe Killbill::PaypalExpress::PaymentPlugin do
+
+  include ::Killbill::Plugin::ActiveMerchant::RSpec
+
+  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
+
+    @amount = BigDecimal.new('100')
+    @currency = 'USD'
+    @form_fields  = @plugin.hash_to_properties(
+        :order_id => '1234',
+        :amount   => @amount,
+        :currency => @currency
+    )
+
+    kb_account_id = SecureRandom.uuid
+    create_kb_account(kb_account_id, @plugin.kb_apis.proxied_services[:account_user_api])
+
+    @pm = create_payment_method(::Killbill::PaypalExpress::PaypalExpressPaymentMethod, kb_account_id, @call_context.tenant_id)
+    verify_payment_method
+  end
+
+  before(:each) do
+    ::Killbill::PaypalExpress::PaypalExpressTransaction.delete_all
+    ::Killbill::PaypalExpress::PaypalExpressResponse.delete_all
+  end
+
+  it 'should generate forms correctly' do
+    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 0
+    ::Killbill::PaypalExpress::PaypalExpressResponse.count.should == 0
+
+    # Verify the payment cannot go through without the token
+    purchase_with_missing_token
+
+    # Verify multiple payments can be triggered for the same payment method
+    n = 2
+    1.upto(n) do
+      form = @plugin.build_form_descriptor(@pm.kb_account_id, @form_fields, [], @call_context)
+      validate_form(form)
+      validate_nil_form_property(form, 'kb_payment_id')
+      validate_nil_form_property(form, 'kb_transaction_external_key')
+      token = validate_form_property(form, 'token')
+
+      # Verify no payment was created in Kill Bill
+      @plugin.kb_apis.proxied_services[:payment_api].payments.should be_empty
+
+      properties = []
+      properties << build_property('token', token)
+
+      # Verify the payment cannot go through until the token is validated
+      purchase_with_invalid_token(properties)
+
+      validate_token(form)
+
+      purchase_and_refund(SecureRandom.uuid, SecureRandom.uuid, properties)
+
+      # Verify no extra payment was created in Kill Bill by the plugin
+      @plugin.kb_apis.proxied_services[:payment_api].payments.should be_empty
+
+      # Verify the token cannot be re-used
+      subsequent_purchase(properties)
+
+      # Verify no token/baid was stored
+      verify_payment_method
+    end
+
+    # Each loop triggers one successful purchase and one successful refund
+    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 2 * n
+    ::Killbill::PaypalExpress::PaypalExpressResponse.count.should == 1 + 8 * n
+  end
+
+  it 'should generate forms with pending payments correctly' do
+    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 0
+    ::Killbill::PaypalExpress::PaypalExpressResponse.count.should == 0
+
+    # Verify the payment cannot go through without the token
+    purchase_with_missing_token
+
+    # Verify multiple payments can be triggered for the same payment method
+    n = 2
+    1.upto(n) do |i|
+      payment_external_key = SecureRandom.uuid
+      properties = @plugin.hash_to_properties(
+          :transaction_external_key => payment_external_key,
+          :create_pending_payment => true
+      )
+
+      form = @plugin.build_form_descriptor(@pm.kb_account_id, @form_fields, properties, @call_context)
+      validate_form(form)
+      kb_payment_id = validate_form_property(form, 'kb_payment_id')
+      validate_form_property(form, 'kb_transaction_external_key', payment_external_key)
+      token = validate_form_property(form, 'token')
+
+      # Verify the payment was created in Kill Bill
+      @plugin.kb_apis.proxied_services[:payment_api].payments.size.should == i
+      @plugin.kb_apis.proxied_services[:payment_api].get_payment(kb_payment_id).transactions.first.external_key.should == payment_external_key
+
+      # Verify GET API
+      payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, [], @call_context)
+      payment_infos.size.should == 1
+      payment_infos[0].kb_payment_id.should == kb_payment_id
+      payment_infos[0].transaction_type.should == :PURCHASE
+      payment_infos[0].amount.should be_nil
+      payment_infos[0].currency.should be_nil
+      payment_infos[0].status.should == :PENDING
+      payment_infos[0].gateway_error.should == '{"payment_plugin_status":"PENDING"}'
+      payment_infos[0].gateway_error_code.should be_nil
+
+      properties = []
+      properties << build_property('token', token)
+
+      # Verify the payment cannot go through until the token is validated
+      purchase_with_invalid_token(properties)
+
+      validate_token(form)
+
+      purchase_and_refund(kb_payment_id, payment_external_key, properties)
+
+      # Verify no extra payment was created in Kill Bill by the plugin
+      @plugin.kb_apis.proxied_services[:payment_api].payments.size.should == i
+
+      # Verify the token cannot be re-used
+      subsequent_purchase(properties)
+
+      # Verify no token/baid was stored
+      verify_payment_method
+    end
+
+    # Each loop triggers one successful purchase and one successful refund
+    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 2 * n
+    ::Killbill::PaypalExpress::PaypalExpressResponse.count.should == 1 + 9 * n
+  end
+
+  private
+
+  def validate_form(form)
+    form.kb_account_id.should == @pm.kb_account_id
+    form.form_url.should start_with('https://www.sandbox.paypal.com/cgi-bin/webscr')
+    form.form_method.should == 'GET'
+  end
+
+  def validate_nil_form_property(form, key)
+    key_properties = form.properties.select { |prop| prop.key == key }
+    key_properties.size.should == 0
+  end
+
+  def validate_form_property(form, key, value=nil)
+    key_properties = form.properties.select { |prop| prop.key == key }
+    key_properties.size.should == 1
+    key = key_properties.first.value
+    value.nil? ? key.should_not(be_nil) : key.should == value
+    key
+  end
+
+  def validate_token(form)
+    print "\nPlease go to #{form.form_url} 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
+  end
+
+  def purchase_and_refund(kb_payment_id, purchase_payment_external_key, purchase_properties)
+    # Trigger the purchase
+    payment_response = @plugin.purchase_payment(@pm.kb_account_id, kb_payment_id, purchase_payment_external_key, @pm.kb_payment_method_id, @amount, @currency, purchase_properties, @call_context)
+    payment_response.status.should eq(:PROCESSED), payment_response.gateway_error
+    payment_response.amount.should == @amount
+    payment_response.transaction_type.should == :PURCHASE
+
+    # Verify GET API
+    payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, [], @call_context)
+    payment_infos.size.should == 1
+    payment_infos[0].kb_payment_id.should == kb_payment_id
+    payment_infos[0].transaction_type.should == :PURCHASE
+    payment_infos[0].amount.should == @amount
+    payment_infos[0].currency.should == @currency
+    payment_infos[0].status.should == :PROCESSED
+    payment_infos[0].gateway_error.should == 'Success'
+    payment_infos[0].gateway_error_code.should be_nil
+
+    # Try a full refund
+    refund_response = @plugin.refund_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, [], @call_context)
+    refund_response.status.should eq(:PROCESSED), refund_response.gateway_error
+    refund_response.amount.should == @amount
+    refund_response.transaction_type.should == :REFUND
+
+    # Verify GET API
+    payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, [], @call_context)
+    payment_infos.size.should == 2
+    payment_infos[0].kb_payment_id.should == kb_payment_id
+    payment_infos[0].transaction_type.should == :PURCHASE
+    payment_infos[0].amount.should == @amount
+    payment_infos[0].currency.should == @currency
+    payment_infos[0].status.should == :PROCESSED
+    payment_infos[0].gateway_error.should == 'Success'
+    payment_infos[0].gateway_error_code.should be_nil
+    payment_infos[1].kb_payment_id.should.should == kb_payment_id
+    payment_infos[1].transaction_type.should == :REFUND
+    payment_infos[1].amount.should == @amount
+    payment_infos[1].currency.should == @currency
+    payment_infos[1].status.should == :PROCESSED
+    payment_infos[1].gateway_error.should == 'Success'
+    payment_infos[1].gateway_error_code.should be_nil
+  end
+
+  def purchase_with_missing_token
+    failed_purchase([], :CANCELED, 'Could not find the payer_id: the token is missing', 'RuntimeError')
+  end
+
+  def purchase_with_invalid_token(purchase_properties)
+    failed_purchase(purchase_properties, :CANCELED, "Could not find the payer_id for token #{properties_to_hash(purchase_properties)[:token]}", 'RuntimeError')
+  end
+
+  def subsequent_purchase(purchase_properties)
+    failed_purchase(purchase_properties, :ERROR, 'A successful transaction has already been completed for this token.')
+  end
+
+  def failed_purchase(purchase_properties, status, msg, gateway_error_code=nil)
+    kb_payment_id = SecureRandom.uuid
+
+    payment_response = @plugin.purchase_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, purchase_properties, @call_context)
+    payment_response.status.should eq(status), payment_response.gateway_error
+    payment_response.amount.should be_nil
+    payment_response.transaction_type.should == :PURCHASE
+
+    # Verify GET API
+    payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, [], @call_context)
+    payment_infos.size.should == 1
+    payment_infos[0].kb_payment_id.should == kb_payment_id
+    payment_infos[0].transaction_type.should == :PURCHASE
+    payment_infos[0].amount.should be_nil
+    payment_infos[0].currency.should be_nil
+    payment_infos[0].status.should == status
+    payment_infos[0].gateway_error.should == msg
+    payment_infos[0].gateway_error_code.should == gateway_error_code
+  end
+
+  def verify_payment_method
+    # Verify our table directly
+    payment_methods = ::Killbill::PaypalExpress::PaypalExpressPaymentMethod.from_kb_account_id(@pm.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 be_nil
+    payment_method.token.should be_nil
+    payment_method.kb_payment_method_id.should == @pm.kb_payment_method_id
+  end
+end

data/spec/spec_helper.rb

@@ -22,3 +22,23 @@ ActiveRecord::Base.establish_connection(
 # Create the schema
 require File.expand_path(File.dirname(__FILE__) + '../../db/schema.rb')
 
+class PaypalExpressJavaPaymentApi < ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaPaymentApi
+
+  def initialize(plugin)
+    super()
+    @plugin = plugin
+  end
+
+  def get_account_payment_methods(kb_account_id, plugin_info, properties, context)
+    [OpenStruct.new(:plugin_name => 'killbill-paypal-express', :id => SecureRandom.uuid)]
+  end
+
+  def create_purchase(kb_account, kb_payment_method_id, kb_payment_id, amount, currency, payment_external_key, payment_transaction_external_key, properties, context)
+    kb_payment = add_payment(kb_payment_id || SecureRandom.uuid, SecureRandom.uuid, payment_transaction_external_key, :PURCHASE)
+
+    rcontext = context.to_ruby(context)
+    @plugin.purchase_payment(kb_account.id, kb_payment.id, kb_payment.transactions.last.id, kb_payment_method_id, amount, currency, properties, rcontext)
+
+    kb_payment
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -87,11 +87,17 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.5'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.5'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -100,12 +106,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.11
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.11
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -262,6 +268,20 @@ dependencies:
         version: '1.1'
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: jdbc-postgres
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '9.4'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '9.4'
+  prerelease: false
+  type: :development
 description: Kill Bill payment plugin for Paypal Express Checkout.
 email: killbilling-users@googlegroups.com
 executables: []
@@ -288,6 +308,7 @@ files:
 - lib/paypal_express.rb
 - lib/paypal_express/api.rb
 - lib/paypal_express/application.rb
+- lib/paypal_express/ext/active_merchant/active_merchant.rb
 - lib/paypal_express/models/payment_method.rb
 - lib/paypal_express/models/response.rb
 - lib/paypal_express/models/transaction.rb
@@ -297,7 +318,8 @@ files:
 - pom.xml
 - release.sh
 - spec/paypal_express/base_plugin_spec.rb
-- spec/paypal_express/remote/integration_spec.rb
+- spec/paypal_express/remote/baid_spec.rb
+- spec/paypal_express/remote/hpp_spec.rb
 - spec/spec_helper.rb
 homepage: http://killbill.io
 licenses:

data/spec/paypal_express/remote/integration_spec.rb

@@ -1,135 +0,0 @@
-require 'spec_helper'
-
-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')
-    @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
-
-  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)
-    end
-  end
-
-  after(:each) do
-    @plugin.stop_plugin
-  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)
-    payment_response.status.should eq(:PROCESSED), payment_response.gateway_error
-    payment_response.amount.should == @amount
-    payment_response.transaction_type.should == :PURCHASE
-
-    # 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)
-    refund_response.status.should eq(:PROCESSED), refund_response.gateway_error
-    refund_response.amount.should == @amount
-    refund_response.transaction_type.should == :REFUND
-  end
-
-  it 'should be able to auth, capture and refund' 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.status.should eq(:PROCESSED), payment_response.gateway_error
-    payment_response.amount.should == @amount
-    payment_response.transaction_type.should == :AUTHORIZE
-
-    # Try multiple partial captures
-    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.status.should eq(:PROCESSED), payment_response.gateway_error
-      payment_response.amount.should == partial_capture_amount
-      payment_response.transaction_type.should == :CAPTURE
-    end
-
-    # Try a partial refund
-    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.status.should eq(:PROCESSED), refund_response.gateway_error
-    refund_response.amount.should == partial_capture_amount
-    refund_response.transaction_type.should == :REFUND
-
-    # 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)
-    payment_response.status.should eq(:PROCESSED), payment_response.gateway_error
-    payment_response.amount.should == partial_capture_amount
-    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.status.should eq(:PROCESSED), payment_response.gateway_error
-    payment_response.amount.should == @amount
-    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 eq(:PROCESSED), payment_response.gateway_error
-    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.status.should eq(:PROCESSED), payment_response.gateway_error
-    payment_response.amount.should == @amount
-    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.status.should eq(:PROCESSED), payment_response.gateway_error
-    payment_response.amount.should == partial_capture_amount
-    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 eq(:PROCESSED), payment_response.gateway_error
-    payment_response.transaction_type.should == :VOID
-  end
-
-  private
-
-  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
-  end
-end