solidus_six_saferpay 0.1.8.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2169c1b1f790ec1dcc28392c40f539850b50763f19b05aa8f081065c58cf45f
-  data.tar.gz: 664168547eb8918651455a7b63c0c7ab97e641fdd9495041ce7a4aefbbbff0b2
+  metadata.gz: 5e228b5766fec776fecd596f1f9316553ed3bc9d48c4ada1adfebb470da63c7c
+  data.tar.gz: 1367d382455ade917798c68ced6fd717e71dafd2caeb2cefccde0d58517903e7
 SHA512:
-  metadata.gz: b39396e4cc40b5329e510c9744564ad0296a756ab4ff6e467bee60bc44b7825ff5359b4aebde2ea479ded6f986b96c02f44ea527ef77d022da8e87dd02d10810
-  data.tar.gz: 582f78f26f3ea9b03e99f9ad28a95551ededba3c38003085a4d0952afffbc381a2317859df484948d98bc0a5e58d28ca510a1a890406b39552cb394047f16469
+  metadata.gz: 181ec3d7959392e3b7c0a100be584091507e74cdab7fb76efe19eaa406ae36ec4bc0777b8927c54d3e41518b52808f0d26e3202a35d703aaf63eced9d3c38199
+  data.tar.gz: 71c01086a0e866e1a0aa48e71304c057ff662cc268db3e961ef9761eb3182f7282c28ccdd2acfd1f7f827cc3939eb64d41921cfbb3f5f590066b2e572da3c5b6

data/README.md

