killbill-paypal-express 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d765db3a2813b2f3a9b7406027a484d10ea9e52f
-  data.tar.gz: 87064c5691db0b0e556d1e1213d434a0b57168d0
+  metadata.gz: 970b025716dc5389cd01ac25702ce931e3686296
+  data.tar.gz: faf8930e662f33a926a06c8d81c64740aa7c6d3c
 SHA512:
-  metadata.gz: 4abb317a565c2c7cf4b95b4df2f44f5b53aa9a525fb23c97e67817c621d88a58e97155546b955c571d395dc69c4d824a05c7b379cb82d778209a34ef084fdc28
-  data.tar.gz: 290092a38ab0a72fe4882e524273ea86da9f02838d99714678a74479f64d71464ed142be83210035d84dbc8e6957d819f6c174ff3b232b7e8885bdb74638fe43
+  metadata.gz: 3d3fbf7d32ed777c35a0da4d056a0bb2bbb0b328f3551d1381f1d8feb60cb96726051730cadec9321d345ce93f0fc57b52a5ea3ab8dc1eb8867c453454445fa1
+  data.tar.gz: 63c0b6a1eeeb30c105e2200b67394213a5d9f52bffe3e467bfcb2f2efbf3853132853ba01fe9b6ed398a66e9e7f27962bac5147d9e4ef8b1902405204684c1f1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-paypal-express (5.0.0)
+    killbill-paypal-express (5.0.1)
       actionpack (~> 4.1.0)
       actionview (~> 4.1.0)
       activemerchant (~> 1.53.0)

data/Jarfile.lock

@@ -13,6 +13,8 @@
 - org.kill-bill.commons:killbill-clock:jar:0.20
 - org.kill-bill.billing:killbill-util:jar:0.18.0
 - com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.5
+- org.bouncycastle:bcprov-jdk15on:jar:1.55
+- org.bouncycastle:bcpkix-jdk15on:jar:1.55
 - org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.23
 - org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
 - com.h2database:h2:jar:1.4.186
@@ -33,11 +35,9 @@
 - io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
 - org.jdbi:jdbi:jar:2.62
 - com.fasterxml.jackson.core:jackson-core:jar:2.4.5
-- org.bouncycastle:bcpkix-jdk15on:jar:1.54
 - org.apache.felix:org.apache.felix.framework:jar:4.4.1
 - org.joda:joda-money:jar:0.9
 - org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.23
-- org.bouncycastle:bcprov-jdk15on:jar:1.54
 - org.apache.shiro:shiro-core:jar:1.2.3
 - org.kill-bill.billing:killbill-internal-api:jar:0.18.0
 - org.kill-bill.billing:killbill-util:jar:tests:0.18.0

data/NEWS

@@ -1,3 +1,8 @@
+5.0.1
+    Always issue GetExpressCheckoutDetails during authorize or purchase to store payer info
+    Store PayPal error codes
+    Added private APIs for look-ups
+
 5.0.0
     Initial release for Kill Bill 0.18.x
 

data/VERSION

@@ -1 +1 @@
-5.0.0
+5.0.1

data/db/ddl.sql

@@ -114,5 +114,7 @@ CREATE TABLE `paypal_express_responses` (
   `kb_account_id` varchar(255) DEFAULT NULL,
   `kb_tenant_id` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
-  KEY `idx_paypal_express_responses_on_kb_payment_id_kb_tenant_id` (`kb_payment_id`, `kb_tenant_id`)
+  KEY `idx_paypal_express_responses_on_kb_payment_id_kb_tenant_id` (`kb_payment_id`, `kb_tenant_id`),
+  KEY `idx_paypal_express_responses_on_kb_account_id` (`kb_account_id`),
+  KEY `idx_paypal_express_responses_on_payer_email` (`payer_email`)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;

data/db/migrate/20161209090000_add_indexes.rb

@@ -0,0 +1,7 @@
+class AddIndexes < ActiveRecord::Migration
+
+  def change
+    add_index(:paypal_express_responses, :kb_account_id, :name => 'idx_paypal_express_responses_on_kb_account_id')
+    add_index(:paypal_express_responses, :payer_email, :name => 'idx_paypal_express_responses_on_payer_email')
+  end
+end

data/db/schema.rb

@@ -117,4 +117,6 @@ ActiveRecord::Schema.define(:version => 20151008153635) do
   end
 
   add_index(:paypal_express_responses, [:kb_payment_id, :kb_tenant_id], :name => 'idx_paypal_express_responses_on_kb_payment_id_kb_tenant_id')
+  add_index(:paypal_express_responses, :kb_account_id, :name => 'idx_paypal_express_responses_on_kb_account_id')
+  add_index(:paypal_express_responses, :payer_email, :name => 'idx_paypal_express_responses_on_payer_email')
 end

data/lib/paypal_express/api.rb

@@ -131,10 +131,10 @@ module Killbill #:nodoc:
           # Go to Paypal to get the Payer id (GetExpressCheckoutDetails call)
           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)
