active_merchant-epsilon 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fe0b19a8605e29e5c3a2a310e3b9684767a21fb2f93957342ffd41b9135657e
-  data.tar.gz: b8eb1a2b4d150c0696d26a52e58f5069a60542739bc6461d61f864ad20a470db
+  metadata.gz: 91e76e51445d095695e77bdd56b88062b52afcfe35c48b4c6eb4e9d890f6bc0b
+  data.tar.gz: 51a731fc40d31bc182ce462ff041d5aeb9ed833095f8caffcd6b3b962e958e52
 SHA512:
-  metadata.gz: 87d7533d96fd6591a2b4ffeb78c7cfe2de4ad987e41c58be72083672f346178be6fa593e3aad6a5f3b66b0dde708e883d6d82a8c864a05006589d33a2978b41c
-  data.tar.gz: '0782a6f4c48fcc0e905a7b72205d5511bea0ffa95ca285dceee5058d97ae0d63e25fc2e2b009910b800c398b2cb07451cb525f8d0ee1f58696228c487f2f4106'
+  metadata.gz: 368556d657fc83e9912def82af6a5040c19d53ed9249444e42ca4a61c1a30c2186a0d5af52f80a121e2b1f9ea052fa13878bca35474ca4a7e5bc4755c9ba8ea0
+  data.tar.gz: bb51f853bd5be0c7560ff902a63d1b168bbadbd9cb7ecc92b7451c006b7e4302651c81c62b89099306ad50cb0749e2301f92e04d6896953462febd22f8cecb0e

data/.github/workflows/test.yml

@@ -11,12 +11,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.4, 2.5, 2.6, 2.7, 3.0]
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4.0-preview1']
 
     steps:
     - uses: actions/checkout@v2
 
