spree_gateway 3.9.3 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82e672befb08ae277659eec1f7686002af0b6f66b1f8ecb467649ab29667aee2
-  data.tar.gz: 47d5a54c20d7987569af842d50f471e6f3eea69647f6807865191c55e97f61cc
+  metadata.gz: 056db537dbbb9403df9df6e2822fa462b9c0b2eac0f880548d7ad9deb93e91c5
+  data.tar.gz: aeb658e8f6abfe36b8b84d45bb819a2cc02510f27010cf6ef059c3ae7fc78e30
 SHA512:
-  metadata.gz: 5efb8b8ce887c92a222bf0b4c4b53b0ea16ee45f6efff3ad2908acdc5e3383139b778362be57ed858d15a0497df4d6aa37fa2c8f56ddee81f334945bcb67fe9f
-  data.tar.gz: fb61b3afbfc998e819bd11cf5d1f53c782e0e486c5b0fea6c43710fba74664398384badff68298a593b715185da3eaa68727e18b3d575dc5f14511d232d7f437
+  metadata.gz: 9896b8790e3ad9bfd23cd5387fe8718d0e1dcb52edd4dcfce1026fdbe875192bd1287b45613be7a1ec395eeb8279e06817f92d9f45a7ab510dd37b910f27394a
+  data.tar.gz: 3659666f037e516a8ac535d11e5f95d4dcb64f7794e110ddb51b2a8087f699948c0e37c12c0d91bd48ca38633f1ced10dfb31528bbf873bfc09606f4fc994593

data/.travis.yml

@@ -1,6 +1,8 @@
 os: linux
 dist: bionic
 
+cache: bundler
+
 addons:
   apt:
     sources:
@@ -11,6 +13,7 @@ addons:
 services:
   - mysql
   - postgresql
+  - redis-server
 
 language: ruby
 
@@ -22,20 +25,6 @@ env:
   - DB=mysql
   - DB=postgres
 
-gemfile:
-  - gemfiles/spree_3_7.gemfile
-  - gemfiles/spree_4_1.gemfile
-  - gemfiles/spree_master.gemfile
-
-jobs:
-  allow_failures:
-  - gemfile: gemfiles/spree_master.gemfile
-  exclude:
-  - rvm: 3.0
-    gemfile: gemfiles/spree_4_1.gemfile
-  - rvm: 3.0
-    gemfile: gemfiles/spree_3_7.gemfile
-
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
 
@@ -47,4 +36,4 @@ before_script:
 
 script:
   - bundle exec rake test_app
-  - bundle exec rake spec
+  - bundle exec rake spec

data/Gemfile

@@ -1,6 +1,14 @@
 source 'https://rubygems.org'
 
 gem 'rails-controller-testing'
-gem 'spree', github: 'spree/spree', branch: 'master'
+gem 'spree', github: 'spree/spree', branch: 'main'
+gem 'spree_backend', github: 'spree/spree_backend', branch: 'main'
+gem 'spree_frontend', github: 'spree/spree_legacy_frontend', branch: 'main'
+
+if ENV['DB'] == 'mysql'
+  gem 'mysql2'
+else
+  gem 'pg', '~> 1.1'
+end
 
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # Spree Gateway
 