+          payer_info = get_payer_info(token, kb_account_id, context.tenant_id, payment_processor_account_id)
           options  = {
               :paypal_express_token         => token,
-              :paypal_express_payer_id      => payer_id,
+              :paypal_express_payer_id      => payer_info.payer_id,
               :payment_processor_account_id => payment_processor_account_id
           }
         end
@@ -281,19 +281,25 @@ 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, payment_processor_account_id)
-        raise 'Could not find the payer_id: the token is missing' if token.blank?
+      def get_payer_info(token,
+                         kb_account_id,
+                         kb_tenant_id,
+                         payment_processor_account_id,
+                         kb_payment_id = nil,
+                         kb_payment_transaction_id = nil,
+                         transaction_type = nil)
+        raise 'Could not retrieve the payer info: the token is missing' if token.blank?
 
         # Go to Paypal to get the Payer id (GetExpressCheckoutDetails call)
         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)
+        response, transaction        = save_response_and_transaction(gw_response, :details_for, kb_account_id, kb_tenant_id, payment_processor_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type)
 
         raise response.message unless response.success?
-        raise "Could not find the payer_id for token #{token}" if response.payer_id.blank?
+        raise "Could not retrieve the payer info for token #{token}" if response.payer_id.blank?
 
-        response.payer_id
+        response
       end
 
       def add_required_options(kb_payment_transaction_id, kb_payment_method_id, context, options)
@@ -396,13 +402,14 @@ module Killbill #:nodoc:
           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] = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :payer_id)
           begin
-            options[:payer_id] ||= find_payer_id(options[:token],
-                                                 kb_account_id,
-                                                 context.tenant_id,
-                                                 payment_processor_account_id)
+            payer_info = get_payer_info(options[:token],
+                                        kb_account_id,
+                                        context.tenant_id,
+                                        payment_processor_account_id,
+                                        kb_payment_id,
+                                        kb_payment_transaction_id,
+                                        transaction_type)
           rescue => e
             # Maybe invalid token?
             response = @response_model.create(:api_call                     => api_call_type,
@@ -419,6 +426,11 @@ module Killbill #:nodoc:
                                               :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
+          options[:payer_id] = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :payer_id)
+          if options[:payer_id].nil?
+            options[:payer_id] = payer_info.payer_id
+          end
+          options[:payer_email] = payer_info.payer_email
 
           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, nil, {:payer_id => options[:payer_id]})

data/lib/paypal_express/application.rb

@@ -103,3 +103,34 @@ get '/plugins/killbill-paypal-express/1.0/responses/:id', :provides => 'json' do
     status 404
   end
 end
+
+# curl -v http://127.0.0.1:9292/plugins/killbill-paypal-express/1.0/accounts/somebody@example.com
+get '/plugins/killbill-paypal-express/1.0/accounts/:email', :provides => 'json' do
+  if ids = ::Killbill::PaypalExpress::PaypalExpressResponse.uniq.where(:payer_email => params[:email]).pluck(:kb_account_id)
+    ids.to_json
+  else
+    status 404
+  end
+end
+
+# curl -v http://127.0.0.1:9292/plugins/killbill-paypal-express/1.0/account_external_keys/somebody@example.com?kb_tenant_id=some_uuid
+get '/plugins/killbill-paypal-express/1.0/account_external_keys/:email', :provides => 'json' do
+  if ids = ::Killbill::PaypalExpress::PaypalExpressResponse.uniq.where(:payer_email => params[:email]).pluck(:kb_account_id)
+    kb_tenant_id = request.GET['kb_tenant_id']
+    kb_tenant = request.env['killbill_tenant']
+    kb_tenant_id ||= kb_tenant.id.to_s unless kb_tenant.nil?
+
+    plugin(session).get_external_keys_for_accounts(ids, kb_tenant_id).to_json
+  else
+    status 404
+  end
+end
+
+# curl -v http://127.0.0.1:9292/plugins/killbill-paypal-express/1.0/payer_emails/41d95965-8213-4434-ac04-0f7dbe51988c
+get '/plugins/killbill-paypal-express/1.0/payer_emails/:kb_account_id', :provides => 'json' do
+  if emails = ::Killbill::PaypalExpress::PaypalExpressResponse.uniq.where(:kb_account_id => params[:kb_account_id]).where("payer_email IS NOT NULL").pluck(:payer_email)
+    emails.to_json
+  else
+    status 404
+  end
+end

