killbill-stripe 4.1.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbdc020a826585e1d723991b963ea2cc0b9866a6
-  data.tar.gz: 2140de112d1665611c8535bde2084bfa731b8f85
+  metadata.gz: 2b3fd774290b63212046cc65ae4d9e597feecdcf
+  data.tar.gz: 3f76e5e8fa7b0c3541d010588be12b36546d1a37
 SHA512:
-  metadata.gz: 4a58e78693d70c2504d8ff46e9263325b301927424899875e7fb84dc353c751230732543cba821de087b52134111ca941d15e351b573f6c775ec143c2608cf9a
-  data.tar.gz: 688c6b82d49c17c34551d6daca4a9d20d7dda4d1ca6257f70ab90860570dd924cf2d40a781eb70be3dd275cf013ed8caf23b077c19d43e92b42c8503a3c5deea
+  metadata.gz: 58f9df996d008f919c4de81efef0024f6f3579691985e0643e75a0c6636bb712e9da1db2029c74b8151a5d1f2152b61d323ff97d16ad4dde6cada95a51583c44
+  data.tar.gz: 63a9d8bce5a5fcbec1690433ea13e47262691747c4d14f0733b4a6e6b4efd11eaa7f3d10cf62c517a24e4d8c6faaffed823162a4378afc3b7388149dfa21f71f

data/lib/stripe/api.rb

@@ -2,7 +2,6 @@ include Killbill::Plugin::ActiveMerchant
 module Killbill #:nodoc:
   module Stripe #:nodoc:
     class PaymentPlugin < ::Killbill::Plugin::ActiveMerchant::PaymentPlugin
-
       def initialize
         gateway_builder = Proc.new do |config|
           ::ActiveMerchant::Billing::StripeGateway.new :login => config[:api_secret_key]
@@ -207,8 +206,18 @@ module Killbill #:nodoc:
         gw_notification
       end
 
+      def verify_bank_account(stripe_customer_id, stripe_bank_account_id, amounts, kb_tenant_id)
+        gateway = lookup_gateway(:default, kb_tenant_id)
+        url = "customers/#{CGI.escape(stripe_customer_id)}/sources/#{CGI.escape(stripe_bank_account_id)}/verify?#{amounts_to_uri(amounts)}"
+        gateway.api_request(:post, url)
+      end
+
       private
 
+      def amounts_to_uri(amounts)
+        amounts.map {|v| "amounts[]=#{v.to_s}" }.join("&")
+      end
+
       def before_gateways(kb_transaction, last_transaction, payment_source, amount_in_cents, currency, options, context)
         super(kb_transaction, last_transaction, payment_source, amount_in_cents, currency, options, context)
         options[:idempotency_key] ||= kb_transaction.external_key
@@ -216,7 +225,16 @@ module Killbill #:nodoc:
 
       def get_payment_source(kb_payment_method_id, properties, options, context)
         return nil if options[:customer_id]
-        super(kb_payment_method_id, properties, options, context)
+        if is_bank_account?(properties)
+          ActiveMerchant::Billing::StripeGateway::BankAccount.new({
+            :bank_name => find_value_from_properties(properties, :bank_name),
+            :routing_number => find_value_from_properties(properties, :routing_number),
+            :account_number => find_value_from_properties(properties, :account_number),
+            :type => find_value_from_properties(properties, :type) || "personal",
+          })
+        else
+          super(kb_payment_method_id, properties, options, context)
+        end
       end
 
       def populate_defaults(pm, amount, properties, context, options)
@@ -246,6 +264,11 @@ module Killbill #:nodoc:
 
         config(context.tenant_id)[:stripe][:fees_amount] || (config(context.tenant_id)[:stripe][:fees_percent].to_f * amount * 100)
       end
+
+      def is_bank_account?(properties)
+        find_value_from_properties(properties, :routing_number) &&
+          find_value_from_properties(properties, :account_number)
+      end
     end
   end
 end

data/lib/stripe/application.rb

@@ -72,6 +72,16 @@ post '/plugins/killbill-stripe', :provides => 'json' do
   response.to_json
 end
 
+post '/plugins/killbill-stripe/verify', :provides => 'json' do
+  return params.to_json if development? or test?
+
+  stripe_response = plugin(session).verify_bank_account(params)
+
+  response = params.dup
+  response['stripe_response'] = stripe_response
+  response.to_json
+end
+
 # Create managed account
 post '/plugins/killbill-stripe/accounts', :provides => 'json' do
   kb_account_id = params.delete('kb_account_id')