-    - uses: ruby/setup-ruby@v1.63.0
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+### 0.15.0
+
+- [Support 3D Secure parameters for link type payments](https://github.com/pepabo/active_merchant-epsilon/pull/131)
+
 ### 0.14.0
 
 - [Support 3D Secure 2.0 for credit card payments](https://github.com/pepabo/active_merchant-epsilon/pull/121)

data/README.md

@@ -127,8 +127,8 @@ end
 # AND SECOND REQUEST
 
 response = gateway.authenticate(
-  order_number:         'ORDER NUMBER',
-  three_d_secure_pares: 'PAYMENT AUTHENTICATION RESPONSE',
+  order_number:          'ORDER NUMBER',
+  three_d_secure_pa_res: 'PAYMENT AUTHENTICATION RESPONSE',
 )
 
 if response.success?
@@ -199,8 +199,8 @@ end
 # AND SECOND REQUEST
 
 response = gateway.authenticate(
-  order_number:         'ORDER NUMBER',
-  three_d_secure_pares: 'PAYMENT AUTHENTICATION RESPONSE',
+  order_number:          'ORDER NUMBER',
+  three_d_secure_pa_res: 'PAYMENT AUTHENTICATION RESPONSE',
 )
 
 if response.success?

data/lib/active_merchant/billing/gateways/epsilon/epsilon_risk_base_auth_params.rb

@@ -0,0 +1,25 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module EpsilonRiskBaseAuthParams
+      KEYS = %i[
+        tds_flag billAddrCity billAddrCountry billAddrLine1 billAddrLine2 billAddrLine3
+        billAddrPostCode billAddrState shipAddrCity shipAddrCountry shipAddrLine1 shipAddrLine2
+        shipAddrLine3 shipAddrPostCode shipAddrState chAccAgeInd chAccChange
+        chAccChangeIndchAccDate chAccPwdChange chAccPwChangeInd nbPurchaseAccount paymentAccAge
+        paymentAccInd provisionAttemptsDay shipAddressUsage shipAddressUsageInd shipNameIndicator
+        suspiciousAccActivity txnActivityDay txnActivityYear threeDSReqAuthData threeDSReqAuthMethod
+        threeDSReqAuthTimestamp addrMatch cardholderName homePhone mobilePhone
+        workPhone challengeInd deliveryEmailAddress deliveryTimeframe giftCardAmount
+        giftCardCount preOrderDate preOrderPurchaseInd reorderItemsInd shipIndicator
+      ].freeze
+
+      THREE_D_SECURE_2_INDICATORS = [21, 22].freeze
+
+      def three_d_secure_2?(tds_flag)
+        THREE_D_SECURE_2_INDICATORS.include?(tds_flag)
+      end
+
+      module_function :three_d_secure_2?
+    end
+  end
+end

data/lib/active_merchant/billing/gateways/epsilon.rb

@@ -22,20 +22,6 @@ module ActiveMerchant #:nodoc:
         capture:                 'sales_payment.cgi',
       }.freeze
 
-      RISK_BASE_AUTH_PARAMS_KEYS = %i[
-        tds_flag billAddrCity billAddrCountry billAddrLine1 billAddrLine2 billAddrLine3
-        billAddrPostCode billAddrState shipAddrCity shipAddrCountry shipAddrLine1 shipAddrLine2
-        shipAddrLine3 shipAddrPostCode shipAddrState chAccAgeInd chAccChange
-        chAccChangeIndchAccDate chAccPwdChange chAccPwChangeInd nbPurchaseAccount paymentAccAge
-        paymentAccInd provisionAttemptsDay shipAddressUsage shipAddressUsageInd shipNameIndicator
-        suspiciousAccActivity txnActivityDay txnActivityYear threeDSReqAuthData threeDSReqAuthMethod
-        threeDSReqAuthTimestamp addrMatch cardholderName homePhone mobilePhone
-        workPhone challengeInd deliveryEmailAddress deliveryTimeframe giftCardAmount
-        giftCardCount preOrderDate preOrderPurchaseInd reorderItemsInd shipIndicator
-      ].freeze
-
-      THREE_D_SECURE_2_INDICATORS = [21, 22].freeze
-
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
 
       def purchase(amount, credit_card, detail = {})
@@ -44,7 +30,7 @@ module ActiveMerchant #:nodoc:
         params = billing_params(amount, credit_card, detail)
 
         if three_d_secure_2?(detail)
-          params.merge!(detail.slice(*RISK_BASE_AUTH_PARAMS_KEYS).compact)
+          params.merge!(detail.slice(*EpsilonRiskBaseAuthParams::KEYS).compact)
         end
 
         commit(PATHS[:purchase], params)
@@ -73,7 +59,7 @@ module ActiveMerchant #:nodoc:
         params[:kari_flag] = detail[:capture] ? 2 : 1 if detail.has_key?(:capture)
 
         if three_d_secure_2?(detail)
-          params.merge!(detail.slice(*RISK_BASE_AUTH_PARAMS_KEYS).compact)
+          params.merge!(detail.slice(*EpsilonRiskBaseAuthParams::KEYS).compact)
         end
 
         commit(PATHS[:registered_purchase], params)
@@ -263,7 +249,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def three_d_secure_2?(detail)
-        THREE_D_SECURE_2_INDICATORS.include?(detail[:tds_flag])
+        EpsilonRiskBaseAuthParams.three_d_secure_2?(detail[:tds_flag])
       end
     end
   end

data/lib/active_merchant/billing/gateways/epsilon_link_payment.rb

@@ -39,6 +39,10 @@ module ActiveMerchant #:nodoc:
         params[:memo2] = detail[:memo2] if detail.has_key?(:memo2)
         params[:user_tel] = detail[:user_tel] if detail.has_key?(:user_tel)
 
+        if three_d_secure_2?(detail)
+          params.merge!(detail.slice(*EpsilonRiskBaseAuthParams::KEYS).compact)
+        end
+
         commit('receive_order3.cgi', params, RESPONSE_KEYS)
       end
 
@@ -50,6 +54,12 @@ module ActiveMerchant #:nodoc:
 
         commit('cancel_payment.cgi', params)
       end
+
+      private
+
+      def three_d_secure_2?(detail)
+        EpsilonRiskBaseAuthParams.three_d_secure_2?(detail[:tds_flag])
+      end
     end
   end
 end

data/lib/active_merchant/epsilon/version.rb

@@ -1,5 +1,5 @@
 module ActiveMerchant
   module Epsilon
-    VERSION = "0.14.0"
+    VERSION = "0.15.0"
   end
 end

data/lib/active_merchant/epsilon.rb

@@ -5,6 +5,7 @@ require_relative 'epsilon/version'
 require_relative 'billing/convenience_store'
 require_relative 'billing/gateways/epsilon/epsilon_mission_code'
 require_relative 'billing/gateways/epsilon/epsilon_process_code'
+require_relative 'billing/gateways/epsilon/epsilon_risk_base_auth_params'
 require_relative 'billing/gateways/epsilon/epsilon_base'
 require_relative 'billing/gateways/epsilon'
 require_relative 'billing/gateways/epsilon_convenience_store'

data/test/fixtures/vcr_cassettes/epsilon_link_type_with_3d_secure.yml

@@ -0,0 +1,48 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://secure.epsilon.jp/cgi-bin/order/receive_order3.cgi
+    body:
+      encoding: UTF-8
+      string: contract_code=[CONTRACT_CODE]&user_id=U1747274309&user_name=%E5%B1%B1%E7%94%B0+%E5%A4%AA%E9%83%8E&user_mail_add=yamada-taro%40example.com&item_code=ITEM001&item_name=Greate+Product&order_number=O29285401&st_code=10000-0000-00000-00000-00000-00000-00000&mission_code=1&item_price=10000&process_code=1&xml=1&memo1=memo1&memo2=memo2&tds_flag=21
+    headers:
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Connection:
+      - close
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 15 May 2025 01:58:29 GMT
+      Content-Type:
+      - text/xml
+      Content-Length:
+      - '228'
+      Connection:
+      - close
+      Vary:
+      - Accept-Encoding
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        <?xml version="1.0" encoding="UTF-8" ?>
+         <Epsilon_result>
+          <result result="1" />
+          <result redirect="https%3A%2F%2Fsecure.epsilon.jp%2Fcgi-bin%2Forder%2Fcard3.cgi%3Ftrans_code%3DeyHc6JoHNEiEce2mlXuiCg25" />
+          </Epsilon_result>
+  recorded_at: Thu, 15 May 2025 01:58:29 GMT
+recorded_with: VCR 6.3.1

data/test/remote/gateways/remote_epsilon_convenience_store_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteEpsilonConvenienceStoreGatewayTest < MiniTest::Test
+class RemoteEpsilonConvenienceStoreGatewayTest < Minitest::Test
   include SamplePaymentMethods
 
   def gateway

data/test/remote/gateways/remote_epsilon_gmo_id_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteEpsilonGmoIdGatewayTest < MiniTest::Test
+class RemoteEpsilonGmoIdGatewayTest < Minitest::Test
   include SamplePaymentMethods
 
   def gateway

data/test/remote/gateways/remote_epsilon_link_payment_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-class RemoteEpsilonLinkPaymentTest < MiniTest::Test
+class RemoteEpsilonLinkPaymentTest < Minitest::Test
   include SamplePaymentMethods
 
   def gateway
@@ -33,6 +33,16 @@ class RemoteEpsilonLinkPaymentTest < MiniTest::Test
     end
   end
 
+  def test_epsilon_link_type_with_3d_secure
+    ActiveMerchant::Billing::Base.stub(:mode, :production) do
+      VCR.use_cassette(:epsilon_link_type_with_3d_secure) do
+        response = gateway.purchase(10000, valid_epsilon_link_type_purchase_detail_for_3d_secure, false)
+
+        pp response
+      end
+    end
+  end
+
   def test_epsilon_link_type_void_successfull
     VCR.use_cassette(:epsilon_link_type_void_successfull) do
       # あらかじめ課金済ステータスの受注がイプシロン側にないと取り消しができないため、課金済の受注をイプシロン側で作成しておいた。

data/test/remote/gateways/remote_epsilon_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteEpsilonGatewayTest < MiniTest::Test
+class RemoteEpsilonGatewayTest < Minitest::Test
   include SamplePaymentMethods
 
   def gateway

data/test/remote/gateways/remote_epsilon_virtual_account_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RemoteEpsilonVirtualAccountGatewayTest < MiniTest::Test
+class RemoteEpsilonVirtualAccountGatewayTest < Minitest::Test
   include SamplePaymentMethods
 
   def gateway

data/test/test_helper.rb

@@ -69,7 +69,7 @@ module SamplePaymentMethods
       last_name:  'YAMADA',
       number:     '4123451111111117',
       month:      '12',
-      year:       '2023',
+      year:       Time.now.year + 1,
     )
   end
 