data/lib/paypal_express/models/response.rb

@@ -6,6 +6,10 @@ module Killbill #:nodoc:
 
       has_one :paypal_express_transaction
 
+      def self.ignore_none(value)
+        value == 'none' ? nil : value
+      end
+
       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::PaypalExpress::PaypalExpressResponse)
         super(api_call,
               kb_account_id,
@@ -47,7 +51,7 @@ module Killbill #:nodoc:
                   :payment_info_exchangerate              => (extract(response, 'PaymentInfo', 'ExchangeRate') || extract(response, 'PaymentTransactionDetails', 'PaymentInfo', 'ExchangeRate')),
                   :payment_info_paymentstatus             => (extract(response, 'PaymentInfo', 'PaymentStatus') || extract(response, 'PaymentTransactionDetails', 'PaymentInfo', 'PaymentStatus')),
                   :payment_info_pendingreason             => (extract(response, 'PaymentInfo', 'PendingReason') || extract(response, 'PaymentTransactionDetails', 'PaymentInfo', 'PendingReason')),
-                  :payment_info_reasoncode                => (extract(response, 'PaymentInfo', 'ReasonCode') || extract(response, 'PaymentTransactionDetails', 'PaymentInfo', 'ReasonCode')),
+                  :payment_info_reasoncode                => (ignore_none(extract(response, 'PaymentInfo', 'ReasonCode')) || extract(response, 'PaymentTransactionDetails', 'PaymentInfo', 'ReasonCode') || extract(response, 'error_codes')),
                   :payment_info_protectioneligibility     => (extract(response, 'PaymentInfo', 'ProtectionEligibility') || extract(response, 'PaymentTransactionDetails', 'PaymentInfo', 'ProtectionEligibility')),
                   :payment_info_protectioneligibilitytype => (extract(response, 'PaymentInfo', 'ProtectionEligibilityType') || extract(response, 'PaymentTransactionDetails', 'PaymentInfo', 'ProtectionEligibilityType')),
                   :payment_info_shipamount                => (extract(response, 'PaymentInfo', 'ShipAmount') || extract(response, 'PaymentTransactionDetails', 'PaymentInfo', 'ShipAmount')),
@@ -85,6 +89,10 @@ module Killbill #:nodoc:
                                                                                                              :message => { :payment_plugin_status => :CANCELED, :exception_message => 'Token expired. Payment Canceled by Janitor.' }.to_json)
       end
 
+      def gateway_error_code
+        payment_info_reasoncode
+      end
+
       def to_transaction_info_plugin(transaction=nil)
         t_info_plugin = super(transaction)
 

data/lib/paypal_express/private_api.rb

@@ -36,6 +36,11 @@ module Killbill #:nodoc:
         gateway                      = gateway(payment_processor_account_id, kb_tenant_id)
         gateway.redirect_url_for(response.token)
       end
+
+      def get_external_keys_for_accounts(kb_account_ids, kb_tenant_id)
+        context = kb_apis.create_context(kb_tenant_id)
+        kb_account_ids.map {|id| kb_apis.account_user_api.get_account_by_id(id, context).external_key }
+      end
     end
   end
 end

data/pom.xml