data/lib/stripe/ext/active_merchant/active_merchant.rb

@@ -4,6 +4,10 @@ module ActiveMerchant
     KB_PLUGIN_VERSION = Gem.loaded_specs['killbill-stripe'].version.version rescue nil
 
     class StripeGateway
+      BANK_ACCOUNT_HOLDER_TYPE_MAPPING = {
+        "personal" => "individual",
+        "business" => "company",
+      }
 
       def get_balance(options = {})
         commit(:get, 'balance', nil, options)
@@ -37,6 +41,137 @@ module ActiveMerchant
 
         headers
       end
+
+      # To create a charge on a card or a token, call
+      #
+      #   purchase(money, card_hash_or_token, { ... })
+      #
+      # To create a charge on a customer, call
+      #
+      #   purchase(money, nil, { :customer => id, ... })
+      def purchase(money, payment, options = {})
+        responses = MultiResponse.run do |r|
+          if payment.is_a?(ApplePayPaymentToken)
+            r.process { tokenize_apple_pay_token(payment) }
+            payment = StripePaymentToken.new(r.params["token"]) if r.success?
+          end
+          r.process do
+            post = create_post_for_auth_or_purchase(money, payment, options)
+            commit(:post, 'charges', post, options)
+          end
+        end.responses.last
+      end
+
+      def store(payment, options = {})
+        params = {}
+        post = {}
+
+        if payment.is_a?(ApplePayPaymentToken)
+          token_exchange_response = tokenize_apple_pay_token(payment)
+          params = { :card => token_exchange_response.params["token"]["id"] } if token_exchange_response.success?
+        elsif payment.is_a?(BankAccount)
+          post.merge!(bank_account_params(payment, options))
+        else
+          add_creditcard(params, payment, options)
+        end
+
+        unless payment.is_a?(BankAccount)
+          post[:validate] = options[:validate] unless options[:validate].nil?
+          post[:description] = options[:description] if options[:description]
+          post[:email] = options[:email] if options[:email]
+        end
+
+        if post[:bank_account]
+          customer_url = "customers"
+          if options[:customer]
+            customer_url += "/#{CGI.escape(options[:customer])}/sources"
+          end
+          responses = MultiResponse.run do |r|
+            # get token and associate it with the customer
+            r.process { commit(:post, "tokens?#{post_data(post)}", nil, { bank_account: true }) }
+
+            if r.success?
+              r.process { commit(:post, customer_url, { source: r.params["id"] } ) }
+            end
+          end.responses
+          if options[:customer]
+            return responses.first
+          else
+            return responses.last
+          end
+        elsif options[:account]
+          add_external_account(post, params, payment)
+          commit(:post, "accounts/#{CGI.escape(options[:account])}/external_accounts", post, options)
+        elsif options[:customer]
+          MultiResponse.run(:first) do |r|
+            # The /cards endpoint does not update other customer parameters.
+            r.process { commit(:post, "customers/#{CGI.escape(options[:customer])}/cards", params, options) }
+
+            if options[:set_default] and r.success? and !r.params['id'].blank?
+              post[:default_card] = r.params['id']
+            end
+
+            if post.count > 0
+              r.process { update_customer(options[:customer], post) }
+            end
+          end
+        else
+          commit(:post, 'customers', post.merge(params), options)
+        end
+      end
+
+      def commit(method, url, parameters = nil, options = {})
+        if options[:bank_account]
+          response = api_request(:post, url)
+          success = response["error"].nil?
+
+          Response.new(success, nil, response)
+        else
+          add_expand_parameters(parameters, options) if parameters
+          response = api_request(method, url, parameters, options)
+
+          success = !response.key?("error")
+
+          card = card_from_response(response)
+          avs_code = AVS_CODE_TRANSLATOR["line1: #{card["address_line1_check"]}, zip: #{card["address_zip_check"]}"]
+          cvc_code = CVC_CODE_TRANSLATOR[card["cvc_check"]]
+          Response.new(success,
+                       success ? "Transaction approved" : response["error"]["message"],
+                       response,
+                       :test => response.has_key?("livemode") ? !response["livemode"] : false,
+                       :authorization => authorization_from(success, url, method, response),
+                       :avs_result => { :code => avs_code },
+                       :cvv_result => cvc_code,
+                       :emv_authorization => emv_authorization_from_response(response),
+                       :error_code => success ? nil : error_code_from(response)
+                      )
+        end
+      end
+
+      def bank_account_params(bank_account, options = {})
+        account_holder_type = BANK_ACCOUNT_HOLDER_TYPE_MAPPING[bank_account.type]
+
+        post = {
+          bank_account: {
+            account_number: bank_account.account_number,
+            country: 'US',
+            currency: 'usd',
+            routing_number: bank_account.routing_number,
+            name: bank_account.bank_name,
+            account_holder_type: account_holder_type,
+          }
+        }
+      end
+
+      class BankAccount
+        attr_accessor :bank_name, :account_number, :routing_number, :type
+
+        def initialize(args)
+          args.each do |k,v|
+            instance_variable_set("@#{k}", v) unless v.nil?
+          end
+        end
+      end
     end
   end
 end

