spree_gateway 3.9.4 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a29093f977d40e708b032c608a9e25f1949352bee57b9321fa36488000d7711f
-  data.tar.gz: 5f5d7ff9014be360d444df942dc24d1313ef0881e786ac37a49f4fe884b5d0fe
+  metadata.gz: 056db537dbbb9403df9df6e2822fa462b9c0b2eac0f880548d7ad9deb93e91c5
+  data.tar.gz: aeb658e8f6abfe36b8b84d45bb819a2cc02510f27010cf6ef059c3ae7fc78e30
 SHA512:
-  metadata.gz: 807b40308555c5149f146fa3fc38c52f10c47ec765a1988f0562adcc296115d43670f09052a80a2493edd166d6d195092e7861ae07457c8c47eedb0cca90559b
-  data.tar.gz: 0ce03934963ea212e16aed6148eff226362d90544789ec1fa283c69dbff81c1d2834c91bce4aab81794935c5d3e825ffb89f07b95d66d1d9994128b11f8e31de
+  metadata.gz: 9896b8790e3ad9bfd23cd5387fe8718d0e1dcb52edd4dcfce1026fdbe875192bd1287b45613be7a1ec395eeb8279e06817f92d9f45a7ab510dd37b910f27394a
+  data.tar.gz: 3659666f037e516a8ac535d11e5f95d4dcb64f7794e110ddb51b2a8087f699948c0e37c12c0d91bd48ca38633f1ced10dfb31528bbf873bfc09606f4fc994593

data/Gemfile

@@ -2,7 +2,13 @@ source 'https://rubygems.org'
 
 gem 'rails-controller-testing'
 gem 'spree', github: 'spree/spree', branch: 'main'
-gem 'spree_backend', github: 'spree/spree', branch: 'main'
-gem 'spree_frontend', 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/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

data/lib/spree_gateway/version.rb

@@ -1,5 +1,5 @@
 module SpreeGateway
   def self.version
-    '3.9.4'
+    '3.10.0'
   end
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_gateway
 version: !ruby/object:Gem::Version
-  version: 3.9.4
+  version: 3.10.0
 platform: ruby
 authors:
 - Spree Commerce
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2022-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -139,11 +139,6 @@ 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
 - lib/active_merchant/billing/stripe_gateway_decorator.rb
@@ -204,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
@@ -214,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.4
+  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.4
+  source_code_uri: https://github.com/spree/spree_gateway/tree/v3.10.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -233,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
@@ -270,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/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