@@ -26,7 +26,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>paypal-express-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>5.0.0</version>
+    <version>5.0.1</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/fixtures/DoExpressCheckoutPayment-duplicate.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:cc="urn:ebay:apis:CoreComponentTypes" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:ebl="urn:ebay:apis:eBLBaseComponents" xmlns:ed="urn:ebay:apis:EnhancedDataTypes" xmlns:ns="urn:ebay:api:PayPalAPI" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:wsse="http://schemas.xmlsoap.org/ws/2002/12/secext" xmlns:wsu="http://schemas.xmlsoap.org/ws/2002/07/utility" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SOAP-ENV:Header>
+    <Security xmlns="http://schemas.xmlsoap.org/ws/2002/12/secext" xsi:type="wsse:SecurityType"/>
+    <RequesterCredentials xmlns="urn:ebay:api:PayPalAPI" xsi:type="ebl:CustomSecurityHeaderType">
+      <Credentials xmlns="urn:ebay:apis:eBLBaseComponents" xsi:type="ebl:UserIdPasswordType">
+        <Username xsi:type="xs:string"/>
+        <Password xsi:type="xs:string"/>
+        <Signature xsi:type="xs:string"/>
+        <Subject xsi:type="xs:string"/>
+      </Credentials>
+    </RequesterCredentials>
+  </SOAP-ENV:Header>
+  <SOAP-ENV:Body id="_0">
+    <DoExpressCheckoutPaymentResponse xmlns="urn:ebay:api:PayPalAPI">
+      <Timestamp xmlns="urn:ebay:apis:eBLBaseComponents">2016-11-23T01:50:51Z</Timestamp>
+      <Ack xmlns="urn:ebay:apis:eBLBaseComponents">SuccessWithWarning</Ack>
+      <CorrelationID xmlns="urn:ebay:apis:eBLBaseComponents">cfce8071e839</CorrelationID>
+      <Errors xmlns="urn:ebay:apis:eBLBaseComponents" xsi:type="ebl:ErrorType">
+        <ShortMessage xsi:type="xs:string">Duplicate Request</ShortMessage>
+        <LongMessage xsi:type="xs:string">A successful transaction has already been completed for this token.</LongMessage>
+        <ErrorCode xsi:type="xs:token">11607</ErrorCode>
+        <SeverityCode xmlns="urn:ebay:apis:eBLBaseComponents">Warning</SeverityCode>
+      </Errors>
+      <Version xmlns="urn:ebay:apis:eBLBaseComponents">124</Version>
+      <Build xmlns="urn:ebay:apis:eBLBaseComponents">000000</Build>
+      <DoExpressCheckoutPaymentResponseDetails xmlns="urn:ebay:apis:eBLBaseComponents" xsi:type="ebl:DoExpressCheckoutPaymentResponseDetailsType">
+        <Token xsi:type="ebl:ExpressCheckoutTokenType">EC-MY_TOKEN</Token>
+        <PaymentInfo xsi:type="ebl:PaymentInfoType">
+          <TransactionID>3K289148GS508731G</TransactionID>
+          <ParentTransactionID xsi:type="ebl:TransactionId"/>
+          <ReceiptID/>
+          <TransactionType xsi:type="ebl:PaymentTransactionCodeType">express-checkout</TransactionType>
+          <PaymentType xsi:type="ebl:PaymentCodeType">instant</PaymentType>
+          <PaymentDate xsi:type="xs:dateTime">2016-11-23T01:50:43Z</PaymentDate>
+          <GrossAmount currencyID="USD" xsi:type="cc:BasicAmountType">100.00</GrossAmount>
+          <FeeAmount currencyID="USD" xsi:type="cc:BasicAmountType">3.20</FeeAmount>
+          <TaxAmount currencyID="USD" xsi:type="cc:BasicAmountType">0.00</TaxAmount>
+          <ExchangeRate xsi:type="xs:string"/>
+          <PaymentStatus xsi:type="ebl:PaymentStatusCodeType">Refunded</PaymentStatus>
+          <PendingReason xsi:type="ebl:PendingStatusCodeType">none</PendingReason>
+          <ReasonCode xsi:type="ebl:ReversalReasonCodeType">none</ReasonCode>
+          <ProtectionEligibility xsi:type="xs:string">Eligible</ProtectionEligibility>
+          <ProtectionEligibilityType xsi:type="xs:string">ItemNotReceivedEligible,UnauthorizedPaymentEligible</ProtectionEligibilityType>
+          <SellerDetails xsi:type="ebl:SellerDetailsType">
+            <SecureMerchantAccountID xsi:type="ebl:UserIDType">MY_MERCHANT_ID</SecureMerchantAccountID>
+          </SellerDetails>
+        </PaymentInfo>
+        <SuccessPageRedirectRequested xsi:type="xs:string">false</SuccessPageRedirectRequested>
+        <CoupledPaymentInfo xsi:type="ebl:CoupledPaymentInfoType"/>
+      </DoExpressCheckoutPaymentResponseDetails>
+    </DoExpressCheckoutPaymentResponse>
+  </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>