data/lib/stripe/models/payment_method.rb

@@ -4,16 +4,32 @@ module Killbill #:nodoc:
 
       self.table_name = 'stripe_payment_methods'
 
-      def self.from_response(kb_account_id, kb_payment_method_id, kb_tenant_id, cc_or_token, response, options, extra_params = {}, model = ::Killbill::Stripe::StripePaymentMethod)
+      def self.from_response(kb_account_id, kb_payment_method_id, kb_tenant_id, cc_or_token, response, options, extra_params = {:source_type => "cc"}, model = ::Killbill::Stripe::StripePaymentMethod)
         stripe_customer_id = options[:customer] || self.stripe_customer_id_from_kb_account_id(kb_account_id, kb_tenant_id)
-        if !stripe_customer_id.blank? && response.respond_to?(:responses)
-          card_response     = response.responses.first.params
+        if response.params["bank_account"]
+          extra_params = {} #overwrite extra params because they will be passed with assumption of CC
+          payment_response = {
+            "token" => response.params["bank_account"]["id"],
+            "address_country" => response.params["bank_account"]["country"],
+          }
+          customer_response = { "id" => stripe_customer_id }
+          extra_params[:bank_name] = response.params["bank_account"]["bank_name"]
+          extra_params[:bank_routing_number] = response.params["bank_account"]["routing_number"]
+          extra_params[:source_type] = "bank_account"
+          cc_or_token ||= response.params["bank_account"]["id"]
+        elsif !stripe_customer_id.blank? && response.respond_to?(:responses)
+          payment_response     = response.responses.first.params
           customer_response = response.responses.last.params
         elsif response.params['sources']
-          card_response     = response.params['sources']['data'][0]
+          payment_response     = response.params['sources']['data'][0]
           customer_response = response.params
+          if response.params['sources']['data'][0]["object"] == "bank_account"
+            extra_params[:bank_name] = response.params["sources"]["data"][0]["bank_name"]
+            extra_params[:bank_routing_number] = response.params["sources"]["data"][0]["routing_number"]
+            extra_params[:source_type] = "bank_account"
+          end
         else
-          card_response = {}
+          payment_response = {}
           customer_response = { 'id' => stripe_customer_id }
         end
 
@@ -25,19 +41,19 @@ module Killbill #:nodoc:
               options,
               {
                   :stripe_customer_id => customer_response['id'],
-                  :token              => card_response['id'],
-                  :cc_first_name      => card_response['name'],
+                  :token              => payment_response['id'],
+                  :cc_first_name      => payment_response['name'],
                   :cc_last_name       => nil,
-                  :cc_type            => card_response['brand'],
-                  :cc_exp_month       => card_response['exp_month'],
-                  :cc_exp_year        => card_response['exp_year'],
-                  :cc_last_4          => card_response['last4'],
-                  :address1           => card_response['address_line1'],
-                  :address2           => card_response['address_line2'],
-                  :city               => card_response['address_city'],
-                  :state              => card_response['address_state'],
-                  :zip                => card_response['address_zip'],
-                  :country            => card_response['address_country']
+                  :cc_type            => payment_response['brand'],
+                  :cc_exp_month       => payment_response['exp_month'],
+                  :cc_exp_year        => payment_response['exp_year'],
+                  :cc_last_4          => payment_response['last4'],
+                  :address1           => payment_response['address_line1'],
+                  :address2           => payment_response['address_line2'],
+                  :city               => payment_response['address_city'],
+                  :state              => payment_response['address_state'],
+                  :zip                => payment_response['address_zip'],
+                  :country            => payment_response['address_country']
               }.merge!(extra_params.compact), # Don't override with nil values
               model)
       end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: killbill-stripe
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 9.3.0
   name: killbill
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 9.3.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -218,6 +218,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 11.0.0
   name: rake
   prerelease: false
   type: :development
@@ -226,6 +229,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 11.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: