unitpay 0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b2151fbaa10bcb948b81ed8a60251191f76072a
-  data.tar.gz: 343b94025ae0549e871b8c898c774fc2b44deba8
+  metadata.gz: a28c1859c1ef131cc7118cdbbd555cc7b06855e7
+  data.tar.gz: 508c16d2a0b4bf63b405119c9c1bcfc58eab2529
 SHA512:
-  metadata.gz: b7428b3732a1a5758e980ef6d5289545862293127849a06bd1d2263b498db0093bf7ec2ba63899a2258b953c87f3615385bc41d5622a77daed0cfb78d9c56b7f
-  data.tar.gz: a52d8aec1065f3f6ae18deb8a5db4423198959d08c8a5a16a71e9664714d989a6802b01804c98104f974d47d8bd8adac6014315a4b0c1d28714026f4a5ed9b97
+  metadata.gz: f78db710b3b230e3be7d7ab232821890b27831a546aa6338976df483315f66615cae19834c6bd6909d5b783080286cada168e5206123c2ce099fc58fd990f141
+  data.tar.gz: 28b557d8bbfd3fe5594db24fc72eee568188dbf3df914f91623400807853a671763c428e1825c5f3418202a4b4ca7f4d1b08e8135a72c1615fefe869b68d053d

data/lib/unitpay/controller.rb

@@ -9,7 +9,7 @@ module Unitpay
     class RuntimeException < StandardError; end
 
     def notify
-      if service.valid_notify_sign?(params[:params])
+      if service.valid_action_signature?(params[:method], params[:params])
         send(params[:method])
         success_request
       else

data/lib/unitpay/service.rb

@@ -19,12 +19,12 @@ module Unitpay
       main_params(sum, account, desc).merge(publicKey: public_key)
     end
 
-    def valid_sign?(current_sign, sum, account, desc)
+    def valid_signature?(current_sign, sum, account, desc)
       current_sign == calculate_sign(sum, account, desc)
     end
 
-    def valid_notify_sign?(params)
-      params[:sign] == calculate_notify_sign(params)
+    def valid_action_signature?(method, params)
+      params[:signature] == calculate_action_sign(method, params)
     end
 
     private
@@ -32,17 +32,26 @@ module Unitpay
     attr_reader :public_key, :secret_key, :currency, :use_sign
 
     def calculate_sign(sum, account, desc)
-      Digest::MD5.hexdigest( [account, currency, desc, sum, secret_key].join )
+      signature_of([ account, currency, desc, sum, secret_key ])
     end
 
-    def calculate_notify_sign(params)
-      params.delete(:sign)
-      values = Hash[ params.sort ].values + [ secret_key ]
-      Digest::MD5.hexdigest(values.join)
+    def calculate_action_sign(method, params)
+      sign_params = params.dup
+      sign_params.delete(:sign)
+      sign_params.delete(:signature)
+
+      values = Hash[ sign_params.sort ].values + [ secret_key ]
+      values.unshift(method)
+
+      signature_of(values)
     end
 
+    def signature_of(arr)
+      Digest::SHA256.hexdigest(arr.join('{up}'))
+    end  
+
     def main_params(sum, account, desc)
-      sign = use_sign ? { sign: calculate_sign(sum, account, desc) } : {}
+      sign = use_sign ? { signature: calculate_sign(sum, account, desc) } : {}
 
       {
         sum: sum,

data/lib/unitpay/version.rb

@@ -1,3 +1,3 @@
 module Unitpay
-  VERSION = '0.2'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitpay
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 1.0.0
 platform: ruby
 authors:
 - ssnikolay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Gem для подключения к платежной системе unitpay.ru