data/spec/fixtures/GetExpressCheckoutDetails-success.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:cc="urn:ebay:apis:CoreComponentTypes" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:ebl="urn:ebay:apis:eBLBaseComponents" xmlns:ed="urn:ebay:apis:EnhancedDataTypes" xmlns:ns="urn:ebay:api:PayPalAPI" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:wsse="http://schemas.xmlsoap.org/ws/2002/12/secext" xmlns:wsu="http://schemas.xmlsoap.org/ws/2002/07/utility" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <SOAP-ENV:Header>
+    <Security xmlns="http://schemas.xmlsoap.org/ws/2002/12/secext" xsi:type="wsse:SecurityType"/>
+    <RequesterCredentials xmlns="urn:ebay:api:PayPalAPI" xsi:type="ebl:CustomSecurityHeaderType">
+      <Credentials xmlns="urn:ebay:apis:eBLBaseComponents" xsi:type="ebl:UserIdPasswordType">
+        <Username xsi:type="xs:string"/>
+        <Password xsi:type="xs:string"/>
+        <Signature xsi:type="xs:string"/>
+        <Subject xsi:type="xs:string"/>
+      </Credentials>
+    </RequesterCredentials>
+  </SOAP-ENV:Header>
+  <SOAP-ENV:Body id="_0">
+    <GetExpressCheckoutDetailsResponse xmlns="urn:ebay:api:PayPalAPI">
+      <Timestamp xmlns="urn:ebay:apis:eBLBaseComponents">2016-11-23T01:50:39Z</Timestamp>
+      <Ack xmlns="urn:ebay:apis:eBLBaseComponents">Success</Ack>
+      <CorrelationID xmlns="urn:ebay:apis:eBLBaseComponents">bb9e0ee3a9d12</CorrelationID>
+      <Version xmlns="urn:ebay:apis:eBLBaseComponents">124</Version>
+      <Build xmlns="urn:ebay:apis:eBLBaseComponents">000000</Build>
+      <GetExpressCheckoutDetailsResponseDetails xmlns="urn:ebay:apis:eBLBaseComponents" xsi:type="ebl:GetExpressCheckoutDetailsResponseDetailsType">
+        <Token xsi:type="ebl:ExpressCheckoutTokenType">EC-MY_TOKEN</Token>
+        <PayerInfo xsi:type="ebl:PayerInfoType">
+          <Payer xsi:type="ebl:EmailAddressType">test@example.com</Payer>
+          <PayerID xsi:type="ebl:UserIDType">MY_PAYER_ID</PayerID>
+          <PayerStatus xsi:type="ebl:PayPalUserStatusCodeType">verified</PayerStatus>
+          <PayerName xsi:type="ebl:PersonNameType">
+            <Salutation xmlns="urn:ebay:apis:eBLBaseComponents"/>
+            <FirstName xmlns="urn:ebay:apis:eBLBaseComponents">test</FirstName>
+            <MiddleName xmlns="urn:ebay:apis:eBLBaseComponents"/>
+            <LastName xmlns="urn:ebay:apis:eBLBaseComponents">buyer</LastName>
+            <Suffix xmlns="urn:ebay:apis:eBLBaseComponents"/>
+          </PayerName>
+          <PayerCountry xsi:type="ebl:CountryCodeType">US</PayerCountry>
+          <PayerBusiness xsi:type="xs:string"/>
+          <Address xsi:type="ebl:AddressType">
+            <Name xsi:type="xs:string">test buyer</Name>
+            <Street1 xsi:type="xs:string">1 Main St</Street1>
+            <Street2 xsi:type="xs:string"/>
+            <CityName xsi:type="xs:string">San Jose</CityName>
+            <StateOrProvince xsi:type="xs:string">CA</StateOrProvince>
+            <Country xsi:type="ebl:CountryCodeType">US</Country>
+            <CountryName>United States</CountryName>
+            <PostalCode xsi:type="xs:string">95131</PostalCode>
+            <AddressOwner xsi:type="ebl:AddressOwnerCodeType">PayPal</AddressOwner>
+            <AddressStatus xsi:type="ebl:AddressStatusCodeType">Confirmed</AddressStatus>
+          </Address>
+        </PayerInfo>
+        <InvoiceID xsi:type="xs:string">1234</InvoiceID>
+        <BillingAgreementAcceptedStatus>false</BillingAgreementAcceptedStatus>
+        <PaymentDetails xsi:type="ebl:PaymentDetailsType">
+          <OrderTotal currencyID="USD" xsi:type="cc:BasicAmountType">100.00</OrderTotal>
+          <ItemTotal currencyID="USD" xsi:type="cc:BasicAmountType">100.00</ItemTotal>
+          <ShippingTotal currencyID="USD" xsi:type="cc:BasicAmountType">0.00</ShippingTotal>
+          <HandlingTotal currencyID="USD" xsi:type="cc:BasicAmountType">0.00</HandlingTotal>
+          <TaxTotal currencyID="USD" xsi:type="cc:BasicAmountType">0.00</TaxTotal>
+          <InvoiceID xsi:type="xs:string">1234</InvoiceID>
+          <ShipToAddress xsi:type="ebl:AddressType">
+            <Name xsi:type="xs:string">test buyer</Name>
+            <Street1 xsi:type="xs:string">1 Main St</Street1>
+            <Street2 xsi:type="xs:string"/>
+            <CityName xsi:type="xs:string">San Jose</CityName>
+            <StateOrProvince xsi:type="xs:string">CA</StateOrProvince>
+            <Country xsi:type="ebl:CountryCodeType">US</Country>
+            <CountryName>United States</CountryName>
+            <Phone xsi:type="xs:string"/>
+            <PostalCode xsi:type="xs:string">95131</PostalCode>
+            <AddressID xsi:type="xs:string"/>
+            <AddressOwner xsi:type="ebl:AddressOwnerCodeType">PayPal</AddressOwner>
+            <ExternalAddressID xsi:type="xs:string"/>
+            <AddressStatus xsi:type="ebl:AddressStatusCodeType">Confirmed</AddressStatus>
+            <AddressNormalizationStatus xsi:type="ebl:AddressNormalizationStatusCodeType">None</AddressNormalizationStatus>
+          </ShipToAddress>
+          <InsuranceTotal currencyID="USD" xsi:type="cc:BasicAmountType">0.00</InsuranceTotal>
+          <ShippingDiscount currencyID="USD" xsi:type="cc:BasicAmountType">0.00</ShippingDiscount>
+          <InsuranceOptionOffered xsi:type="xs:string">false</InsuranceOptionOffered>
+          <SellerDetails xsi:type="ebl:SellerDetailsType">
+            <PayPalAccountID xsi:type="xs:string">test-facilitator@example.com</PayPalAccountID>
+          </SellerDetails>
+          <PaymentRequestID xsi:type="xs:string"/>
+          <OrderURL xsi:type="xs:string"/>
+          <SoftDescriptor xsi:type="xs:string"/>
+        </PaymentDetails>
+        <CheckoutStatus xsi:type="xs:string">PaymentActionNotInitiated</CheckoutStatus>
+        <PaymentRequestInfo xsi:type="ebl:PaymentRequestInfoType"/>
+        <PaymentInfo xsi:type="ebl:PaymentInfoType">
+          <TransactionID/>
+          <ParentTransactionID xsi:type="ebl:TransactionId"/>
+          <ReceiptID/>
+          <TransactionType xsi:type="ebl:PaymentTransactionCodeType">none</TransactionType>
+          <PaymentType xsi:type="ebl:PaymentCodeType">none</PaymentType>
+          <ExchangeRate xsi:type="xs:string"/>
+          <PaymentStatus xsi:type="ebl:PaymentStatusCodeType">None</PaymentStatus>
+          <PendingReason xsi:type="ebl:PendingStatusCodeType">none</PendingReason>
+          <ReasonCode xsi:type="ebl:ReversalReasonCodeType">none</ReasonCode>
+          <SellerDetails xsi:type="ebl:SellerDetailsType"/>
+        </PaymentInfo>
+        <CartChangeTolerance xsi:type="xs:string"/>
+      </GetExpressCheckoutDetailsResponseDetails>
+    </GetExpressCheckoutDetailsResponse>
+  </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>

