mirror of
https://github.com/internetee/registry.git
synced 2025-08-05 01:11:43 +02:00
Remove capybara-selenium
This commit is contained in:
Maciej Szlosarczyk
parent
eda6772c6f
commit
d7dc1017b0
15 changed files with 126 additions and 162 deletions
|
|
@ -1,9 +1,9 @@
|
|||
class Registrar
|
||||
class PaymentsController < BaseController
|
||||
protect_from_forgery except: :back
|
||||
protect_from_forgery except: [:back, :callback]
|
||||
|
||||
skip_authorization_check # actually anyone can pay, no problems at all
|
||||
skip_before_action :authenticate_user!, :check_ip_restriction, only: [:back]
|
||||
skip_before_action :authenticate_user!, :check_ip_restriction, only: [:back, :callback]
|
||||
# before_action :check_bank
|
||||
|
||||
# to handle existing model we should
|
||||
|
|
@ -15,7 +15,8 @@ class Registrar
|
|||
invoice = Invoice.find(params[:invoice_id])
|
||||
opts = {
|
||||
return_url: self.registrar_return_payment_with_url(params[:bank], invoice_id: invoice.id),
|
||||
response_url: self.registrar_return_payment_with_url(params[:bank])
|
||||
# TODO: Add required URL
|
||||
response_url: "https://5fd921b0.ngrok.io/registrar/pay/callback/every_pay"
|
||||
}
|
||||
@payment = ::Payments.create_with_type(params[:bank], invoice, opts)
|
||||
@payment.create_transaction
|
||||
|
|
@ -43,6 +44,20 @@ class Registrar
|
|||
redirect_to registrar_invoice_path(invoice)
|
||||
end
|
||||
|
||||
def callback
|
||||
invoice = Invoice.find(params[:invoice_id])
|
||||
opts = { response: params }
|
||||
@payment = ::Payments.create_with_type(params[:bank], invoice, opts)
|
||||
|
||||
if @payment.valid_response? && @payment.settled_payment?
|
||||
@payment.complete_transaction
|
||||
|
||||
if invoice.binded?
|
||||
render status: 200, json: { ok: :ok }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
# def banks
|
||||
|
|
|
|||
|
|
@ -3,22 +3,22 @@ module Payments
|
|||
# TODO: Remove magic numbers, convert certain fields to proper constants
|
||||
# TODO: Remove hashrockets
|
||||
def form_fields
|
||||
@fields ||= (hash = {}
|
||||
hash["VK_SERVICE"] = "1012"
|
||||
hash["VK_VERSION"] = "008"
|
||||
hash["VK_SND_ID"] = seller_account
|
||||
hash["VK_STAMP"] = invoice.number
|
||||
hash["VK_AMOUNT"] = number_with_precision(invoice.sum_cache, :precision => 2, :separator => ".")
|
||||
hash["VK_CURR"] = invoice.currency
|
||||
hash["VK_REF"] = ""
|
||||
hash["VK_MSG"] = invoice.order
|
||||
hash["VK_RETURN"] = return_url
|
||||
hash["VK_CANCEL"] = return_url
|
||||
hash["VK_DATETIME"] = Time.now.strftime("%Y-%m-%dT%H:%M:%S%z")
|
||||
hash["VK_MAC"] = calc_mac(hash)
|
||||
hash["VK_ENCODING"] = "UTF-8"
|
||||
hash["VK_LANG"] = "ENG"
|
||||
hash)
|
||||
@fields ||= hash = {}
|
||||
hash["VK_SERVICE"] = "1012"
|
||||
hash["VK_VERSION"] = "008"
|
||||
hash["VK_SND_ID"] = seller_account
|
||||
hash["VK_STAMP"] = invoice.number
|
||||
hash["VK_AMOUNT"] = number_with_precision(invoice.total, precision: 2, separator: ".")
|
||||
hash["VK_CURR"] = invoice.currency
|
||||
hash["VK_REF"] = ""
|
||||
hash["VK_MSG"] = invoice.order
|
||||
hash["VK_RETURN"] = return_url
|
||||
hash["VK_CANCEL"] = return_url
|
||||
hash["VK_DATETIME"] = Time.now.strftime("%Y-%m-%dT%H:%M:%S%z")
|
||||
hash["VK_MAC"] = calc_mac(hash)
|
||||
hash["VK_ENCODING"] = "UTF-8"
|
||||
hash["VK_LANG"] = "ENG"
|
||||
hash
|
||||
end
|
||||
|
||||
def valid_response?
|
||||
|
|
@ -38,25 +38,25 @@ module Payments
|
|||
|
||||
def validate_success
|
||||
pars = %w(VK_SERVICE VK_VERSION VK_SND_ID VK_REC_ID VK_STAMP VK_T_NO VK_AMOUNT VK_CURR
|
||||
VK_REC_ACC VK_REC_NAME VK_SND_ACC VK_SND_NAME VK_REF VK_MSG VK_T_DATETIME).freeze
|
||||
VK_REC_ACC VK_REC_NAME VK_SND_ACC VK_SND_NAME VK_REF VK_MSG VK_T_DATETIME).freeze
|
||||
|
||||
@validate_success ||= (
|
||||
data = pars.map{|e| prepend_size(response[e]) }.join
|
||||
@validate_success ||= begin
|
||||
data = pars.map { |e| prepend_size(response[e]) }.join
|
||||
verify_mac(data, response["VK_MAC"])
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
def validate_cancel
|
||||
pars = %w(VK_SERVICE VK_VERSION VK_SND_ID VK_REC_ID VK_STAMP VK_REF VK_MSG).freeze
|
||||
@validate_cancel ||= (
|
||||
data = pars.map{|e| prepend_size(response[e]) }.join
|
||||
@validate_cancel ||= begin
|
||||
data = pars.map { |e| prepend_size(response[e]) }.join
|
||||
verify_mac(data, response["VK_MAC"])
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
def validate_amount
|
||||
source = number_with_precision(BigDecimal.new(response["VK_AMOUNT"].to_s), precision: 2, separator: ".")
|
||||
target = number_with_precision(invoice.sum_cache, precision: 2, separator: ".")
|
||||
target = number_with_precision(invoice.total, precision: 2, separator: ".")
|
||||
|
||||
source == target
|
||||
end
|
||||
|
|
@ -80,8 +80,8 @@ module Payments
|
|||
|
||||
def calc_mac(fields)
|
||||
pars = %w(VK_SERVICE VK_VERSION VK_SND_ID VK_STAMP VK_AMOUNT VK_CURR VK_REF
|
||||
VK_MSG VK_RETURN VK_CANCEL VK_DATETIME).freeze
|
||||
data = pars.map{|e| prepend_size(fields[e]) }.join
|
||||
VK_MSG VK_RETURN VK_CANCEL VK_DATETIME).freeze
|
||||
data = pars.map { |e| prepend_size(fields[e]) }.join
|
||||
|
||||
sign(data)
|
||||
end
|
||||
|
|
@ -89,7 +89,7 @@ module Payments
|
|||
def prepend_size(value)
|
||||
value = (value || "").to_s.strip
|
||||
string = ""
|
||||
string << sprintf("%03i", value.size)
|
||||
string << format("%03i", value.size)
|
||||
string << value
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -27,15 +27,15 @@ module Payments
|
|||
end
|
||||
|
||||
def complete_transaction
|
||||
fail NotImplementedError
|
||||
raise NotImplementedError
|
||||
end
|
||||
|
||||
def settled_payment?
|
||||
fail NotImplementedError
|
||||
raise NotImplementedError
|
||||
end
|
||||
|
||||
def form_fields
|
||||
fail NotImplementedError
|
||||
raise NotImplementedError
|
||||
end
|
||||
|
||||
def form_url
|
||||
|
|
@ -43,7 +43,7 @@ module Payments
|
|||
end
|
||||
|
||||
def valid_response?
|
||||
fail NotImplementedError
|
||||
raise NotImplementedError
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@ module Payments
|
|||
|
||||
def form_fields
|
||||
base_json = base_params
|
||||
base_json.merge!("nonce": SecureRandom.hex(15))
|
||||
hmac_fields = (base_json.keys + ["hmac_fields"]).sort.uniq!
|
||||
base_json[:nonce] = SecureRandom.hex(15)
|
||||
hmac_fields = (base_json.keys + ['hmac_fields']).sort.uniq!
|
||||
|
||||
# Not all requests require use of hmac_fields, add only when needed
|
||||
base_json["hmac_fields"] = hmac_fields.join(",")
|
||||
hmac_string = hmac_fields.map{|k, _v| "#{k}=#{base_json[k]}"}.join("&")
|
||||
hmac = OpenSSL::HMAC.hexdigest("sha1", KEY, hmac_string)
|
||||
base_json.merge!("hmac": hmac)
|
||||
base_json[:hmac_fields] = hmac_fields.join(',')
|
||||
hmac_string = hmac_fields.map { |k, _v| "#{k}=#{base_json[k]}" }.join('&')
|
||||
hmac = OpenSSL::HMAC.hexdigest('sha1', KEY, hmac_string)
|
||||
base_json[:hmac] = hmac
|
||||
|
||||
base_json
|
||||
end
|
||||
|
|
@ -31,81 +31,56 @@ module Payments
|
|||
end
|
||||
|
||||
def complete_transaction
|
||||
if valid_response? && settled_payment?
|
||||
transaction = BankTransaction.find_by(
|
||||
reference_no: invoice.reference_no,
|
||||
currency: invoice.currency,
|
||||
iban: invoice.seller_iban
|
||||
)
|
||||
return unless valid_response? && settled_payment?
|
||||
|
||||
transaction.sum = response[:amount]
|
||||
transaction.paid_at = DateTime.strptime(response[:timestamp],'%s')
|
||||
transaction.buyer_name = response[:cc_holder_name]
|
||||
transaction.save!
|
||||
transaction = BankTransaction.find_by(
|
||||
description: invoice.order,
|
||||
currency: invoice.currency,
|
||||
iban: invoice.seller_iban
|
||||
)
|
||||
|
||||
transaction.autobind_invoice
|
||||
end
|
||||
transaction.sum = response[:amount]
|
||||
transaction.paid_at = DateTime.strptime(response[:timestamp], '%s')
|
||||
transaction.buyer_name = response[:cc_holder_name]
|
||||
transaction.save!
|
||||
|
||||
transaction.autobind_invoice
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def base_params
|
||||
{
|
||||
api_username: USER,
|
||||
account_id: ACCOUNT_ID,
|
||||
timestamp: Time.now.to_i.to_s,
|
||||
callback_url: response_url,
|
||||
customer_url: return_url,
|
||||
amount: invoice.sum_cache,
|
||||
order_reference: SecureRandom.hex(15),
|
||||
transaction_type: "charge",
|
||||
hmac_fields: ""
|
||||
api_username: USER,
|
||||
account_id: ACCOUNT_ID,
|
||||
timestamp: Time.now.to_i.to_s,
|
||||
callback_url: response_url,
|
||||
customer_url: return_url,
|
||||
amount: invoice.total,
|
||||
order_reference: SecureRandom.hex(15),
|
||||
transaction_type: 'charge',
|
||||
hmac_fields: ''
|
||||
}.with_indifferent_access
|
||||
end
|
||||
|
||||
def valid_hmac?
|
||||
hmac_fields = response[:hmac_fields].split(',')
|
||||
hmac_hash = {}
|
||||
hmac_fields.map do|field|
|
||||
hmac_fields.map do |field|
|
||||
hmac_hash[field.to_sym] = response[field.to_sym]
|
||||
end
|
||||
|
||||
hmac_string = hmac_hash.map {|k, _v|"#{k}=#{hmac_hash[k]}"}.join("&")
|
||||
expected_hmac = OpenSSL::HMAC.hexdigest("sha1", KEY, hmac_string)
|
||||
hmac_string = hmac_hash.map { |k, _v| "#{k}=#{hmac_hash[k]}" }.join('&')
|
||||
expected_hmac = OpenSSL::HMAC.hexdigest('sha1', KEY, hmac_string)
|
||||
expected_hmac == response[:hmac]
|
||||
end
|
||||
|
||||
def valid_amount?
|
||||
invoice.sum_cache == BigDecimal.new(response[:amount])
|
||||
invoice.total == BigDecimal.new(response[:amount])
|
||||
end
|
||||
|
||||
def valid_account?
|
||||
response[:account_id] == ACCOUNT_ID
|
||||
end
|
||||
|
||||
def return_params
|
||||
{"utf8"=>"✓",
|
||||
"_method"=>"put",
|
||||
"authenticity_token"=>"Eb0/tFG0zSJriUUmDykI8yU/ph3S19k0KyWI2/Vxd9srF46plVJf8z8vRrkbuziMP6I/68dM3o/+QwbrI6dvSw==",
|
||||
"nonce"=>"2375e05dfd12db5af207b11742b70bda",
|
||||
"timestamp"=>"1523887506",
|
||||
"api_username"=>"ca8d6336dd750ddb",
|
||||
"transaction_result"=>"completed",
|
||||
"payment_reference"=>"95c98cd27f927e93ab7bcf7968ebff7fe4ca9314ab85b5cb15b2a6d59eb56940",
|
||||
"payment_state"=>"settled",
|
||||
"amount"=>"240.0",
|
||||
"order_reference"=>"0c430ff649e1760313e4d98b5e90e6",
|
||||
"account_id"=>"EUR3D1",
|
||||
"cc_type"=>"master_card",
|
||||
"cc_last_four_digits"=>"0487",
|
||||
"cc_month"=>"10",
|
||||
"cc_year"=>"2018",
|
||||
"cc_holder_name"=>"John Doe",
|
||||
"hmac_fields"=>"account_id,amount,api_username,cc_holder_name,cc_last_four_digits,cc_month,cc_type,cc_year,hmac_fields,nonce,order_reference,payment_reference,payment_state,timestamp,transaction_result",
|
||||
"hmac"=>"4a2ed8729be9a0c35c27fe331d01c4df5d8707c1",
|
||||
"controller"=>"registrar/payments/every_pay",
|
||||
"action"=>"update",
|
||||
"invoice_id"=>"1"}
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
.h3
|
||||
= t('registrar.invoices.redirected_to_bank')
|
||||
= t('registrar.invoices.redirected_to_intermediary')
|
||||
|
||||
.payment-form
|
||||
= form_tag @payment.form_url, method: :post do
|
||||
= form_tag @payment.form_url, method: :post, target: '_blank' do
|
||||
- @payment.form_fields.each do |k, v|
|
||||
= hidden_field_tag k, v
|
||||
= submit_tag t('registrar.invoices.go_to_bank')
|
||||
= submit_tag t('registrar.invoices.go_to_intermediary')
|
||||
|
||||
:javascript
|
||||
function loadListener () {
|
||||
$('.payment-form form').submit();
|
||||
}
|
||||
|
||||
document.addEventListener('load', loadListener)
|
||||
function load_listener() {
|
||||
$('.payment-form form').submit();
|
||||
}
|
||||
window.addEventListener('load', load_listener)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue