oschadbank 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01a6506ac422e77a6cea1bec1e156a07c92fd9fa
-  data.tar.gz: 1436be25b9fc901bd35323b27a8eec77959cba4a
+  metadata.gz: d28a742d941bc588bf8fef5df6e3f332d9676ef5
+  data.tar.gz: 7499b5cade156829a2bafb722c7ba2d62d69b45f
 SHA512:
-  metadata.gz: 4bad2aa3e5e8caf2739df173f8cd5f7f5368f5e56e4487fd9d445f492827093d95aae3c72a6d209e6eaeb274b93c85c5c4bb4de705ec8c47c23dac34cbe28d6f
-  data.tar.gz: cb57aef79c767c0c2cdc7e8f91240376a2cf22e4297e50c2fb38cf515158db56a2d5f6c7d639563d79422ce3a3e756ce74f9864f21b597e06ea62cb6e31ac473
+  metadata.gz: 36734ff6da0eff6797761fc07537ead77838b979a5505e257d3a5a16eaf3f8b4826e3a7849bd938fbb1816c165cc6c377bc1434ea4de2ff37ba00358d73d1ba8
+  data.tar.gz: db8ecbb14570856b1c44b8186eeb0876d992163961dc63e27ec1d4d69fdc5f8bbd3ae8e30dcc1d2ebc618d4431bc30a36929d3c71cbfdcd7014fa6fbf5561d6e

data/README.md

@@ -1,5 +1,8 @@
 # Oschadbank
 