data/spec/paypal_express/remote/baid_spec.rb

@@ -23,14 +23,25 @@ shared_examples 'baid_spec_common' do
 
     # 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.size.should == 2
+    # details_for
     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].amount.should be_nil
+    payment_infos[0].currency.should be_nil
     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, 'payerId').should == payer_id
+    find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+    # purchase
+    payment_infos[1].kb_payment_id.should == @kb_payment.id
+    payment_infos[1].transaction_type.should == :PURCHASE
+    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
     find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
     find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
 
@@ -42,22 +53,34 @@ shared_examples 'baid_spec_common' do
 
     # 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.size.should == 3
+    # details_for
     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].amount.should be_nil
+    payment_infos[0].currency.should be_nil
     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
+    find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
+    find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+    # purchase
     payment_infos[1].kb_payment_id.should == @kb_payment.id
-    payment_infos[1].transaction_type.should == :REFUND
+    payment_infos[1].transaction_type.should == :PURCHASE
     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
+    find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
+    # refund
+    payment_infos[2].kb_payment_id.should == @kb_payment.id
+    payment_infos[2].transaction_type.should == :REFUND
+    payment_infos[2].amount.should == @amount
+    payment_infos[2].currency.should == @currency
+    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[1].properties, 'payment_processor_account_id').should == @payment_processor_account_id
   end
 