@@ -2,6 +2,9 @@
 
 The `solidus_six_saferpay` engine adds checkout options for the Saferpay Payment Page ([Integration Guide](https://saferpay.github.io/sndbx/Integration_PP.html), [JSON API documentation](http://saferpay.github.io/jsonapi/#ChapterPaymentPage)) and the Saferpay Transaction ([Integration Guide](https://saferpay.github.io/sndbx/Integration_trx.html), [JSON API documentation](https://saferpay.github.io/sndbx/Integration_trx.html)).
 
+### Disclaimer
+This gem is built to be a general-purpose integration of the Six Saferpay payment interface. However due to lack of resources and because we are (as far as we know) the only users of this gem, we are only testing our use cases (PaymentPage). Therefore we can not guarantee that this will work in any other solidus shop. If you consider using this gem, please test everything thoroughly.
+
 ## Status
 Travis CI status: [![Build Status](https://travis-ci.org/fadendaten/solidus_six_saferpay.svg?branch=master)](https://travis-ci.org/fadendaten/solidus_six_saferpay)
 

data/app/controllers/spree/solidus_six_saferpay/checkout_controller.rb

@@ -3,8 +3,6 @@ module Spree
     class CheckoutController < StoreController
 
       def init
-        # loading the order is not shared between actions because the success
-        # action must break out of the iframe
         @order = current_order
         redirect_to(spree.cart_path) && return unless @order
 
@@ -21,9 +19,9 @@ module Spree
       end
 
       def success
-        # loading the order is not shared between actions because the success
-        # action must break out of the iframe
-        @order = current_order
+        order_number = params[:order_number]
+        @order = Spree::Order.find_by(number: order_number)
+
         if @order.nil?
           @redirect_path = spree.cart_path
           render :iframe_breakout_redirect, layout: false
@@ -75,9 +73,9 @@ module Spree
       end
 
       def fail
-        # loading the order is not shared between actions because the success
-        # action must break out of the iframe
-        @order = current_order
+        order_number = params[:order_number]
+        @order = Spree::Order.find_by(number: order_number)
+
         if @order.nil?
           @redirect_path = spree.cart_path
           render :iframe_breakout_redirect, layout: false
@@ -86,11 +84,13 @@ module Spree
 
         saferpay_payment = Spree::SixSaferpayPayment.where(order_id: @order.id).order(:created_at).last
 
+
         if saferpay_payment
           payment_inquiry = inquire_payment(saferpay_payment)
           flash[:error] = payment_inquiry.user_message
         else
-          flash[:error] = I18n.t(:general_error, scope: [:solidus_six_saferpay, :errors])
+          user_message = I18n.t(:general_error, scope: [:solidus_six_saferpay, :errors])
+          flash[:error] = user_message
         end
 
         @redirect_path = order_checkout_path(:payment)

data/app/services/spree/solidus_six_saferpay/inquire_payment.rb

@@ -21,6 +21,7 @@ module Spree
         if inquiry.success?
           saferpay_payment.update_attributes(response_hash: inquiry.api_response.to_h)
         else
+          saferpay_payment.update_attributes(response_hash: saferpay_payment.response_hash.merge(error: "#{inquiry.error_name}"))
           general_error = I18n.t(:general_error, scope: [:solidus_six_saferpay, :errors])
           specific_error = I18n.t(inquiry.error_name, scope: [:six_saferpay, :error_names])
           @user_message = "#{general_error}: #{specific_error}"

data/config/routes.rb

@@ -4,14 +4,14 @@ Spree::Core::Engine.routes.draw do
   namespace :solidus_six_saferpay do
     namespace :payment_page do
       get :init, controller: :checkout, defaults: { format: :json }
-      get :success, controller: :checkout
-      get :fail, controller: :checkout
+      get 'success/:order_number', to: 'checkout#success', as: :success
+      get 'fail/:order_number', to: 'checkout#fail', as: :fail
     end
 
     namespace :transaction do
       get :init, controller: :checkout, defaults: { format: :json }
-      get :success, controller: :checkout
-      get :fail, controller: :checkout
+      get 'success/:order_number', to: 'checkout#success', as: :success
+      get 'fail/:order_number', to: 'checkout#fail', as: :fail
     end
   end
 end

data/lib/solidus_six_saferpay/gateway.rb

@@ -5,9 +5,6 @@ module SolidusSixSaferpay
 
     def initialize(options = {})
       SixSaferpay.configure do |config|
-        config.success_url = options.fetch(:success_url)
-        config.fail_url = options.fetch(:fail_url)
-
         # Allow config via ENV for static values
         config.customer_id = options.fetch(:customer_id) { ENV.fetch('SIX_SAFERPAY_CUSTOMER_ID') }
         config.terminal_id = options.fetch(:terminal_id) { ENV.fetch('SIX_SAFERPAY_TERMINAL_ID') }
@@ -87,24 +84,23 @@ module SolidusSixSaferpay
     end
 
     def refund(amount, transaction_id, options = {})
-      Rollbar.error("Disabled Refund for: #{transaction_id}")
-      # payment = Spree::Payment.find_by!(response_code: transaction_id)
-      # refund_amount = Spree::Money.new(amount, currency: payment.currency)
+      payment = Spree::Payment.find_by!(response_code: transaction_id)
+      refund_amount = Spree::Money.new(amount, currency: payment.currency)
 
-      # saferpay_amount = SixSaferpay::Amount.new(value: refund_amount.cents, currency_code: payment.currency)
-      # saferpay_refund = SixSaferpay::Refund.new(amount: saferpay_amount, order_id: payment.order.number)
-      # capture_reference = SixSaferpay::CaptureReference.new(capture_id: payment.transaction_id)
+      saferpay_amount = SixSaferpay::Amount.new(value: refund_amount.cents, currency_code: payment.currency)
+      saferpay_refund = SixSaferpay::Refund.new(amount: saferpay_amount, order_id: payment.order.number)
+      capture_reference = SixSaferpay::CaptureReference.new(capture_id: payment.transaction_id)
 
-      # payment_refund = SixSaferpay::SixTransaction::Refund.new(refund: saferpay_refund, capture_reference: capture_reference)
+      payment_refund = SixSaferpay::SixTransaction::Refund.new(refund: saferpay_refund, capture_reference: capture_reference)
 
-      # if refund_response = SixSaferpay::Client.post(payment_refund)
+      if refund_response = SixSaferpay::Client.post(payment_refund)
 
-      #   # actually capture the refund
-      #   capture(amount, refund_response.transaction.id, options)
-      # end
+        # actually capture the refund
+        capture(amount, refund_response.transaction.id, options)
+      end
 
-    # rescue SixSaferpay::Error => e
-      # handle_error(e, refund_response)
+    rescue SixSaferpay::Error => e
+      handle_error(e, refund_response)
     end
 
     private
@@ -157,7 +153,7 @@ module SolidusSixSaferpay
       )
       payer = SixSaferpay::Payer.new(language_code: I18n.locale, billing_address: billing_address, delivery_address: delivery_address)
 
-      params = { payment: payment, payer: payer }
+      params = { payment: payment, payer: payer, return_urls: return_urls(order) }
 
       six_payment_methods = payment_method.enabled_payment_methods
       params.merge!(payment_methods: six_payment_methods) unless six_payment_methods.blank?
@@ -165,6 +161,10 @@ module SolidusSixSaferpay
       params
     end
 
+    def return_urls(order)
+      raise NotImplementedError, "Must be implemented in PaymentPageGateway or TransactionGateway"
+    end
+
     def response(success, message, api_response, options = {})
       GatewayResponse.new(success, message, api_response, options)
     end

data/lib/solidus_six_saferpay/payment_page_gateway.rb

@@ -1,15 +1,6 @@
 module SolidusSixSaferpay
   class PaymentPageGateway < Gateway
 
-    def initialize(options = {})
-      super(
-        options.merge(
-          success_url: url_helpers.solidus_six_saferpay_payment_page_success_url,
-          fail_url: url_helpers.solidus_six_saferpay_payment_page_fail_url
-        )
-      )
-    end
-
     def inquire(saferpay_payment, options = {})
       inquire_response = perform_assert_request(saferpay_payment, options)
 
@@ -47,6 +38,14 @@ module SolidusSixSaferpay
       SixSaferpay::SixPaymentPage::Initialize.new(interface_initialize_params(order, payment_method))
     end
 
+    def return_urls(order)
+      SixSaferpay::ReturnUrls.new(
+        success: url_helpers.solidus_six_saferpay_payment_page_success_url(order.number),
+        fd_fail: url_helpers.solidus_six_saferpay_payment_page_fail_url(order.number),
+        fd_abort: url_helpers.solidus_six_saferpay_payment_page_fail_url(order.number)
+      )
+    end
+
     def perform_assert_request(saferpay_payment, options = {})
       payment_page_assert = SixSaferpay::SixPaymentPage::Assert.new(token: saferpay_payment.token)
       SixSaferpay::Client.post(payment_page_assert)

data/lib/solidus_six_saferpay/transaction_gateway.rb

@@ -1,15 +1,6 @@
 module SolidusSixSaferpay
   class TransactionGateway < Gateway
 
-    def initialize(options = {})
-      super(
-        options.merge(
-          success_url: url_helpers.solidus_six_saferpay_transaction_success_url,
-          fail_url: url_helpers.solidus_six_saferpay_transaction_fail_url
-        )
-      )
-    end
-
     def inquire(saferpay_payment, options = {})
       transaction_inquire = SixSaferpay::SixTransaction::Inquire.new(transaction_reference: saferpay_payment.transaction_id)
       inquire_response = SixSaferpay::Client.post(transaction_inquire)
@@ -43,5 +34,13 @@ module SolidusSixSaferpay
     def interface_initialize_object(order, payment_method)
       SixSaferpay::SixTransaction::Initialize.new(interface_initialize_params(order, payment_method))
     end
+
+    def return_urls(order)
+      SixSaferpay::ReturnUrls.new(
+        success: url_helpers.solidus_six_saferpay_transaction_success_url(order.number),
+        fd_fail: url_helpers.solidus_six_saferpay_transaction_fail_url(order.number),
+        fd_abort: url_helpers.solidus_six_saferpay_transaction_fail_url(order.number)
+      )
+    end
   end
 end

data/lib/solidus_six_saferpay/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusSixSaferpay
-  VERSION = '0.1.8.1'
+  VERSION = '0.2.0'
 end

data/spec/controllers/spree/solidus_six_saferpay/payment_page/checkout_controller_spec.rb

@@ -63,7 +63,7 @@ RSpec.describe Spree::SolidusSixSaferpay::PaymentPage::CheckoutController, type:
       let(:order) { nil }
 
       it 'redirects to the cart page via iframe breakout' do
-        get :success
+        get :success, params: { order_number: "not_found" }
         expect(assigns(:redirect_path)).to eq(routes.cart_path)
         expect(response).to render_template :iframe_breakout_redirect
       end
@@ -73,7 +73,7 @@ RSpec.describe Spree::SolidusSixSaferpay::PaymentPage::CheckoutController, type:
       let(:order) { create(:order_ready_to_ship) }
 
       it 'redirects to the cart page via iframe breakout' do
-        get :success
+        get :success, params: { order_number: order.number }
         expect(assigns(:redirect_path)).to eq(routes.cart_path)
         expect(response).to render_template :iframe_breakout_redirect
       end
@@ -83,7 +83,7 @@ RSpec.describe Spree::SolidusSixSaferpay::PaymentPage::CheckoutController, type:
       let!(:payment) { nil }
 
       it 'raises an error because no payment exists' do
-        expect{ get(:success) }.to raise_error(Spree::Core::GatewayError)
+        expect{ get(:success, params: { order_number: order.number }) }.to raise_error(Spree::Core::GatewayError)
       end
     end
 
@@ -97,7 +97,7 @@ RSpec.describe Spree::SolidusSixSaferpay::PaymentPage::CheckoutController, type:
         expect(Spree::SolidusSixSaferpay::AssertPaymentPage).to receive(:call).with(payment).and_return(payment_assert)
         expect(Spree::SolidusSixSaferpay::InquirePaymentPagePayment).to receive(:call).with(payment).and_return(payment_inquiry)
 
-        get :success
+        get :success, params: { order_number: order.number }
       end
 
       context 'when the payment assert is successful' do
@@ -112,7 +112,7 @@ RSpec.describe Spree::SolidusSixSaferpay::PaymentPage::CheckoutController, type:
         it 'processes the asserted payment' do
           expect(Spree::SolidusSixSaferpay::ProcessPaymentPagePayment).to receive(:call).with(payment).and_return(processed_payment)
 
-          get :success
+          get :success, params: { order_number: order.number }
         end
 
         context 'when the processing is successful' do
@@ -120,6 +120,7 @@ RSpec.describe Spree::SolidusSixSaferpay::PaymentPage::CheckoutController, type:
 
           before do
             allow(Spree::SolidusSixSaferpay::ProcessPaymentPagePayment).to receive(:call).with(payment).and_return(processed_payment)
+            allow(Spree::Order).to receive(:find_by).with(number: order.number).and_return(order)
           end
 
 
@@ -129,7 +130,7 @@ RSpec.describe Spree::SolidusSixSaferpay::PaymentPage::CheckoutController, type:
             it 'moves order to next state' do
               expect(order).to receive(:next!)
 
-              get :success
+              get :success, params: { order_number: order.number }
             end
           end
 
@@ -139,7 +140,7 @@ RSpec.describe Spree::SolidusSixSaferpay::PaymentPage::CheckoutController, type:
             it 'does not modify the order state' do
               expect(order).not_to receive(:next!)
 
-              get :success
+              get :success, params: { order_number: order.number }
             end
           end
         end
@@ -152,7 +153,7 @@ RSpec.describe Spree::SolidusSixSaferpay::PaymentPage::CheckoutController, type:
           end
 
           it 'displays an error message' do
-            get :success
+            get :success, params: { order_number: order.number }
 
             expect(flash[:error]).to eq("payment processing message")
           end
@@ -170,12 +171,12 @@ RSpec.describe Spree::SolidusSixSaferpay::PaymentPage::CheckoutController, type:
         it 'inquires the payment' do
           expect(Spree::SolidusSixSaferpay::InquirePaymentPagePayment).to receive(:call).with(payment).and_return(payment_inquiry)
 
-          get :success
+          get :success, params: { order_number: order.number }
         end
 
         it 'displays an error message' do
           expect(Spree::SolidusSixSaferpay::InquirePaymentPagePayment).to receive(:call).with(payment).and_return(payment_inquiry)
-          get :success
+          get :success, params: { order_number: order.number }
 
           expect(flash[:error]).to eq("payment inquiry message")
         end
@@ -190,13 +191,13 @@ RSpec.describe Spree::SolidusSixSaferpay::PaymentPage::CheckoutController, type:
     it 'inquires the payment' do
       expect(Spree::SolidusSixSaferpay::InquirePaymentPagePayment).to receive(:call).with(payment).and_return(payment_inquiry)
 
-      get :fail
+      get :fail, params: { order_number: order.number }
     end
 
     it 'displays an error message' do
       expect(Spree::SolidusSixSaferpay::InquirePaymentPagePayment).to receive(:call).with(payment).and_return(payment_inquiry)
 
-      get :fail
+      get :fail, params: { order_number: order.number }
 
       expect(flash[:error]).to eq("payment inquiry message")
     end

data/spec/controllers/spree/solidus_six_saferpay/transaction/checkout_controller_spec.rb

@@ -63,7 +63,7 @@ RSpec.describe Spree::SolidusSixSaferpay::Transaction::CheckoutController, type:
       let(:order) { nil }
 
       it 'redirects to the cart page via iframe breakout' do
-        get :success
+        get :success, params: { order_number: 'not_found' }
         expect(assigns(:redirect_path)).to eq(routes.cart_path)
         expect(response).to render_template :iframe_breakout_redirect
       end
@@ -73,7 +73,7 @@ RSpec.describe Spree::SolidusSixSaferpay::Transaction::CheckoutController, type:
       let(:order) { create(:order_ready_to_ship) }
 
       it 'redirects to the cart page via iframe breakout' do
-        get :success
+        get :success, params: { order_number: order.number }
         expect(assigns(:redirect_path)).to eq(routes.cart_path)
         expect(response).to render_template :iframe_breakout_redirect
       end
@@ -83,7 +83,7 @@ RSpec.describe Spree::SolidusSixSaferpay::Transaction::CheckoutController, type:
       let!(:payment) { nil }
 
       it 'raises an error because no payment exists' do
-        expect{ get(:success) }.to raise_error(Spree::Core::GatewayError)
+        expect{ get(:success, params: { order_number: order.number }) }.to raise_error(Spree::Core::GatewayError)
       end
     end
 
@@ -97,7 +97,7 @@ RSpec.describe Spree::SolidusSixSaferpay::Transaction::CheckoutController, type:
         expect(Spree::SolidusSixSaferpay::AuthorizeTransaction).to receive(:call).with(payment).and_return(payment_assert)
         expect(Spree::SolidusSixSaferpay::InquireTransactionPayment).to receive(:call).with(payment).and_return(payment_inquiry)
 
-        get :success
+        get :success, params: { order_number: order.number }
       end
 
       context 'when the payment assert is successful' do
@@ -112,7 +112,7 @@ RSpec.describe Spree::SolidusSixSaferpay::Transaction::CheckoutController, type:
         it 'processes the asserted payment' do
           expect(Spree::SolidusSixSaferpay::ProcessTransactionPayment).to receive(:call).with(payment).and_return(processed_payment)
 
-          get :success
+          get :success, params: { order_number: order.number }
         end
 
         context 'when the processing is successful' do
@@ -120,6 +120,7 @@ RSpec.describe Spree::SolidusSixSaferpay::Transaction::CheckoutController, type:
 
           before do
             allow(Spree::SolidusSixSaferpay::ProcessTransactionPayment).to receive(:call).with(payment).and_return(processed_payment)
+            allow(Spree::Order).to receive(:find_by).with(number: order.number).and_return(order)
           end
 
           context 'when the default success handling is applied' do
@@ -129,7 +130,7 @@ RSpec.describe Spree::SolidusSixSaferpay::Transaction::CheckoutController, type:
               it 'moves order to next state' do
                 expect(order).to receive(:next!)
 
-                get :success
+                get :success, params: { order_number: order.number }
               end
             end
 
@@ -139,7 +140,7 @@ RSpec.describe Spree::SolidusSixSaferpay::Transaction::CheckoutController, type:
               it 'does not modify the order state' do
                 expect(order).not_to receive(:next!)
 
-                get :success
+                get :success, params: { order_number: order.number }
               end
             end
           end
@@ -156,13 +157,13 @@ RSpec.describe Spree::SolidusSixSaferpay::Transaction::CheckoutController, type:
             it 'does not modify the order state' do
               expect(order).not_to receive(:next!)
 
-              get :success
+              get :success, params: { order_number: order.number }
             end
 
             it 'executes the custom handler' do
               expect(order).to receive(:email)
 
-              get :success
+              get :success, params: { order_number: order.number }
             end
           end
         end
@@ -175,7 +176,7 @@ RSpec.describe Spree::SolidusSixSaferpay::Transaction::CheckoutController, type:
           end
 
           it 'displays an error message' do
-            get :success
+            get :success, params: { order_number: order.number }
 
             expect(flash[:error]).to eq("payment processing message")
           end
@@ -193,12 +194,12 @@ RSpec.describe Spree::SolidusSixSaferpay::Transaction::CheckoutController, type:
         it 'inquires the payment' do
           expect(Spree::SolidusSixSaferpay::InquireTransactionPayment).to receive(:call).with(payment).and_return(payment_inquiry)
 
-          get :success
+          get :success, params: { order_number: order.number }
         end
 
         it 'displays an error message' do
           expect(Spree::SolidusSixSaferpay::InquireTransactionPayment).to receive(:call).with(payment).and_return(payment_inquiry)
-          get :success
+          get :success, params: { order_number: order.number }
 
           expect(flash[:error]).to eq("payment inquiry message")
         end
@@ -213,13 +214,13 @@ RSpec.describe Spree::SolidusSixSaferpay::Transaction::CheckoutController, type:
     it 'inquires the payment' do
       expect(Spree::SolidusSixSaferpay::InquireTransactionPayment).to receive(:call).with(payment).and_return(payment_inquiry)
 
-      get :fail
+      get :fail, params: { order_number: order.number }
     end
 
     it 'displays an error message' do
       expect(Spree::SolidusSixSaferpay::InquireTransactionPayment).to receive(:call).with(payment).and_return(payment_inquiry)
 
-      get :fail
+      get :fail, params: { order_number: order.number }
       
       expect(flash[:error]).to eq("payment inquiry message")
     end

data/spec/services/spree/solidus_six_saferpay/inquire_payment_page_payment_spec.rb

@@ -44,8 +44,8 @@ module Spree
             expect(subject).to be_success
           end
 
-          it 'does not update the response hash' do
-            expect { subject.call }.not_to change { payment.response_hash }
+          it 'adds the error message to the response hash' do
+            expect { subject.call }.to change { payment.response_hash }.from({}).to({error: error_name})
           end
 
           it 'sets the user message according to the api error code' do

data/spec/services/spree/solidus_six_saferpay/inquire_transaction_payment_spec.rb

@@ -44,8 +44,8 @@ module Spree
             expect(subject).to be_success
           end
 
-          it 'does not update the response hash' do
-            expect { subject.call }.not_to change { payment.response_hash }
+          it 'adds the error message to the response hash' do
+            expect { subject.call }.to change { payment.response_hash }.from({}).to({error: error_name})
           end
 
           it 'sets the user message according to the api error code' do

data/spec/solidus_six_saferpay/gateway_spec.rb

@@ -7,15 +7,11 @@ module SolidusSixSaferpay
     let(:terminal_id) { 'TERMINAL_ID' }
     let(:username) { 'USERNAME' }
     let(:password) { 'PASSWORD' }
-    let(:success_url) { '/api/endpoints/success' }
-    let(:fail_url) { '/api/endpoints/fail' }
     let(:base_url) { 'https://test.saferpay-api-host.test' }
     let(:css_url) { '/custom/css/url' }
 
     let(:gateway) do
       described_class.new(
-        success_url: success_url,
-        fail_url: fail_url,
         customer_id: customer_id,
         terminal_id: terminal_id,
         username: username,
@@ -29,8 +25,6 @@ module SolidusSixSaferpay
       
       it 'configures the API client' do
         gateway = described_class.new(
-          success_url: success_url,
-          fail_url: fail_url,
           customer_id: customer_id,
           terminal_id: terminal_id,
           username: username,
@@ -45,8 +39,6 @@ module SolidusSixSaferpay
         expect(config.terminal_id).to eq(terminal_id)
         expect(config.username).to eq(username)
         expect(config.password).to eq(password)
-        expect(config.success_url).to eq(success_url)
-        expect(config.fail_url).to eq(fail_url)
         expect(config.base_url).to eq(base_url)
         expect(config.css_url).to eq(css_url)
       end
@@ -63,10 +55,7 @@ module SolidusSixSaferpay
         end
         
         it 'falls back to ENV vars' do
-          gateway = described_class.new(
-            success_url: success_url,
-            fail_url: fail_url
-          )
+          gateway = described_class.new
 
           config = SixSaferpay.config
 
@@ -74,8 +63,6 @@ module SolidusSixSaferpay
           expect(config.terminal_id).to eq(terminal_id)
           expect(config.username).to eq(username)
           expect(config.password).to eq(password)
-          expect(config.success_url).to eq(success_url)
-          expect(config.fail_url).to eq(fail_url)
           expect(config.base_url).to eq(base_url)
           expect(config.css_url).to eq(css_url)
         end

data/spec/solidus_six_saferpay/payment_page_gateway_spec.rb

@@ -8,8 +8,6 @@ module SolidusSixSaferpay
     let(:terminal_id) { 'TERMINAL_ID' }
     let(:username) { 'USERNAME' }
     let(:password) { 'PASSWORD' }
-    let(:success_url) { '/api/endpoints/success' }
-    let(:fail_url) { '/api/endpoints/fail' }
     let(:base_url) { 'https://test.saferpay-api-host.test' }
     let(:css_url) { '/custom/css/url' }
 
@@ -38,17 +36,6 @@ module SolidusSixSaferpay
       allow(ENV).to receive(:fetch).with('SIX_SAFERPAY_CSS_URL').and_return(css_url)
     end
 
-    describe '#initialize' do
-      it 'configures the API client with correct urls by default' do
-        described_class.new
-
-        config = SixSaferpay.config
-
-        expect(config.success_url).to eq(solidus_six_saferpay_payment_page_success_url)
-        expect(config.fail_url).to eq(solidus_six_saferpay_payment_page_fail_url)
-      end
-    end
-
     describe '#initialize_payment' do
 
       let(:saferpay_billing_address) do
@@ -111,11 +98,19 @@ module SolidusSixSaferpay
           delivery_address: saferpay_shipping_address
         )
       end
+      let(:return_urls) do
+        instance_double("SixSaferpay::ReturnUrls",
+          success: solidus_six_saferpay_payment_page_success_url(order),
+          fd_fail: solidus_six_saferpay_payment_page_fail_url(order),
+          fd_abort: solidus_six_saferpay_payment_page_fail_url(order),
+         )
+      end
 
       let(:initialize_params) do
         {
           payment: saferpay_payment,
-          payer: saferpay_payer
+          payer: saferpay_payer,
+          return_urls: return_urls
         }
       end
 
@@ -185,6 +180,13 @@ module SolidusSixSaferpay
           delivery_address: saferpay_shipping_address
         ).and_return(saferpay_payer)
 
+        # mock return_urls
+        expect(SixSaferpay::ReturnUrls).to receive(:new).with(
+          success: solidus_six_saferpay_payment_page_success_url(order),
+          fd_fail: solidus_six_saferpay_payment_page_fail_url(order),
+          fd_abort: solidus_six_saferpay_payment_page_fail_url(order),
+        ).and_return(return_urls)
+
         expect(SixSaferpay::SixPaymentPage::Initialize).to receive(:new).with(initialize_params).and_return(saferpay_initialize)
 
         expect(SixSaferpay::Client).to receive(:post).with(saferpay_initialize).and_return(api_initialize_response)

data/spec/solidus_six_saferpay/transaction_gateway_spec.rb

@@ -8,8 +8,6 @@ module SolidusSixSaferpay
     let(:terminal_id) { 'TERMINAL_ID' }
     let(:username) { 'USERNAME' }
     let(:password) { 'PASSWORD' }
-    let(:success_url) { '/api/endpoints/success' }
-    let(:fail_url) { '/api/endpoints/fail' }
     let(:base_url) { 'https://test.saferpay-api-host.test' }
     let(:css_url) { '/custom/css/url' }
 
@@ -38,17 +36,6 @@ module SolidusSixSaferpay
       allow(ENV).to receive(:fetch).with('SIX_SAFERPAY_CSS_URL').and_return(css_url)
     end
 
-    describe '#initialize' do
-      it 'configures the API client with correct urls by default' do
-        described_class.new
-
-        config = SixSaferpay.config
-
-        expect(config.success_url).to eq(solidus_six_saferpay_transaction_success_url)
-        expect(config.fail_url).to eq(solidus_six_saferpay_transaction_fail_url)
-      end
-    end
-
     describe '#initialize_payment' do
 
       let(:saferpay_billing_address) do
@@ -112,10 +99,19 @@ module SolidusSixSaferpay
         )
       end
 
+      let(:return_urls) do
+        instance_double("SixSaferpay::ReturnUrls",
+          success: solidus_six_saferpay_transaction_success_url(order),
+          fd_fail: solidus_six_saferpay_transaction_fail_url(order),
+          fd_abort: solidus_six_saferpay_transaction_fail_url(order),
+         )
+      end
+
       let(:initialize_params) do
         {
           payment: saferpay_payment,
-          payer: saferpay_payer
+          payer: saferpay_payer,
+          return_urls: return_urls
         }
       end
 
@@ -189,6 +185,13 @@ module SolidusSixSaferpay
           delivery_address: saferpay_shipping_address
         ).and_return(saferpay_payer)
 
+        # mock return_urls
+        expect(SixSaferpay::ReturnUrls).to receive(:new).with(
+          success: solidus_six_saferpay_transaction_success_url(order),
+          fd_fail: solidus_six_saferpay_transaction_fail_url(order),
+          fd_abort: solidus_six_saferpay_transaction_fail_url(order),
+        ).and_return(return_urls)
+
         expect(SixSaferpay::SixTransaction::Initialize).to receive(:new).with(initialize_params).and_return(saferpay_initialize)
 
         expect(SixSaferpay::Client).to receive(:post).with(saferpay_initialize).and_return(api_initialize_response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_six_saferpay
 version: !ruby/object:Gem::Version
-  version: 0.1.8.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Simon Kiener
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -366,7 +366,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Saferpay Payment Page and Transaction payment methods for Solidus