@@ -295,6 +295,22 @@ module SamplePaymentMethods
     }
   end
 
+  def valid_epsilon_link_type_purchase_detail_for_3d_secure
+    now = Time.now
+    {
+      user_id:      "U#{Time.now.to_i}",
+      user_name:    '山田 太郎',
+      user_email:   'yamada-taro@example.com',
+      item_code:    'ITEM001',
+      item_name:    'Greate Product',
+      order_number: "O#{now.sec}#{now.usec}",
+      st_code:      '10000-0000-00000-00000-00000-00000-00000',
+      memo1:        'memo1',
+      memo2:        'memo2',
+      tds_flag:     21
+    }
+  end
+
   def invalid_epsilon_link_type_purchase_detail
     now = Time.now
     {

data/test/unit/billing/convenience_store_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EpsilonConvenienceStoreTest < MiniTest::Test
+class EpsilonConvenienceStoreTest < Minitest::Test
   def test_blank_parameter_generate_error
     convenience_store = ActiveMerchant::Billing::ConvenienceStore.new(code: "",
                                                                       full_name_kana: "",

data/test/unit/gateways/epsilon_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EpsilonGatewayTest < MiniTest::Test
+class EpsilonGatewayTest < Minitest::Test
   include SamplePaymentMethods
 
   def test_set_proxy_address_and_port

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_merchant-epsilon
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Kenichi TAKAHASHI
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2025-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -171,6 +171,7 @@ files:
 - lib/active_merchant/billing/gateways/epsilon/epsilon_base.rb
 - lib/active_merchant/billing/gateways/epsilon/epsilon_mission_code.rb
 - lib/active_merchant/billing/gateways/epsilon/epsilon_process_code.rb
+- lib/active_merchant/billing/gateways/epsilon/epsilon_risk_base_auth_params.rb
 - lib/active_merchant/billing/gateways/epsilon_convenience_store.rb
 - lib/active_merchant/billing/gateways/epsilon_gmo_id.rb
 - lib/active_merchant/billing/gateways/epsilon_link_payment.rb
@@ -194,6 +195,7 @@ files:
 - test/fixtures/vcr_cassettes/epsilon_link_type_purchase_successful.yml
 - test/fixtures/vcr_cassettes/epsilon_link_type_void_fail.yml
 - test/fixtures/vcr_cassettes/epsilon_link_type_void_successfull.yml
+- test/fixtures/vcr_cassettes/epsilon_link_type_with_3d_secure.yml
 - test/fixtures/vcr_cassettes/find_order_failure.yml
 - test/fixtures/vcr_cassettes/find_order_success.yml
 - test/fixtures/vcr_cassettes/find_user_failure.yml
@@ -241,7 +243,7 @@ homepage: http://github.com/pepabo/active_merchant-epsilon
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -256,8 +258,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Epsilon integration for ActiveMerchant.
 test_files:
@@ -277,6 +279,7 @@ test_files:
 - test/fixtures/vcr_cassettes/epsilon_link_type_purchase_successful.yml
 - test/fixtures/vcr_cassettes/epsilon_link_type_void_fail.yml
 - test/fixtures/vcr_cassettes/epsilon_link_type_void_successfull.yml
+- test/fixtures/vcr_cassettes/epsilon_link_type_with_3d_secure.yml
 - test/fixtures/vcr_cassettes/find_order_failure.yml
 - test/fixtures/vcr_cassettes/find_order_success.yml
 - test/fixtures/vcr_cassettes/find_user_failure.yml