-[![Build Status](https://api.travis-ci.org/spree/spree_gateway.svg?branch=master)](https://travis-ci.org/spree/spree_gateway)
+[![Build Status](https://api.travis-ci.org/spree/spree_gateway.svg?branch=main)](https://travis-ci.org/spree/spree_gateway)
 [![Code Climate](https://codeclimate.com/github/spree/spree_gateway.svg)](https://codeclimate.com/github/spree/spree_gateway)
 
 Community supported Spree Payment Method Gateways. It works as a wrapper for
@@ -100,6 +100,6 @@ We are [available for hire][spark].
 
 [1]: http://www.fsf.org/licensing/essays/free-sw.html
 [2]: https://github.com/spree/spree_gateway/issues
-[3]: https://github.com/spree/spree_gateway/blob/master/LICENSE.md
+[3]: https://github.com/spree/spree_gateway/blob/main/LICENSE.md
 [4]: https://github.com/spree
 [5]: https://github.com/spree/spree_gateway/graphs/contributors

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'spree/testing_support/extension_rake'
 
 RSpec::Core::RakeTask.new
 
@@ -11,5 +11,5 @@ task :default => [:spec]
 desc "Generates a dummy app for testing"
 task :test_app do
   ENV['LIB_NAME'] = 'spree_gateway'
-  Rake::Task['common:test_app'].invoke
+  Rake::Task['extension:test_app'].invoke
 end

data/app/models/spree/gateway/stripe_elements_gateway.rb

@@ -53,5 +53,9 @@ module Spree
       options[:execute_threed] = get_preference(:intents)
       return money, creditcard, options
     end
+
+    def public_preference_keys
+      %i[publishable_key test_mode intents]
+    end
   end
 end

data/app/models/spree/gateway/stripe_gateway.rb

@@ -143,5 +143,9 @@ module Spree
       url = 'https://spreecommerce.org'
       "#{name_with_version} #{url}"
     end
+
+    def public_preference_keys
+      %i[publishable_key test_mode]
+    end
   end
 end

data/app/models/{spree → spree_gateway}/apple_pay_order_decorator.rb

@@ -1,4 +1,4 @@
-module Spree
+module SpreeGateway
   module ApplePayOrderDecorator
     def confirmation_required?
       return false if paid_with_apple_pay?
@@ -17,4 +17,4 @@ module Spree
   end
 end
 
-Spree::Order.prepend Spree::ApplePayOrderDecorator
+::Spree::Order.prepend(::SpreeGateway::ApplePayOrderDecorator)

data/app/models/{spree → spree_gateway}/apple_pay_payment_decorator.rb

@@ -1,4 +1,4 @@
-module Spree
+module SpreeGateway
   module ApplePayPaymentDecorator
     def apple_pay?
       payment_method.is_a? Spree::Gateway::StripeApplePayGateway
@@ -6,4 +6,4 @@ module Spree
   end
 end
 
-Spree::Payment.prepend Spree::ApplePayPaymentDecorator
+::Spree::Payment.prepend(::SpreeGateway::ApplePayPaymentDecorator)

data/app/models/{spree → spree_gateway}/credit_card_decorator.rb

@@ -1,4 +1,4 @@
-module Spree
+module SpreeGateway
   module CreditCardDecorator
     def set_last_digits
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
@@ -7,4 +7,4 @@ module Spree
   end
 end
 
-::Spree::CreditCard.prepend(::Spree::CreditCardDecorator)
+::Spree::CreditCard.prepend(::SpreeGateway::CreditCardDecorator)

data/app/models/{spree → spree_gateway}/order_decorator.rb

@@ -1,4 +1,4 @@
-module Spree
+module SpreeGateway
   module OrderDecorator
     def self.prepended(base)
       return if base.checkout_steps.key?(:payment_confirm)
@@ -25,4 +25,4 @@ module Spree
   end
 end
 
-Spree::Order.prepend(Spree::OrderDecorator)
+::Spree::Order.prepend(::SpreeGateway::OrderDecorator)

data/app/models/{spree → spree_gateway}/payment_decorator.rb

@@ -1,4 +1,4 @@
-module Spree
+module SpreeGateway
   module PaymentDecorator
     def handle_response(response, success_state, failure_state)
       if response.success? && response.respond_to?(:params)
@@ -33,4 +33,4 @@ module Spree
   end
 end
 
-Spree::Payment.prepend(Spree::PaymentDecorator)
+::Spree::Payment.prepend(::SpreeGateway::PaymentDecorator)

data/config/locales/en.yml

@@ -12,6 +12,7 @@ en:
     payment_has_been_cancelled: The payment has been cancelled.
     please_wait_for_confirmation_popup: Please wait for payment confirmation popup to appear.
     payment_successfully_authorized: The payment was successfully authorized.
+    no_payment_authorization_needed: Payment autorization not needed.
     order_state:
       payment_confirm: Verify payment
     log_entry:

data/config/routes.rb

@@ -10,6 +10,7 @@ Spree::Core::Engine.add_routes do
     namespace :v2 do
       namespace :storefront do
         namespace :intents do
+          post :payment_confirmation_data
           post :handle_response
         end
       end

data/db/migrate/20200317135551_add_spree_check_payment_source.rb

@@ -3,19 +3,19 @@ class AddSpreeCheckPaymentSource < ActiveRecord::Migration[5.1]
     create_table :spree_checks do |t|
       t.references :payment_method
       t.references :user
-      t.string "account_holder_name"
-      t.string "account_holder_type"
-      t.string "routing_number"
-      t.string "account_number"
-      t.string "account_type", default: 'checking'
-      t.string "status"
-      t.string "last_digits"
-      t.string "gateway_customer_profile_id"
-      t.string "gateway_payment_profile_id"
+      t.string 'account_holder_name'
+      t.string 'account_holder_type'
+      t.string 'routing_number'
+      t.string 'account_number'
+      t.string 'account_type', default: 'checking'
+      t.string 'status'
+      t.string 'last_digits'
+      t.string 'gateway_customer_profile_id'
+      t.string 'gateway_payment_profile_id'
 
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-      t.datetime "deleted_at"
+      t.datetime 'created_at', null: false
+      t.datetime 'updated_at', null: false
+      t.datetime 'deleted_at'
     end
     add_index :spree_payment_methods, :id
   end

data/db/migrate/20200422114908_add_intent_key_to_payment.rb

@@ -1,4 +1,4 @@
-class AddIntentKeyToPayment < ActiveRecord::Migration[4.2]
+class AddIntentKeyToPayment < ActiveRecord::Migration[5.2]
   def change
     add_column :spree_payments, :intent_client_key, :string
   end

data/lib/controllers/spree/api/v2/storefront/intents_controller.rb

@@ -5,6 +5,24 @@ module Spree
         class IntentsController < ::Spree::Api::V2::BaseController
           include Spree::Api::V2::Storefront::OrderConcern
 
+          def payment_confirmation_data
+            spree_authorize! :update, spree_current_order, order_token
+
+            if spree_current_order.intents?
+              spree_current_order.process_payments!
+              spree_current_order.reload
+              last_valid_payment = spree_current_order.payments.valid.where.not(intent_client_key: nil).last
+
+              if last_valid_payment.present?
+                client_secret = last_valid_payment.intent_client_key
+                publishable_key = last_valid_payment.payment_method&.preferred_publishable_key
+                return render json: { client_secret: client_secret, pk_key: publishable_key }, status: :ok
+              end
+            end
+
+            render_error_payload(I18n.t('spree.no_payment_authorization_needed'))
+          end
+
           def handle_response
             if params['response']['error']
               invalidate_payment

data/lib/spree_gateway/engine.rb

@@ -4,7 +4,7 @@ module SpreeGateway
 
     config.autoload_paths += %W(#{config.root}/lib)
 
-    initializer "spree.gateway.payment_methods", :after => "spree.register.payment_methods" do |app|
+    config.after_initialize do |app|
       app.config.spree.payment_methods << Spree::Gateway::AuthorizeNet
       app.config.spree.payment_methods << Spree::Gateway::AuthorizeNetCim
       app.config.spree.payment_methods << Spree::Gateway::BalancedGateway
@@ -41,6 +41,9 @@ module SpreeGateway
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/spree/*_decorator*.rb')) do |c|
         Rails.application.config.cache_classes ? require(c) : load(c)
       end
+      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/spree_gateway/*_decorator*.rb')) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
       Dir.glob(File.join(File.dirname(__FILE__), '../../lib/active_merchant/**/*_decorator*.rb')) do |c|
         Rails.application.config.cache_classes ? require(c) : load(c)
       end

data/lib/spree_gateway/version.rb

@@ -1,5 +1,5 @@
 module SpreeGateway
   def self.version
-    '3.9.3'
+    '3.10.0'
   end
 end

data/spec/features/admin/stripe_elements_payment_spec.rb

@@ -13,7 +13,8 @@ describe 'Admin Panel Stripe elements payment', type: :feature do
     Spree::Gateway::StripeElementsGateway.create!(
         name: 'Stripe Element',
         preferred_secret_key: 'sk_test_VCZnDv3GLU15TRvn8i2EsaAN',
-        preferred_publishable_key: 'pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg'
+        preferred_publishable_key: 'pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg',
+        stores: [::Spree::Store.default]
     )
   end
 

data/spec/features/stripe_checkout_spec.rb

@@ -8,15 +8,21 @@ describe "Stripe checkout", type: :feature, js: true do
   let!(:mug) { create(:product, :name => "RoR Mug") }
   let!(:stripe_payment_method) do
     Spree::Gateway::StripeGateway.create!(
-      :name => "Stripe",
-      :preferred_secret_key => "sk_test_VCZnDv3GLU15TRvn8i2EsaAN",
-      :preferred_publishable_key => "pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg"
+      name: 'Stripe',
+      preferred_secret_key: 'sk_test_VCZnDv3GLU15TRvn8i2EsaAN',
+      preferred_publishable_key: 'pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg',
+      stores: [::Spree::Store.default]
     )
   end
 
   let!(:zone) { create(:zone) }
 
   before do
+    if Spree.version.to_f >= 4.2
+      payment_method = Spree::PaymentMethod.first
+      payment_method.update!(stores: [Spree::Store.first])
+    end
+
     user = create(:user)
 
     order = OrderWalkthrough.up_to(:delivery)

data/spec/features/stripe_elements_3ds_checkout_spec.rb

@@ -9,7 +9,8 @@ describe 'Stripe Elements 3ds checkout', type: :feature, js: true do
         name: 'Stripe',
         preferred_secret_key: 'sk_test_VCZnDv3GLU15TRvn8i2EsaAN',
         preferred_publishable_key: 'pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg',
-        preferred_intents: preferred_intents
+        preferred_intents: preferred_intents,
+        stores: [::Spree::Store.default]
     )
   end
 

data/spec/models/gateway/authorize_net_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::AuthorizeNet do
-  let (:gateway) { described_class.create!(name: 'Authorize.net') }
+  let (:gateway) { described_class.create!(name: 'Authorize.net', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a AuthorizeNet gateway' do

data/spec/models/gateway/balanced_gateway_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::BalancedGateway do
-  let(:gateway) { described_class.create!(name: 'Balanced') }
+  let(:gateway) { described_class.create!(name: 'Balanced', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a Balanced gateway' do

data/spec/models/gateway/banwire_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::Banwire do
-  let(:gateway) { described_class.create!(name: 'Banwire') }
+  let(:gateway) { described_class.create!(name: 'Banwire', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a Banwire gateway' do

data/spec/models/gateway/beanstream_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::Beanstream do
-  let(:gateway) { described_class.create!(name: 'Beanstream') }
+  let(:gateway) { described_class.create!(name: 'Beanstream', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a Beanstream gateway' do

data/spec/models/gateway/braintree_gateway_spec.rb

@@ -2,13 +2,24 @@ require 'spec_helper'
 require 'pry'
 
 describe Spree::Gateway::BraintreeGateway do
-  let!(:country) { create(:country, name: 'United States', iso_name: 'UNITED STATES', iso3: 'USA', iso: 'US', numcode: 840) }
-  let!(:state) { create(:state, name: 'Maryland', abbr: 'MD', country: country) }
-  let!(:address) { create(:address, firstname: 'John', lastname: 'Doe', address1: '1234 My Street', address2: 'Apt 1', city: 'Washington DC', zipcode: '20123', phone: '(555)555-5555', state: state, country: country) }
-
   before do
+    country = Spree::Country.find_by(name: 'United States of America')
+    country.update(name: 'United States', iso_name: 'UNITED STATES', iso3: 'USA', iso: 'US', numcode: 840)
+    state = create(:state, name: 'Maryland', abbr: 'MD', country: country)
+    @address = create(:address,
+                     firstname: 'John',
+                     lastname:  'Doe',
+                     address1:  '1234 My Street',
+                     address2:  'Apt 1',
+                     city:      'Washington DC',
+                     zipcode:   '20123',
+                     phone:     '(555)555-5555',
+                     state:     state,
+                     country:   country)
+
+
     Spree::Gateway.update_all(active: false)
-    @gateway = Spree::Gateway::BraintreeGateway.create!(name: 'Braintree Gateway', active: true)
+    @gateway = Spree::Gateway::BraintreeGateway.create!(name: 'Braintree Gateway', active: true, stores: [::Spree::Store.default])
     @gateway.preferences = {
       environment: 'sandbox',
       merchant_id: 'zbn5yzq9t7wmwx42',
@@ -18,7 +29,7 @@ describe Spree::Gateway::BraintreeGateway do
     @gateway.save!
 
     with_payment_profiles_off do
-      order = create(:order_with_totals, bill_address: address, ship_address: address)
+      order = create(:order_with_totals, bill_address: @address, ship_address: @address)
       order.update_with_updater!
 
       # Use a valid CC from braintree sandbox: https://www.braintreepayments.com/docs/ruby/reference/sandbox
@@ -37,7 +48,7 @@ describe Spree::Gateway::BraintreeGateway do
 
   describe 'payment profile creation' do
     before do
-      order = create(:order_with_totals, bill_address: address, ship_address: address)
+      order = create(:order_with_totals, bill_address: @address, ship_address: @address)
       order.update_with_updater!
 
       @credit_card = create(:credit_card,
@@ -56,12 +67,12 @@ describe Spree::Gateway::BraintreeGateway do
         remote_customer = @gateway.provider.instance_variable_get(:@braintree_gateway).customer.find(@credit_card.gateway_customer_profile_id)
         remote_address = remote_customer.addresses.first rescue nil
         expect(remote_address).not_to be_nil
-        expect(remote_address.street_address).to eq(address.address1)
-        expect(remote_address.extended_address).to eq(address.address2)
-        expect(remote_address.locality).to eq(address.city)
-        expect(remote_address.region).to eq(address.state.name)
-        expect(remote_address.country_code_alpha2).to eq(address.country.iso)
-        expect(remote_address.postal_code).to eq(address.zipcode)
+        expect(remote_address.street_address).to eq(@address.address1)
+        expect(remote_address.extended_address).to eq(@address.address2)
+        expect(remote_address.locality).to eq(@address.city)
+        expect(remote_address.region).to eq(@address.state.name)
+        expect(remote_address.country_code_alpha2).to eq(@address.country.iso)
+        expect(remote_address.postal_code).to eq(@address.zipcode)
       end
     end
 

data/spec/models/gateway/card_save_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::CardSave do
-  let(:gateway) { described_class.create!(name: 'CardSave') }
+  let(:gateway) { described_class.create!(name: 'CardSave', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a CardSave gateway' do

data/spec/models/gateway/{data_cache_spec.rb → data_cash_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::DataCash do
-  let(:gateway) { described_class.create!(name: 'DataCash') }
+  let(:gateway) { described_class.create!(name: 'DataCash', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a DataCash gateway' do

data/spec/models/gateway/epay_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::Epay do
-  let(:gateway) { described_class.create!(name: 'Epay') }
+  let(:gateway) { described_class.create!(name: 'Epay', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a Epay gateway' do

data/spec/models/gateway/eway_rapid_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::EwayRapid do
-  let(:gateway) { described_class.create!(name: 'eWAY Rapid') }
+  let(:gateway) { described_class.create!(name: 'eWAY Rapid', stores: [::Spree::Store.default]) }
 
   describe '#provider_class' do
     it 'should be an eWAY Rapid gateway' do

data/spec/models/gateway/eway_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::Eway do
-  let(:gateway) { described_class.create!(name: 'Eway') }
+  let(:gateway) { described_class.create!(name: 'Eway', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a Eway gateway' do

data/spec/models/gateway/moneris_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::Moneris do
-  let(:gateway) { described_class.create!(name: 'Moneris') }
+  let(:gateway) { described_class.create!(name: 'Moneris', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a Moneris gateway' do

data/spec/models/gateway/pay_junction_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::PayJunction do
-  let(:gateway) { described_class.create!(name: 'PayJunction') }
+  let(:gateway) { described_class.create!(name: 'PayJunction', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a PayJunction gateway' do

data/spec/models/gateway/pay_pal_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::PayPalGateway do
-  let(:gateway) { described_class.create!(name: 'PayPal') }
+  let(:gateway) { described_class.create!(name: 'PayPal', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a PayPal gateway' do

data/spec/models/gateway/payflow_pro_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::PayflowPro do
-  let(:gateway) { described_class.create!(name: 'PayflowPro') }
+  let(:gateway) { described_class.create!(name: 'PayflowPro', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a Payflow gateway' do

data/spec/models/gateway/paymill_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::Paymill do
-  let(:gateway) { described_class.create!(name: 'Paymill') }
+  let(:gateway) { described_class.create!(name: 'Paymill', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a Paymill gateway' do

data/spec/models/gateway/pin_gateway_spec.rb

@@ -4,7 +4,7 @@ describe Spree::Gateway::PinGateway do
 
   before do
     Spree::Gateway.update_all(active: false)
-    @gateway = described_class.create!(name: 'Pin Gateway', active: true)
+    @gateway = described_class.create!(name: 'Pin Gateway', active: true, stores: [::Spree::Store.default])
     @gateway.set_preference(:api_key, 'W_VzkRCZSILiKWUS-dndUg')
     @gateway.save!
 

data/spec/models/gateway/quickpay_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::Quickpay do
-  let(:gateway) { described_class.create!(name: 'QuickpayGateway') }
+  let(:gateway) { described_class.create!(name: 'QuickpayGateway', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a Quickpay gateway' do

data/spec/models/gateway/sage_pay_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::SagePay do
-  let(:gateway) { described_class.create!(name: 'SagePay') }
+  let(:gateway) { described_class.create!(name: 'SagePay', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a SagePay gateway' do

data/spec/models/gateway/secure_pay_au_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::SecurePayAU do
-  let(:gateway) { described_class.create!(name: 'SecurePayAU') }
+  let(:gateway) { described_class.create!(name: 'SecurePayAU', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a SecurePayAU gateway' do

data/spec/models/gateway/usa_epay_transaction_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Spree::Gateway::UsaEpayTransaction do
   before do
     Spree::Gateway.update_all(active: false)
-    @gateway = Spree::Gateway::UsaEpayTransaction.create!(name: 'USA EPay Gateway', active: true)
+    @gateway = Spree::Gateway::UsaEpayTransaction.create!(name: 'USA EPay Gateway', active: true, stores: [::Spree::Store.default])
     @gateway.set_preference(:login, '0r19zQBdp5nS8i3t4hFxz0di13yf56q1')
     @gateway.save!
 
-    country = create(:country, name: 'United States', iso_name: 'UNITED STATES', iso3: 'USA', iso: 'US', numcode: 840)
+    country = Spree::Country.find_by(name: 'United States of America')
     state = create(:state, name: 'Maryland', abbr: 'MD', country: country)
     address = create(:address,
       firstname: 'John',

data/spec/models/gateway/worldpay_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Gateway::Worldpay do
-  let(:gateway) { described_class.create!(name: 'Worldpay') }
+  let(:gateway) { described_class.create!(name: 'Worldpay', stores: [::Spree::Store.default]) }
 
   context '.provider_class' do
     it 'is a Worldpay gateway' do

data/spec/models/spree/order_spec.rb

@@ -6,14 +6,16 @@ describe Spree::Order do
   let(:stripe_apple_pay_payment_method) do
     Spree::Gateway::StripeApplePayGateway.create!(
       name: 'ApplePay',
-      preferred_domain_verification_certificate: FFaker::Lorem.characters(20)
+      preferred_domain_verification_certificate: FFaker::Lorem.characters(20),
+      stores: [::Spree::Store.default]
     )
   end
   let(:stripe_credit_card_payment_method) do
     Spree::Gateway::StripeGateway.create!(
       name: 'CreditCard',
       preferred_secret_key: FFaker::Lorem.characters(20),
-      preferred_publishable_key: FFaker::Lorem.characters(20)
+      preferred_publishable_key: FFaker::Lorem.characters(20),
+      stores: [::Spree::Store.default]
     )
   end
 

data/spec/requests/spree/api/v2/storefront/intents_controller_spec.rb

@@ -0,0 +1,198 @@
+require 'spec_helper'
+
+describe 'Api V2 Storefront Intents Spec', type: :request do
+  let!(:store) { Spree::Store.default }
+  let(:currency) { store.default_currency }
+  let(:user)  { create(:user) }
+  let(:order) { create(:order, user: user, store: store, currency: currency) }
+
+  include_context 'API v2 tokens'
+
+  describe '#payment_confirmation_data' do
+    subject :post_payment_confirmation_data do
+      post '/api/v2/storefront/intents/payment_confirmation_data', headers: headers, params: params
+    end
+
+    include_context 'API v2 tokens'
+
+    context 'when user is authorized' do
+      let(:params) { {} }
+      let(:headers) { headers_bearer.merge(headers_order_token) }
+
+      context 'when current order has payment intent' do
+        let(:provider) do
+          double('provider').tap do |p|
+            p.stub(:purchase)
+            p.stub(:authorize)
+            p.stub(:capture)
+          end
+        end
+        let(:gateway) do
+          gateway = Spree::Gateway::StripeElementsGateway.new(active: true)
+          gateway.set_preference :secret_key, 'secret_key'
+          gateway.set_preference :intents, 'true'
+          gateway.name = 'Stripe Elements'
+          gateway.stores << order.store
+          allow(gateway).to receive(:options_for_purchase_or_auth).and_return ['money','cc','opts']
+          allow(gateway).to receive_messages provider: provider
+          allow(gateway).to receive_messages source_required: true
+          allow(gateway).to receive_messages create_profile: true
+          gateway
+        end
+        let!(:payment) do
+          create(:payment,
+                 source: create(:credit_card),
+                 order: order,
+                 payment_method: gateway,
+                 state: 'pending',
+                 intent_client_key: intent_client_key)
+        end
+
+        before { post_payment_confirmation_data }
+
+        context 'when last valid payment has intent client key' do
+          let(:intent_client_key) { 'intent_client_key' }
+
+          it_behaves_like 'returns 200 HTTP status'
+        end
+
+        context 'when last valid payment does not have intent client key' do
+          let(:intent_client_key) { nil }
+
+          it_behaves_like 'returns 422 HTTP status'
+
+          it 'includes valid response message' do
+            expect(response.body).to include I18n.t('spree.no_payment_authorization_needed')
+          end
+        end
+
+        context 'when current order has completed payments' do
+          let(:order) { create(:order_ready_to_ship, user: user, store: store, currency: currency) }
+          let(:intent_client_key) { 'intent_client_key' }
+
+          it_behaves_like 'returns 403 HTTP status'
+        end
+      end
+
+      context 'when current order does not have payment intent' do
+        before { post_payment_confirmation_data }
+
+        it_behaves_like 'returns 422 HTTP status'
+
+        it 'includes valid response message' do
+          expect(response.body).to include I18n.t('spree.no_payment_authorization_needed')
+        end
+      end
+    end
+
+    context 'when some authorization data is missing' do
+      let(:params) { {} }
+      let(:headers) { {} }
+
+      before { post_payment_confirmation_data }
+
+      it_behaves_like 'returns 403 HTTP status'
+    end
+  end
+
+  describe '#handle_response' do
+    subject :post_handle_response do
+      post '/api/v2/storefront/intents/handle_response', headers: headers, params: params
+    end
+
+    let(:headers) { headers_bearer.merge(headers_order_token) }
+    let(:provider) do
+      double('provider').tap do |p|
+        p.stub(:purchase)
+        p.stub(:authorize)
+        p.stub(:capture)
+      end
+    end
+    let(:gateway) do
+      gateway = Spree::Gateway::StripeElementsGateway.new(active: true)
+      gateway.set_preference :secret_key, 'secret_key'
+      gateway.set_preference :intents, 'true'
+      gateway.name = 'Stripe Elements'
+      gateway.stores << order.store
+      allow(gateway).to receive(:options_for_purchase_or_auth).and_return ['money','cc','opts']
+      allow(gateway).to receive_messages provider: provider
+      allow(gateway).to receive_messages source_required: true
+      allow(gateway).to receive_messages create_profile: true
+      gateway
+    end
+    let!(:payment) do
+      create(:payment,
+             source: create(:credit_card),
+             order: order,
+             payment_method: gateway,
+             state: 'pending',
+             intent_client_key: 'intent_client_key')
+    end
+
+    include_context 'API v2 tokens'
+
+    context 'when response param does not include errors' do
+      let(:params) do
+        {
+          response: {
+            message: 'everything is ok'
+          }
+        }
+      end
+
+      before { post_handle_response }
+
+      it_behaves_like 'returns 200 HTTP status'
+
+      it 'includes valid response message' do
+        expect(response.body).to include I18n.t('spree.payment_successfully_authorized')
+      end
+
+      it 'does not update payment' do
+        expect { post_handle_response }.not_to change { payment }
+      end
+    end
+
+    context 'when response param includes errors' do
+      let(:payment_response_code) { payment.response_code }
+      let(:params) do
+        {
+          response: {
+            error: {
+              payment_intent: {
+                id: payment_response_code
+              },
+              message: 'something went wrong'
+            }
+          }
+        }
+      end
+
+      before { post_handle_response }
+
+      it_behaves_like 'returns 422 HTTP status'
+
+      context 'when payment to invalidate is found' do
+        it 'changes payment state to failed' do
+          expect(payment.state).not_to eq 'failed'
+          expect(payment.reload.state).to eq 'failed'
+        end
+
+        it 'clears payment intent_client_key' do
+          expect(payment.intent_client_key).not_to be nil
+          expect(payment.reload.intent_client_key).to be nil
+        end
+
+        it 'includes valid response message' do
+          expect(response.body).to include params[:response][:error][:message]
+        end
+      end
+
+      context 'when payment to invalidate is not found' do
+        let(:payment_response_code) { 'unexisting response code' }
+
+        it_behaves_like 'returns 404 HTTP status'
+      end
+    end
+  end
+end

data/spree_gateway.gemspec

@@ -28,11 +28,10 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  spree_version = '>= 3.7.0', '< 5.0'
-  s.add_dependency 'spree_core', spree_version
+  s.add_dependency 'spree_core', '>= 3.7.0'
   s.add_dependency 'spree_extension'
 
-  s.add_development_dependency 'braintree', '~>2.78'
+  s.add_development_dependency 'braintree', '~> 3.0.0'
   s.add_development_dependency 'rspec-activemodel-mocks'
   s.add_development_dependency 'spree_dev_tools'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_gateway
 version: !ruby/object:Gem::Version
-  version: 3.9.3
+  version: 3.10.0
 platform: ruby
 authors:
 - Spree Commerce
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2022-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.78'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.78'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -95,17 +89,13 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Appraisals
 - Gemfile
 - Guardfile
 - LICENSE.md
 - README.md
 - Rakefile
-- app/models/spree/apple_pay_order_decorator.rb
-- app/models/spree/apple_pay_payment_decorator.rb
 - app/models/spree/billing_integration.rb
 - app/models/spree/check.rb
-- app/models/spree/credit_card_decorator.rb
 - app/models/spree/gateway/authorize_net.rb
 - app/models/spree/gateway/authorize_net_cim.rb
 - app/models/spree/gateway/balanced_gateway.rb
@@ -136,8 +126,11 @@ files:
 - app/models/spree/gateway/stripe_gateway.rb
 - app/models/spree/gateway/usa_epay_transaction.rb
 - app/models/spree/gateway/worldpay.rb
-- app/models/spree/order_decorator.rb
-- app/models/spree/payment_decorator.rb
+- app/models/spree_gateway/apple_pay_order_decorator.rb
+- app/models/spree_gateway/apple_pay_payment_decorator.rb
+- app/models/spree_gateway/credit_card_decorator.rb
+- app/models/spree_gateway/order_decorator.rb
+- app/models/spree_gateway/payment_decorator.rb
 - app/views/spree/checkout/_payment_confirm.html.erb
 - config/initializers/inflections.rb
 - config/initializers/spree_permitted_attributes.rb
@@ -146,16 +139,8 @@ files:
 - config/locales/en.yml
 - config/locales/sv.yml
 - config/routes.rb
-- db/migrate/20121017004102_update_braintree_payment_method_type.rb
-- db/migrate/20130213222555_update_stripe_payment_method_type.rb
-- db/migrate/20130415222802_update_balanced_payment_method_type.rb
-- db/migrate/20131008221012_update_paypal_payment_method_type.rb
-- db/migrate/20131112133401_migrate_stripe_preferences.rb
 - db/migrate/20200317135551_add_spree_check_payment_source.rb
 - db/migrate/20200422114908_add_intent_key_to_payment.rb
-- gemfiles/spree_3_7.gemfile
-- gemfiles/spree_4_1.gemfile
-- gemfiles/spree_master.gemfile
 - lib/active_merchant/billing/stripe_gateway_decorator.rb
 - lib/controllers/spree/api/v2/storefront/intents_controller.rb
 - lib/controllers/spree/apple_pay_domain_verification_controller.rb
@@ -194,7 +179,7 @@ files:
 - spec/models/gateway/braintree_gateway_spec.rb
 - spec/models/gateway/card_save_spec.rb
 - spec/models/gateway/cyber_source_spec.rb
-- spec/models/gateway/data_cache_spec.rb
+- spec/models/gateway/data_cash_spec.rb
 - spec/models/gateway/epay_spec.rb
 - spec/models/gateway/eway_rapid_spec.rb
 - spec/models/gateway/eway_spec.rb
@@ -214,6 +199,7 @@ files:
 - spec/models/gateway/worldpay_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/requests/apple_pay_domain_verification.rb
+- spec/requests/spree/api/v2/storefront/intents_controller_spec.rb
 - spec/spec_helper.rb
 - spec/support/order_walktrough.rb
 - spec/support/wait_for_stripe.rb
@@ -224,9 +210,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree_gateway/issues
-  changelog_uri: https://github.com/spree/spree_gateway/releases/tag/v3.9.3
+  changelog_uri: https://github.com/spree/spree_gateway/releases/tag/v3.10.0
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_gateway/tree/v3.9.3
+  source_code_uri: https://github.com/spree/spree_gateway/tree/v3.10.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -243,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.2.3
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Additional Payment Gateways for Spree Commerce
@@ -260,7 +246,7 @@ test_files:
 - spec/models/gateway/braintree_gateway_spec.rb
 - spec/models/gateway/card_save_spec.rb
 - spec/models/gateway/cyber_source_spec.rb
-- spec/models/gateway/data_cache_spec.rb
+- spec/models/gateway/data_cash_spec.rb
 - spec/models/gateway/epay_spec.rb
 - spec/models/gateway/eway_rapid_spec.rb
 - spec/models/gateway/eway_spec.rb
@@ -280,6 +266,7 @@ test_files:
 - spec/models/gateway/worldpay_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/requests/apple_pay_domain_verification.rb
+- spec/requests/spree/api/v2/storefront/intents_controller_spec.rb
 - spec/spec_helper.rb
 - spec/support/order_walktrough.rb
 - spec/support/wait_for_stripe.rb

data/Appraisals

@@ -1,15 +0,0 @@
-appraise 'spree-3-7' do
-  gem 'spree', '~> 3.7.0'
-  gem 'rails-controller-testing'
-  gem 'sass-rails'
-end
-
-appraise 'spree-4-1' do
-  gem 'spree', '~> 4.1.0'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-master' do
-  gem 'spree', github: 'spree/spree', branch: 'master'
-  gem 'rails-controller-testing'
-end

data/db/migrate/20121017004102_update_braintree_payment_method_type.rb

@@ -1,9 +0,0 @@
-class UpdateBraintreePaymentMethodType < SpreeExtension::Migration[4.2]
-  def up
-    Spree::PaymentMethod.where(:type => "Spree::Gateway::Braintree").update_all(:type => "Spree::Gateway::BraintreeGateway")
-  end
-
-  def down
-    Spree::PaymentMethod.where(:type => "Spree::Gateway::BraintreeGateway").update_all(:type => "Spree::Gateway::Braintree")
-  end
-end

data/db/migrate/20130213222555_update_stripe_payment_method_type.rb

@@ -1,9 +0,0 @@
-class UpdateStripePaymentMethodType < SpreeExtension::Migration[4.2]
-  def up
-    Spree::PaymentMethod.where(:type => "Spree::Gateway::Stripe").update_all(:type => "Spree::Gateway::StripeGateway")
-  end
-
-  def down
-    Spree::PaymentMethod.where(:type => "Spree::Gateway::StripeGateway").update_all(:type => "Spree::Gateway::Stripe")
-  end
-end

data/db/migrate/20130415222802_update_balanced_payment_method_type.rb

@@ -1,9 +0,0 @@
-class UpdateBalancedPaymentMethodType < SpreeExtension::Migration[4.2]
-  def up
-    Spree::PaymentMethod.where(:type => "Spree::Gateway::Balanced").update_all(:type => "Spree::Gateway::BalancedGateway")
-  end
-
-  def down
-    Spree::PaymentMethod.where(:type => "Spree::Gateway::BalancedGateway").update_all(:type => "Spree::Gateway::Balanced")
-  end
-end

data/db/migrate/20131008221012_update_paypal_payment_method_type.rb

@@ -1,9 +0,0 @@
-class UpdatePaypalPaymentMethodType < SpreeExtension::Migration[4.2]
-  def up
-    Spree::PaymentMethod.where(:type => "Spree::Gateway::PayPal").update_all(:type => "Spree::Gateway::PayPalGateway")
-  end
-
-  def down
-    Spree::PaymentMethod.where(:type => "Spree::Gateway::PayPalGateway").update_all(:type => "Spree::Gateway::PayPal")
-  end
-end

data/db/migrate/20131112133401_migrate_stripe_preferences.rb

@@ -1,8 +0,0 @@
-class MigrateStripePreferences < SpreeExtension::Migration[4.2]
-  def up
-    Spree::Preference.where("#{ActiveRecord::Base.connection.quote_column_name("key")} LIKE 'spree/gateway/stripe_gateway/login%'").each do |pref|
-      pref.key = pref.key.gsub('login', 'secret_key')
-      pref.save
-    end
-  end
-end

data/gemfiles/spree_3_7.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails-controller-testing"
-gem "spree", "~> 3.7.0"
-gem "sass-rails"
-
-gemspec path: "../"

data/gemfiles/spree_4_1.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails-controller-testing"
-gem "spree", "~> 4.1.0"
-
-gemspec path: "../"

data/gemfiles/spree_master.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails-controller-testing"
-gem "spree", github: "spree/spree", branch: "master"
-
-gemspec path: "../"