+[![Gem Version](https://badge.fury.io/rb/oschadbank.svg)](https://badge.fury.io/rb/oschadbank)
+[![Build Status](https://travis-ci.org/busfor/oschadbank.svg?branch=master)](https://travis-ci.org/busfor/oschadbank)
+
 Ruby wrapper for Oschadbank.ua API
 
 ## Installation
@@ -48,22 +51,22 @@ params = client.pre_auth_params(
   description: 'Payment description',
   back_url: 'http://www.my-shop.com/back/url',
 )
-# => {:TRTYPE=>"0",
-#  :TERMINAL=>"123",
-#  :MERCHANT=>"456",
-#  :MERCH_NAME=>"Shop name",
-#  :MERCH_URL=>"www.my-shop.com",
-#  :MERCH_GMT=>"+3",
-#  :COUNTRY=>"UA",
-#  :EMAIL=>"example@my-shop.com",
-#  :TIMESTAMP=>"20160718093533",
-#  :NONCE=>"c82f595aef2ead17103c806b701e994c",
-#  :ORDER=>"123456",
-#  :CURRENCY=>"UAH",
-#  :AMOUNT=>"100.5",
-#  :DESC=>"Payment description",
-#  :BACKREF=>"http://www.my-shop.com/back/link",
-#  :P_SIGN=>"040a2920ec647e901756349491bb0167fa184747"}
+# => {"TRTYPE"=>"0",
+#  "TERMINAL"=>"123",
+#  "MERCHANT"=>"456",
+#  "MERCH_NAME"=>"Shop name",
+#  "MERCH_URL"=>"www.my-shop.com",
+#  "MERCH_GMT"=>"+3",
+#  "COUNTRY"=>"UA",
+#  "EMAIL"=>"example@my-shop.com",
+#  "TIMESTAMP"=>"20160718093533",
+#  "NONCE"=>"c82f595aef2ead17103c806b701e994c",
+#  "ORDER"=>"123456",
+#  "CURRENCY"=>"UAH",
+#  "AMOUNT"=>"100.5",
+#  "DESC"=>"Payment description",
+#  "BACKREF"=>"http://www.my-shop.com/back/link",
+#  "P_SIGN"=>"040a2920ec647e901756349491bb0167fa184747"}
 
 params = client.auth_params(
   order_id: 123456,
@@ -72,22 +75,22 @@ params = client.auth_params(
   description: 'Payment description',
   back_url: 'http://www.my-shop.com/back/url',
 )
-# => {:TRTYPE=>"1",
-#  :TERMINAL=>"123",
-#  :MERCHANT=>"456",
-#  :MERCH_NAME=>"Shop name",
-#  :MERCH_URL=>"www.my-shop.com",
-#  :MERCH_GMT=>"+3",
-#  :COUNTRY=>"UA",
-#  :EMAIL=>"example@my-shop.com",
-#  :TIMESTAMP=>"20160718093707",
-#  :NONCE=>"4a6de0a53f759469042ce3fb08accb13",
-#  :ORDER=>"123456",
-#  :CURRENCY=>"UAH",
-#  :AMOUNT=>"100.5",
-#  :DESC=>"Payment description",
-#  :BACKREF=>"http://www.my-shop.com/back/link",
-#  :P_SIGN=>"73e7a49bf4b729f5c66c160117e05d6b1f3a1f3e"}
+# => {"TRTYPE"=>"1",
+#  "TERMINAL"=>"123",
+#  "MERCHANT"=>"456",
+#  "MERCH_NAME"=>"Shop name",
+#  "MERCH_URL"=>"www.my-shop.com",
+#  "MERCH_GMT"=>"+3",
+#  "COUNTRY"=>"UA",
+#  "EMAIL"=>"example@my-shop.com",
+#  "TIMESTAMP"=>"20160718093707",
+#  "NONCE"=>"4a6de0a53f759469042ce3fb08accb13",
+#  "ORDER"=>"123456",
+#  "CURRENCY"=>"UAH",
+#  "AMOUNT"=>"100.5",
+#  "DESC"=>"Payment description",
+#  "BACKREF"=>"http://www.my-shop.com/back/link",
+#  "P_SIGN"=>"73e7a49bf4b729f5c66c160117e05d6b1f3a1f3e"}
 ```
 
 To complete payment after pre-authorization request:

data/lib/oschadbank/client.rb

@@ -33,7 +33,7 @@ module Oschadbank
     end
 
     def response(params)
-      Response.new(params)
+      Response.new(self, params)
     end
   end
 end

data/lib/oschadbank/constants.rb

@@ -11,47 +11,61 @@ module Oschadbank
 
     MAC_PARAMS_ORDER = {
       auth: [
-        :AMOUNT,
-        :CURRENCY,
-        :ORDER,
-        :DESC,
-        :MERCH_NAME,
-        :MERCH_URL,
-        :MERCHANT,
-        :TERMINAL,
-        :EMAIL,
-        :TRTYPE,
-        :COUNTRY,
-        :MERCH_GMT,
-        :TIMESTAMP,
-        :NONCE,
-        :BACKREF,
+        'AMOUNT',
+        'CURRENCY',
+        'ORDER',
+        'DESC',
+        'MERCH_NAME',
+        'MERCH_URL',
+        'MERCHANT',
+        'TERMINAL',
+        'EMAIL',
+        'TRTYPE',
+        'COUNTRY',
+        'MERCH_GMT',
+        'TIMESTAMP',
+        'NONCE',
+        'BACKREF',
       ].freeze,
       charge: [
-        :ORDER,
-        :AMOUNT,
-        :CURRENCY,
-        :RRN,
-        :INT_REF,
-        :TRTYPE,
-        :TERMINAL,
-        :BACKREF,
-        :TIMESTAMP,
-        :NONCE,
+        'ORDER',
+        'AMOUNT',
+        'CURRENCY',
+        'RRN',
+        'INT_REF',
+        'TRTYPE',
+        'TERMINAL',
+        'BACKREF',
+        'TIMESTAMP',
+        'NONCE',
       ].freeze,
       refund: [
-        :ORDER,
-        :ORG_AMOUNT,
-        :AMOUNT,
-        :CURRENCY,
-        :RRN,
-        :INT_REF,
-        :TRTYPE,
-        :TERMINAL,
-        :BACKREF,
-        :TIMESTAMP,
-        :NONCE,
+        'ORDER',
+        'ORG_AMOUNT',
+        'AMOUNT',
+        'CURRENCY',
+        'RRN',
+        'INT_REF',
+        'TRTYPE',
+        'TERMINAL',
+        'BACKREF',
+        'TIMESTAMP',
+        'NONCE',
       ].freeze,
+      response: [
+        'TERMINAL',
+        'TRTYPE',
+        'ORDER',
+        'AMOUNT',
+        'CURRENCY',
+        'Result',
+        'RC',
+        'AuthCode',
+        'RRN',
+        'IntRef',
+        'TIMESTAMP',
+        'NONCE',
+      ].freeze
     }.freeze
 
     RESULT_MESSAGES = {

data/lib/oschadbank/errors.rb

@@ -16,4 +16,10 @@ module Oschadbank
       super("Param #{param} required")
     end
   end
+
+  class InvalidSignature < Error
+    def initialize
+      super("Invalid signature param")
+    end
+  end
 end

data/lib/oschadbank/params_builder.rb

@@ -3,14 +3,14 @@ module Oschadbank
     include Constants
 
     REQUEST_PARAMS = {
-      amount: :AMOUNT,
-      org_amount: :ORG_AMOUNT,
-      currency: :CURRENCY,
-      order_id: :ORDER,
-      description: :DESC,
-      rrn: :RRN,
-      int_ref: :INT_REF,
-      back_url: :BACKREF,
+      amount: 'AMOUNT',
+      org_amount: 'ORG_AMOUNT',
+      currency: 'CURRENCY',
+      order_id: 'ORDER',
+      description: 'DESC',
+      rrn: 'RRN',
+      int_ref: 'INT_REF',
+      back_url: 'BACKREF',
     }.freeze
 
     def initialize(client, request_type, params)
@@ -21,28 +21,28 @@ module Oschadbank
 
     def build
       result = {
-        TRTYPE: tr_type,
-        TERMINAL: @client.terminal_id.to_s,
-        MERCHANT: @client.merchant_id.to_s,
-        MERCH_NAME: @client.merchant_name.to_s,
-        MERCH_URL: @client.merchant_url.to_s,
-        MERCH_GMT: @client.merchant_gmt.to_s,
-        COUNTRY: @client.country_code.to_s,
-        EMAIL: @client.email.to_s,
-        TIMESTAMP: timestamp,
-        NONCE: nonce,
+        'TRTYPE' => tr_type,
+        'TERMINAL' => @client.terminal_id.to_s,
+        'MERCHANT' => @client.merchant_id.to_s,
+        'MERCH_NAME' => @client.merchant_name.to_s,
+        'MERCH_URL' => @client.merchant_url.to_s,
+        'MERCH_GMT' => @client.merchant_gmt.to_s,
+        'COUNTRY' => @client.country_code.to_s,
+        'EMAIL' => @client.email.to_s,
+        'TIMESTAMP' => timestamp,
+        'NONCE' => nonce,
       }
 
       @params.each do |key, value|
         key = REQUEST_PARAMS[key] || key
         value = value.to_s
-        value = value.encode('CP1251', 'UTF-8') if key == :DESC
+        value = value.encode('CP1251', 'UTF-8') if key == 'DESC'
         result[key] = value
       end
 
       result.delete_if { |_k, v| v.empty? }
 
-      result[:P_SIGN] = mac_signature(result)
+      result['P_SIGN'] = mac_signature(result)
 
       result
     end

data/lib/oschadbank/response.rb

@@ -2,10 +2,12 @@ module Oschadbank
   class Response
     include Constants
 
-    def initialize(params)
+    def initialize(client, params)
+      @client = client
       @params = params
 
       check_required!
+      check_signature!
     end
 
     def request_type
@@ -67,12 +69,21 @@ module Oschadbank
     private
 
     def check_required!
-      required_params = ['Order', 'Result', 'RC', 'TRTYPE']
+      required_params = %w(Order Result RC TRTYPE P_SIGN)
       required_params.each do |param|
         raise ParamRequred.new(param) if @params[param].to_s.empty?
       end
     end
 
+    def check_signature!
+      params = @params.dup
+      signature = params.delete('P_SIGN')
+
+      valid_signature = MacBuilder.new(:response, @client.mac_key, params).build
+
+      raise InvalidSignature unless signature == valid_signature
+    end
+
     def result_code
       @params['Result'].to_s
     end

data/lib/oschadbank/version.rb

@@ -1,3 +1,3 @@
 module Oschadbank
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oschadbank
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Roman Khrebtov