From 60a8ae6675594928defee14e6a41199fdfdf8f06 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Sat, 24 Jul 2021 22:51:03 +0100 Subject: [PATCH] Remove Stripe Connect gateway and related code --- .../controllers/details_controller.js.coffee | 2 +- .../spree/admin/payment_methods_controller.rb | 5 +- app/models/spree/gateway/stripe_connect.rb | 109 ------ app/models/subscription.rb | 1 - .../api/admin/payment_method_serializer.rb | 3 +- .../_provider_settings.html.haml | 2 - config/application.rb | 1 - .../subscriptions/stripe_payment_setup.rb | 3 +- .../subscriptions/validator.rb | 3 +- .../subscriptions/validator_spec.rb | 4 +- .../spree/gateway/stripe_connect_spec.rb | 107 ------ spec/requests/checkout/stripe_connect_spec.rb | 310 ------------------ 12 files changed, 8 insertions(+), 542 deletions(-) delete mode 100644 app/models/spree/gateway/stripe_connect.rb delete mode 100644 spec/models/spree/gateway/stripe_connect_spec.rb delete mode 100644 spec/requests/checkout/stripe_connect_spec.rb diff --git a/app/assets/javascripts/admin/subscriptions/controllers/details_controller.js.coffee b/app/assets/javascripts/admin/subscriptions/controllers/details_controller.js.coffee index cb331a62f3..19cf5316a4 100644 --- a/app/assets/javascripts/admin/subscriptions/controllers/details_controller.js.coffee +++ b/app/assets/javascripts/admin/subscriptions/controllers/details_controller.js.coffee @@ -16,7 +16,7 @@ angular.module("admin.subscriptions").controller "DetailsController", ($scope, $ return if !newValue? paymentMethod = ($scope.paymentMethods.filter (pm) -> pm.id == newValue)[0] return unless paymentMethod? - $scope.cardRequired = (paymentMethod.type == "Spree::Gateway::StripeConnect" || paymentMethod.type == "Spree::Gateway::StripeSCA") + $scope.cardRequired = (paymentMethod.type == "Spree::Gateway::StripeSCA") $scope.loadCustomer() if $scope.cardRequired && !$scope.customer $scope.loadCustomer = -> diff --git a/app/controllers/spree/admin/payment_methods_controller.rb b/app/controllers/spree/admin/payment_methods_controller.rb index 9a882fc5c2..94d95b6a6c 100644 --- a/app/controllers/spree/admin/payment_methods_controller.rb +++ b/app/controllers/spree/admin/payment_methods_controller.rb @@ -145,12 +145,11 @@ module Spree end def stripe_payment_method? - ["Spree::Gateway::StripeConnect", - "Spree::Gateway::StripeSCA"].include? @payment_method.try(:type) + ["Spree::Gateway::StripeSCA"].include? @payment_method.try(:type) end def stripe_provider?(provider) - provider.name.ends_with?("StripeConnect", "StripeSCA") + provider.name.ends_with?("StripeSCA") end def base_params diff --git a/app/models/spree/gateway/stripe_connect.rb b/app/models/spree/gateway/stripe_connect.rb deleted file mode 100644 index 91090569ff..0000000000 --- a/app/models/spree/gateway/stripe_connect.rb +++ /dev/null @@ -1,109 +0,0 @@ -# frozen_string_literal: true - -require 'stripe/profile_storer' - -module Spree - class Gateway - class StripeConnect < Gateway - preference :enterprise_id, :integer - - validate :ensure_enterprise_selected - - def method_type - 'stripe' - end - - def provider_class - ActiveMerchant::Billing::StripeGateway - end - - def payment_profiles_supported? - true - end - - def stripe_account_id - StripeAccount.find_by(enterprise_id: preferred_enterprise_id)&.stripe_user_id - end - - # NOTE: the name of this method is determined by Spree::Payment::Processing - def purchase(money, creditcard, gateway_options) - provider.purchase(*options_for_purchase_or_auth(money, creditcard, gateway_options)) - rescue Stripe::StripeError => e - # This will be an error caused by generating a stripe token - failed_activemerchant_billing_response(e.message) - end - - def charge_offline(money, creditcard, gateway_options) - purchase(money, creditcard, gateway_options) - end - - # NOTE: the name of this method is determined by Spree::Payment::Processing - def void(response_code, _creditcard, gateway_options) - gateway_options[:stripe_account] = stripe_account_id - provider.void(response_code, gateway_options) - end - - # NOTE: the name of this method is determined by Spree::Payment::Processing - def credit(money, _creditcard, response_code, gateway_options) - gateway_options[:stripe_account] = stripe_account_id - provider.refund(money, response_code, gateway_options) - end - - def create_profile(payment) - return unless payment.source.gateway_customer_profile_id.nil? - - profile_storer = Stripe::ProfileStorer.new(payment, provider) - profile_storer.create_customer_from_token - end - - private - - # In this gateway, what we call 'secret_key' is the 'login' - def options - options = super - options.merge(login: Stripe.api_key) - end - - def options_for_purchase_or_auth(money, creditcard, gateway_options) - options = {} - options[:description] = "Spree Order ID: #{gateway_options[:order_id]}" - options[:currency] = gateway_options[:currency] - options[:stripe_account] = stripe_account_id - - creditcard = token_from_card_profile_ids(creditcard) - - [money, creditcard, options] - end - - def token_from_card_profile_ids(creditcard) - token_or_card_id = creditcard.gateway_payment_profile_id - customer = creditcard.gateway_customer_profile_id - - return nil if token_or_card_id.blank? - - # Assume the gateway_payment_profile_id is a token generated by StripeJS - return token_or_card_id if customer.blank? - - # Assume the gateway_payment_profile_id is a Stripe card_id - # So generate a new token, using the customer_id and card_id - tokenize_instance_customer_card(customer, token_or_card_id) - end - - def tokenize_instance_customer_card(customer, card) - token = Stripe::Token.create({ card: card, customer: customer }, - stripe_account: stripe_account_id) - token.id - end - - def failed_activemerchant_billing_response(error_message) - ActiveMerchant::Billing::Response.new(false, error_message) - end - - def ensure_enterprise_selected - return if preferred_enterprise_id&.positive? - - errors.add(:stripe_account_owner, I18n.t(:error_required)) - end - end - end -end diff --git a/app/models/subscription.rb b/app/models/subscription.rb index f533b617f5..6f07fb92ec 100644 --- a/app/models/subscription.rb +++ b/app/models/subscription.rb @@ -2,7 +2,6 @@ class Subscription < ApplicationRecord ALLOWED_PAYMENT_METHOD_TYPES = ["Spree::PaymentMethod::Check", - "Spree::Gateway::StripeConnect", "Spree::Gateway::StripeSCA"].freeze searchable_attributes :shop_id, :canceled_at, :paused_at diff --git a/app/serializers/api/admin/payment_method_serializer.rb b/app/serializers/api/admin/payment_method_serializer.rb index 1d80e2025b..116504cfde 100644 --- a/app/serializers/api/admin/payment_method_serializer.rb +++ b/app/serializers/api/admin/payment_method_serializer.rb @@ -6,8 +6,7 @@ module Api delegate :serializable_hash, to: :method_serializer def method_serializer - if object.type == 'Spree::Gateway::StripeConnect' || - object.type == 'Spree::Gateway::StripeSCA' + if object.type == 'Spree::Gateway::StripeSCA' Api::Admin::PaymentMethod::StripeSerializer.new(object) else Api::Admin::PaymentMethod::BaseSerializer.new(object) diff --git a/app/views/spree/admin/payment_methods/_provider_settings.html.haml b/app/views/spree/admin/payment_methods/_provider_settings.html.haml index 735b6052ab..a60a4ecd49 100644 --- a/app/views/spree/admin/payment_methods/_provider_settings.html.haml +++ b/app/views/spree/admin/payment_methods/_provider_settings.html.haml @@ -1,6 +1,4 @@ - case @payment_method -- when Spree::Gateway::StripeConnect - = render 'stripe_connect' - when Spree::Gateway::StripeSCA = render 'stripe_connect' - else diff --git a/config/application.rb b/config/application.rb index 8d7efdcdc1..800cff8ff7 100644 --- a/config/application.rb +++ b/config/application.rb @@ -136,7 +136,6 @@ module Openfoodnetwork # Register Spree payment methods initializer "spree.gateway.payment_methods", :after => "spree.register.payment_methods" do |app| - app.config.spree.payment_methods << Spree::Gateway::StripeConnect app.config.spree.payment_methods << Spree::Gateway::StripeSCA app.config.spree.payment_methods << Spree::Gateway::PayPalExpress end diff --git a/engines/order_management/app/services/order_management/subscriptions/stripe_payment_setup.rb b/engines/order_management/app/services/order_management/subscriptions/stripe_payment_setup.rb index 6a5cf33acb..7620b7a666 100644 --- a/engines/order_management/app/services/order_management/subscriptions/stripe_payment_setup.rb +++ b/engines/order_management/app/services/order_management/subscriptions/stripe_payment_setup.rb @@ -28,8 +28,7 @@ module OrderManagement end def stripe_payment_method? - [Spree::Gateway::StripeConnect, - Spree::Gateway::StripeSCA].include? @payment.payment_method.class + [Spree::Gateway::StripeSCA].include? @payment.payment_method.class end def card_set? diff --git a/engines/order_management/app/services/order_management/subscriptions/validator.rb b/engines/order_management/app/services/order_management/subscriptions/validator.rb index 6fdc0aa9ea..eaa73822e5 100644 --- a/engines/order_management/app/services/order_management/subscriptions/validator.rb +++ b/engines/order_management/app/services/order_management/subscriptions/validator.rb @@ -93,8 +93,7 @@ module OrderManagement end def stripe_payment_method?(payment_method) - payment_method.type == "Spree::Gateway::StripeConnect" || - payment_method.type == "Spree::Gateway::StripeSCA" + payment_method.type == "Spree::Gateway::StripeSCA" end def subscription_line_items_present? diff --git a/engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb b/engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb index 7c52fba12a..5219714424 100644 --- a/engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb +++ b/engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb @@ -360,9 +360,9 @@ module OrderManagement end end - context "when using the StripeConnect payment gateway" do + context "when using the StripeSCA payment gateway" do let(:payment_method) { - instance_double(Spree::PaymentMethod, type: "Spree::Gateway::StripeConnect") + instance_double(Spree::PaymentMethod, type: "Spree::Gateway::StripeSCA") } before { expect(subscription).to receive(:customer).at_least(:once) { customer } } diff --git a/spec/models/spree/gateway/stripe_connect_spec.rb b/spec/models/spree/gateway/stripe_connect_spec.rb deleted file mode 100644 index 4b25c81439..0000000000 --- a/spec/models/spree/gateway/stripe_connect_spec.rb +++ /dev/null @@ -1,107 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe Spree::Gateway::StripeConnect, type: :model do - let(:provider) do - instance_double(ActiveMerchant::Billing::StripeGateway).tap do |p| - allow(p).to receive(:purchase) - allow(p).to receive(:authorize) - allow(p).to receive(:capture) - allow(p).to receive(:refund) - end - end - - let(:stripe_account_id) { "acct_123" } - - before do - Stripe.api_key = "sk_test_123456" - allow(subject).to receive(:stripe_account_id) { stripe_account_id } - allow(subject).to receive(:options_for_purchase_or_auth).and_return(['money', 'cc', 'opts']) - allow(subject).to receive(:provider).and_return provider - end - - describe "#token_from_card_profile_ids" do - let(:creditcard) { double(:creditcard) } - context "when the credit card provided has a gateway_payment_profile_id" do - before do - allow(creditcard).to receive(:gateway_payment_profile_id) { "token_or_card_id123" } - allow(subject).to receive(:tokenize_instance_customer_card) { "tokenized" } - end - - context "when the credit card provided has a gateway_customer_profile_id" do - before { allow(creditcard).to receive(:gateway_customer_profile_id) { "customer_id123" } } - - it "requests a new token via tokenize_instance_customer_card" do - result = subject.send(:token_from_card_profile_ids, creditcard) - expect(result).to eq "tokenized" - end - end - - context "when the credit card provided does not have a gateway_customer_profile_id" do - before { allow(creditcard).to receive(:gateway_customer_profile_id) { nil } } - it "returns the gateway_payment_profile_id (assumed to be a token already)" do - result = subject.send(:token_from_card_profile_ids, creditcard) - expect(result).to eq "token_or_card_id123" - end - end - end - - context "when the credit card provided does not have a gateway_payment_profile_id" do - before { allow(creditcard).to receive(:gateway_payment_profile_id) { nil } } - before { allow(creditcard).to receive(:gateway_customer_profile_id) { "customer_id123" } } - - it "returns nil....?" do - result = subject.send(:token_from_card_profile_ids, creditcard) - expect(result).to be nil - end - end - end - - describe "#tokenize_instance_customer_card" do - let(:customer_id) { "customer123" } - let(:card_id) { "card123" } - let(:token_mock) { { id: "test_token123" } } - - before do - stub_request(:post, "https://api.stripe.com/v1/tokens") - .with(body: { "card" => "card123", "customer" => "customer123" }) - .to_return(body: JSON.generate(token_mock)) - end - - it "requests a new token for the customer and card from Stripe, and returns the id of the response" do - expect(subject.send(:tokenize_instance_customer_card, customer_id, - card_id)).to eq token_mock[:id] - end - end - - describe "#credit" do - let(:gateway_options) { { some: 'option' } } - let(:money) { double(:money) } - let(:response_code) { double(:response_code) } - - before do - subject.credit(money, double(:creditcard), response_code, gateway_options) - end - - it "delegates to ActiveMerchant::Billing::StripeGateway#refund" do - expect(provider).to have_received(:refund) - end - - it "adds the stripe_account to the gateway options hash" do - expect(provider).to have_received(:refund).with(money, response_code, - hash_including(stripe_account: stripe_account_id)) - end - end - - describe "#charging offline" do - let(:gateway_options) { { some: 'option' } } - let(:money) { double(:money) } - let(:card) { double(:creditcard) } - - it "uses #purchase to charge offline" do - subject.charge_offline(money, card, gateway_options) - expect(provider).to have_received(:purchase).with('money', 'cc', 'opts') - end - end -end diff --git a/spec/requests/checkout/stripe_connect_spec.rb b/spec/requests/checkout/stripe_connect_spec.rb deleted file mode 100644 index 4c7fe894ac..0000000000 --- a/spec/requests/checkout/stripe_connect_spec.rb +++ /dev/null @@ -1,310 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe "checking out an order with a Stripe Connect payment method", type: :request do - include ShopWorkflow - include AuthenticationHelper - include OpenFoodNetwork::ApiHelper - - let!(:order_cycle) { create(:simple_order_cycle) } - let!(:enterprise) { create(:distributor_enterprise) } - let!(:shipping_method) do - create( - :shipping_method, - calculator: Calculator::FlatRate.new(preferred_amount: 0), - distributors: [enterprise] - ) - end - let!(:payment_method) { create(:stripe_connect_payment_method, distributors: [enterprise]) } - let!(:stripe_account) { create(:stripe_account, enterprise: enterprise) } - let!(:line_item) { create(:line_item, price: 12.34) } - let!(:order) { line_item.order } - let(:address) { create(:address) } - let(:token) { "token123" } - let(:new_token) { "newtoken123" } - let(:card_id) { "card_XyZ456" } - let(:customer_id) { "cus_A123" } - let(:payments_attributes) do - { - payment_method_id: payment_method.id, - source_attributes: { - gateway_payment_profile_id: token, - cc_type: "visa", - last_digits: "4242", - month: 10, - year: 2025, - first_name: 'Jill', - last_name: 'Jeffreys' - } - } - end - let(:allowed_address_attributes) do - [ - "firstname", - "lastname", - "address1", - "address2", - "phone", - "city", - "zipcode", - "state_id", - "country_id" - ] - end - let(:params) do - { - format: :json, order: { - shipping_method_id: shipping_method.id, - payments_attributes: [payments_attributes], - bill_address_attributes: address.attributes.slice(*allowed_address_attributes), - ship_address_attributes: address.attributes.slice(*allowed_address_attributes) - } - } - end - - before do - order_cycle_distributed_variants = double(:order_cycle_distributed_variants) - allow(OrderCycleDistributedVariants).to receive(:new) { order_cycle_distributed_variants } - allow(order_cycle_distributed_variants).to receive(:distributes_order_variants?) { true } - - Stripe.api_key = "sk_test_12345" - order.update(distributor_id: enterprise.id, order_cycle_id: order_cycle.id) - order.reload.update_totals - set_order order - end - - context "when a new card is submitted" do - let(:store_response_mock) do - { - status: 200, - body: JSON.generate( - id: customer_id, - default_card: card_id, - sources: { data: [{ id: "1" }] } - ) - } - end - let(:token_response_mock) do - { status: 200, body: JSON.generate(id: new_token) } - end - let(:charge_response_mock) do - { status: 200, body: JSON.generate(id: "ch_1234", object: "charge", amount: 2000) } - end - - context "and the user doesn't request that the card is saved for later" do - before do - # Charges the card - stub_request(:post, "https://api.stripe.com/v1/charges") - .with(basic_auth: ["sk_test_12345", ""], body: /#{token}.*#{order.number}/) - .to_return(charge_response_mock) - end - - context "and the charge request is successful" do - it "should process the payment without storing card details" do - put update_checkout_path, params: params - - expect(json_response["path"]).to eq order_path(order) - expect(order.payments.completed.count).to be 1 - - card = order.payments.completed.first.source - - expect(card.gateway_customer_profile_id).to eq nil - expect(card.gateway_payment_profile_id).to eq token - expect(card.cc_type).to eq "visa" - expect(card.last_digits).to eq "4242" - expect(card.first_name).to eq "Jill" - expect(card.last_name).to eq "Jeffreys" - end - end - - context "when the charge request returns an error message" do - let(:charge_response_mock) do - { status: 402, body: JSON.generate(error: { message: "charge-failure" }) } - end - - it "should not process the payment" do - put update_checkout_path, params: params - - expect(response.status).to be 400 - - expect(json_response["flash"]["error"]).to eq "charge-failure" - expect(order.payments.completed.count).to be 0 - end - end - end - - context "and the customer requests that the card is saved for later" do - before do - source_attributes = params[:order][:payments_attributes][0][:source_attributes] - source_attributes[:save_requested_by_customer] = '1' - - # Saves the card against the user - stub_request(:post, "https://api.stripe.com/v1/customers") - .with(basic_auth: ["sk_test_12345", ""], body: { card: token, email: order.email }) - .to_return(store_response_mock) - - # Requests a token from the newly saved card - stub_request(:post, "https://api.stripe.com/v1/tokens") - .with(body: { card: card_id, customer: customer_id }) - .to_return(token_response_mock) - - # Charges the card - stub_request(:post, "https://api.stripe.com/v1/charges") - .with( - basic_auth: ["sk_test_12345", ""], - body: /#{token}.*#{order.number}/ - ).to_return(charge_response_mock) - end - - context "and the store, token and charge requests are successful" do - it "should process the payment, and stores the card/customer details" do - put update_checkout_path, params: params - - expect(json_response["path"]).to eq order_path(order) - expect(order.payments.completed.count).to be 1 - - card = order.payments.completed.first.source - - expect(card.gateway_customer_profile_id).to eq customer_id - expect(card.gateway_payment_profile_id).to eq card_id - expect(card.cc_type).to eq "visa" - expect(card.last_digits).to eq "4242" - expect(card.first_name).to eq "Jill" - expect(card.last_name).to eq "Jeffreys" - end - end - - context "when the store request returns an error message" do - let(:store_response_mock) do - { status: 402, body: JSON.generate(error: { message: "store-failure" }) } - end - - it "should not process the payment" do - put update_checkout_path, params: params - - expect(response.status).to be 400 - - expect(json_response["flash"]["error"]) - .to eq(I18n.t(:spree_gateway_error_flash_for_checkout, error: 'store-failure')) - expect(order.payments.completed.count).to be 0 - end - end - - context "when the charge request returns an error message" do - let(:charge_response_mock) do - { status: 402, body: JSON.generate(error: { message: "charge-failure" }) } - end - - it "should not process the payment" do - put update_checkout_path, params: params - - expect(response.status).to be 400 - - expect(json_response["flash"]["error"]).to eq "charge-failure" - expect(order.payments.completed.count).to be 0 - end - end - - context "when the token request returns an error message" do - let(:token_response_mock) do - { status: 402, body: JSON.generate(error: { message: "token-failure" }) } - end - - # Note, no requests have been stubbed - it "should not process the payment" do - put update_checkout_path, params: params - - expect(response.status).to be 400 - - expect(json_response["flash"]["error"]).to eq "token-failure" - expect(order.payments.completed.count).to be 0 - end - end - end - end - - context "when an existing card is submitted" do - let(:credit_card) do - create( - :credit_card, - user_id: order.user_id, - gateway_payment_profile_id: card_id, - gateway_customer_profile_id: customer_id, - last_digits: "4321", - cc_type: "master", - first_name: "Sammy", - last_name: "Signpost", - month: 11, year: 2026 - ) - end - - let(:token_response_mock) { { status: 200, body: JSON.generate(id: new_token) } } - let(:charge_response_mock) do - { status: 200, body: JSON.generate(id: "ch_1234", object: "charge", amount: 2000) } - end - - before do - params[:order][:existing_card_id] = credit_card.id - login_as(order.user) - - # Requests a token - stub_request(:post, "https://api.stripe.com/v1/tokens") - .with(body: { "card" => card_id, "customer" => customer_id }) - .to_return(token_response_mock) - - # Charges the card - stub_request(:post, "https://api.stripe.com/v1/charges") - .with(basic_auth: ["sk_test_12345", ""], body: /#{token}.*#{order.number}/) - .to_return(charge_response_mock) - end - - context "and the charge and token requests are accepted" do - it "should process the payment, and keep the profile ids and other card details" do - put update_checkout_path, params: params - - expect(json_response["path"]).to eq order_path(order) - expect(order.payments.completed.count).to be 1 - - card = order.payments.completed.first.source - - expect(card.gateway_customer_profile_id).to eq customer_id - expect(card.gateway_payment_profile_id).to eq card_id - expect(card.cc_type).to eq "master" - expect(card.last_digits).to eq "4321" - expect(card.first_name).to eq "Sammy" - expect(card.last_name).to eq "Signpost" - end - end - - context "when the charge request returns an error message" do - let(:charge_response_mock) do - { status: 402, body: JSON.generate(error: { message: "charge-failure" }) } - end - - it "should not process the payment" do - put update_checkout_path, params: params - - expect(response.status).to be 400 - - expect(json_response["flash"]["error"]).to eq "charge-failure" - expect(order.payments.completed.count).to be 0 - end - end - - context "when the token request returns an error message" do - let(:token_response_mock) do - { status: 402, body: JSON.generate(error: { message: "token-error" }) } - end - - it "should not process the payment" do - put update_checkout_path, params: params - - expect(response.status).to be 400 - - expect(json_response["flash"]["error"]).to eq "token-error" - expect(order.payments.completed.count).to be 0 - end - end - end -end