@@ -71,14 +94,25 @@ shared_examples 'baid_spec_common' do
 
     # 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.size.should == 2
+    # details_for
     payment_infos[0].kb_payment_id.should == @kb_payment.id
     payment_infos[0].transaction_type.should == :AUTHORIZE
-    payment_infos[0].amount.should == @amount
-    payment_infos[0].currency.should == @currency
+    payment_infos[0].amount.should be_nil
+    payment_infos[0].currency.should be_nil
     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, 'payerId').should == payer_id
+    find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+    # purchase
+    payment_infos[1].kb_payment_id.should == @kb_payment.id
+    payment_infos[1].transaction_type.should == :AUTHORIZE
+    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
     find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
     find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
 
@@ -92,15 +126,15 @@ shared_examples 'baid_spec_common' do
 
       # Verify GET API
       payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-      payment_infos.size.should == 1 + i
-      payment_infos[i].kb_payment_id.should == @kb_payment.id
-      payment_infos[i].transaction_type.should == :CAPTURE
-      payment_infos[i].amount.should == partial_capture_amount
-      payment_infos[i].currency.should == @currency
-      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
+      payment_infos.size.should == 2 + i
+      payment_infos[i + 1].kb_payment_id.should == @kb_payment.id
+      payment_infos[i + 1].transaction_type.should == :CAPTURE
+      payment_infos[i + 1].amount.should == partial_capture_amount
+      payment_infos[i + 1].currency.should == @currency
+      payment_infos[i + 1].status.should == :PROCESSED
+      payment_infos[i + 1].gateway_error.should == 'Success'
+      payment_infos[i + 1].gateway_error_code.should be_nil
+      find_value_from_properties(payment_infos[i + 1].properties, 'payment_processor_account_id').should == @payment_processor_account_id
     end
 
     # Try a partial refund
@@ -111,15 +145,15 @@ shared_examples 'baid_spec_common' do
 
     # Verify GET API
     payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-    payment_infos.size.should == 5
-    payment_infos[4].kb_payment_id.should == @kb_payment.id
-    payment_infos[4].transaction_type.should == :REFUND
-    payment_infos[4].amount.should == partial_capture_amount
-    payment_infos[4].currency.should == @currency
-    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
+    payment_infos.size.should == 6
+    payment_infos[5].kb_payment_id.should == @kb_payment.id
+    payment_infos[5].transaction_type.should == :REFUND
+    payment_infos[5].amount.should == partial_capture_amount
+    payment_infos[5].currency.should == @currency
+    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
 
     # 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)
@@ -129,15 +163,15 @@ shared_examples 'baid_spec_common' do
 
     # Verify GET API
     payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-    payment_infos.size.should == 6
-    payment_infos[5].kb_payment_id.should == @kb_payment.id
-    payment_infos[5].transaction_type.should == :CAPTURE
-    payment_infos[5].amount.should == partial_capture_amount
-    payment_infos[5].currency.should == @currency
-    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
+    payment_infos.size.should == 7
+    payment_infos[6].kb_payment_id.should == @kb_payment.id
+    payment_infos[6].transaction_type.should == :CAPTURE
+    payment_infos[6].amount.should == partial_capture_amount
+    payment_infos[6].currency.should == @currency
+    payment_infos[6].status.should == :PROCESSED
+    payment_infos[6].gateway_error.should == 'Success'
+    payment_infos[6].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[6].properties, 'payment_processor_account_id').should == @payment_processor_account_id
   end
 
   it 'should be able to auth and void' do
@@ -145,18 +179,31 @@ shared_examples 'baid_spec_common' do
     payment_response.status.should eq(:PROCESSED), payment_response.gateway_error
     payment_response.amount.should == @amount
     payment_response.transaction_type.should == :AUTHORIZE
+    payer_id = find_value_from_properties(payment_response.properties, 'payerId')
+    payer_id.should_not be_nil
 
     # 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.size.should == 2
+    # details_for
     payment_infos[0].kb_payment_id.should == @kb_payment.id
     payment_infos[0].transaction_type.should == :AUTHORIZE
-    payment_infos[0].amount.should == @amount
-    payment_infos[0].currency.should == @currency
+    payment_infos[0].amount.should be_nil
+    payment_infos[0].currency.should be_nil
     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
+    find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
+    find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+    # authorize
+    payment_infos[1].kb_payment_id.should == @kb_payment.id
+    payment_infos[1].transaction_type.should == :AUTHORIZE
+    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
+    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[1].id, @pm.kb_payment_method_id, @properties, @call_context)
     payment_response.status.should eq(:PROCESSED), payment_response.gateway_error
@@ -164,23 +211,35 @@ shared_examples 'baid_spec_common' do
 
     # 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.size.should == 3
+    # details_for
     payment_infos[0].kb_payment_id.should == @kb_payment.id
     payment_infos[0].transaction_type.should == :AUTHORIZE
-    payment_infos[0].amount.should == @amount
-    payment_infos[0].currency.should == @currency
+    payment_infos[0].amount.should be_nil
+    payment_infos[0].currency.should be_nil
     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
+    find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
+    find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+    # authorize
     payment_infos[1].kb_payment_id.should == @kb_payment.id
-    payment_infos[1].transaction_type.should == :VOID
-    payment_infos[1].amount.should be_nil
-    payment_infos[1].currency.should be_nil
+    payment_infos[1].transaction_type.should == :AUTHORIZE
+    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
     find_value_from_properties(payment_infos[1].properties, 'payment_processor_account_id').should == @payment_processor_account_id
+    # void
+    payment_infos[2].kb_payment_id.should == @kb_payment.id
+    payment_infos[2].transaction_type.should == :VOID
+    payment_infos[2].amount.should be_nil
+    payment_infos[2].currency.should be_nil
+    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 be able to auth, partial capture and void' do
@@ -188,17 +247,30 @@ shared_examples 'baid_spec_common' do
     payment_response.status.should eq(:PROCESSED), payment_response.gateway_error
     payment_response.amount.should == @amount
     payment_response.transaction_type.should == :AUTHORIZE
+    payer_id = find_value_from_properties(payment_response.properties, 'payerId')
+    payer_id.should_not be_nil
 
     # 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.size.should == 2
+    # details_for
     payment_infos[0].kb_payment_id.should == @kb_payment.id
     payment_infos[0].transaction_type.should == :AUTHORIZE
-    payment_infos[0].amount.should == @amount
-    payment_infos[0].currency.should == @currency
+    payment_infos[0].amount.should be_nil
+    payment_infos[0].currency.should be_nil
     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, 'payerId').should == payer_id
+    find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+    # authorize
+    payment_infos[1].kb_payment_id.should == @kb_payment.id
+    payment_infos[1].transaction_type.should == :AUTHORIZE
+    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
     find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
 
     partial_capture_amount = BigDecimal.new('10')
@@ -209,15 +281,15 @@ shared_examples 'baid_spec_common' do
 
     # 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[1].kb_payment_id.should == @kb_payment.id
-    payment_infos[1].transaction_type.should == :CAPTURE
-    payment_infos[1].amount.should == partial_capture_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
-    find_value_from_properties(payment_infos[1].properties, 'payment_processor_account_id').should == @payment_processor_account_id
+    payment_infos.size.should == 3
+    payment_infos[2].kb_payment_id.should == @kb_payment.id
+    payment_infos[2].transaction_type.should == :CAPTURE
+    payment_infos[2].amount.should == partial_capture_amount
+    payment_infos[2].currency.should == @currency
+    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
 
     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
@@ -225,15 +297,15 @@ shared_examples 'baid_spec_common' do
 
     # Verify GET API
     payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-    payment_infos.size.should == 3
-    payment_infos[2].kb_payment_id.should == @kb_payment.id
-    payment_infos[2].transaction_type.should == :VOID
-    payment_infos[2].amount.should be_nil
-    payment_infos[2].currency.should be_nil
-    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
+    payment_infos.size.should == 4
+    payment_infos[3].kb_payment_id.should == @kb_payment.id
+    payment_infos[3].transaction_type.should == :VOID
+    payment_infos[3].amount.should be_nil
+    payment_infos[3].currency.should be_nil
+    payment_infos[3].status.should == :PROCESSED
+    payment_infos[3].gateway_error.should == 'Success'
+    payment_infos[3].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[3].properties, 'payment_processor_account_id').should == @payment_processor_account_id
   end
 
   it 'should generate forms correctly' do