mobilepay 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab2ecb74f00ea4ee578b918b4cf847729883292b
-  data.tar.gz: 78c3295ec71aa6a5e3d38eda4e6098e1e10cb173
+  metadata.gz: 311d54f9494a6c32c4044c15826ba890985de747
+  data.tar.gz: 55f283e80713e74ca66dfcf91f32271db96b8556
 SHA512:
-  metadata.gz: 2a1c19eb27c62f2d2eaa21a452d5da47686b417acbf33ed6d7302733d847934860fc6706216b7cfb2cf52ce9222391d63f6a729d844b9d0db4f823a37e437509
-  data.tar.gz: a6be43d4de495cb1397ed951353a4044ca6006e907edbe3a16ac8b86b8c6ee776b78d0da3937e042df2cf551e469a40d5c15b82d8c5863a7e0593a7fe4fc2793
+  metadata.gz: 6cf5c513bd53f0a60180e9f064e23b339f6085421b3060b8c22dc87bfcf4510ad7852621052ec0952aaf42c3429e3cc5498889105837a652dc3804c614041ddf
+  data.tar.gz: 53beb0bc111da0df9b300ea755944dfe47792f0405a94c0ef2a2839ca25fa1a2b41c120a2c7b68b9ff0404c60797db2964121d2d2de6f066941b53bd516ea0e5

data/README.md

@@ -32,10 +32,12 @@ Or install it yourself as:
 
 ```ruby
   require 'mobilepay'
-  client = Mobilepay::Client.new merchant_id: 'merchant_id', subscription_key: 'subscription_key'
+  require 'jose'
+  client = Mobilepay::Client.new merchant_id: 'merchant_id', subscription_key: 'subscription_key', privatekey: OpenSSL::PKey::RSA.new(File.read('key.pvk'))
 ```
     subscription_key - Subscription Key for MobilePay, required
     merchant_id - Merchant ID, required
+    privatekey - Secret key for creating signature for requests, required
 
 ### Public Key
 

data/lib/mobilepay.rb

@@ -3,4 +3,5 @@ require_relative 'mobilepay/client'
 require_relative 'mobilepay/security'
 
 module Mobilepay
+    class Failure < StandardError; end
 end

data/lib/mobilepay/client.rb

@@ -6,6 +6,7 @@ require_relative 'client/refund_amount'
 require_relative 'client/capture_amount'
 require_relative 'client/cancel_reservation'
 require_relative 'requests'
+require_relative 'requests/generate_signature'
 
 module Mobilepay
     class Client
@@ -16,14 +17,14 @@ module Mobilepay
         include Mobilepay::Client::CaptureAmount
         include Mobilepay::Client::CancelReservation
         include Mobilepay::Requests
+        include Mobilepay::Requests::GenerateSignature
 
-        class MobilePayFailure < StandardError; end
-
-        attr_reader :merchant_id, :subscription_key, :base_uri
+        attr_reader :merchant_id, :subscription_key, :privatekey, :base_uri
 
         def initialize(args = {})
             @merchant_id = args[:merchant_id] || ''
             @subscription_key = args[:subscription_key] || ''
+            @privatekey = args[:privatekey]
             @base_uri = 'https://api.mobeco.dk/appswitch/api/v1'
         end
 
@@ -32,7 +33,7 @@ module Mobilepay
         def call(req, address, args = {})
             response = case req
                 when :get, :put, :delete then http_request(req, address, args)
-                else raise MobilePayFailure, 'Undefined  type for call'
+                else raise Failure, 'Undefined  type for call'
             end
             check_response(response)
             response
@@ -40,14 +41,15 @@ module Mobilepay
 
         def check_response(response)
             if response.code != '200'
-                raise MobilePayFailure, JSON.parse(response.body)['message']
+                error_message = response.body.empty? ? response.code : JSON.parse(response.body)['message']
+                raise Failure, error_message
             end
         end
 
         def check_args(args)
             args.each do |arg_name, value|
                 if value.nil? || !value.is_a?(String)
-                    raise MobilePayFailure, "Invalid argument '#{arg_name}', must be string"
+                    raise Failure, "Invalid argument '#{arg_name}', must be string"
                 end
             end
         end

data/lib/mobilepay/client/cancel_reservation.rb

@@ -6,9 +6,9 @@ module Mobilepay
             # Cancels a specific reservation
             def cancel_reservation(args = {})
                 check_args(order_id: args[:order_id])
-                response = call(:delete, "/reservations/merchants/#{merchant_id}/orders/#{args[:order_id]}", { body: '{}' })
+                response = call(:delete, "/reservations/merchants/#{merchant_id}/orders/#{args[:order_id]}", { body: '' })
                 JSON.parse(response.body)
-            rescue MobilePayFailure => ex
+            rescue Failure => ex
                 return { error: ex.message }
             end
 

data/lib/mobilepay/client/capture_amount.rb

@@ -6,9 +6,9 @@ module Mobilepay
             # Captures a previously reserved amount, either in full or partially
             def capture_amount(args = {})
                 check_args(order_id: args[:order_id])
-                response = call(:put, "/reservations/merchants/#{merchant_id}/orders/#{args[:order_id]}", { body: args[:body] || '{}' })
+                response = call(:put, "/reservations/merchants/#{merchant_id}/orders/#{args[:order_id]}", { body: args[:body] || '' })
                 JSON.parse(response.body)
-            rescue MobilePayFailure => ex
+            rescue Failure => ex
                 return { error: ex.message }
             end
 

data/lib/mobilepay/client/payment_status.rb

@@ -6,9 +6,9 @@ module Mobilepay
             # Gets the status of a given order
             def payment_status(args = {})
                 check_args(order_id: args[:order_id])
-                response = call(:get, "/merchants/#{merchant_id}/orders/#{args[:order_id]}", { body: '{}' })
+                response = call(:get, "/merchants/#{merchant_id}/orders/#{args[:order_id]}", { body: '' })
                 JSON.parse(response.body)
-            rescue MobilePayFailure => ex
+            rescue Failure => ex
                 return { error: ex.message }
             end
 

data/lib/mobilepay/client/payment_transactions.rb

@@ -6,9 +6,9 @@ module Mobilepay
             # Gets the transactions for a given order
             def payment_transactions(args = {})
                 check_args(order_id: args[:order_id])
-                response = call(:get, "/merchants/#{merchant_id}/orders/#{args[:order_id]}/transactions", { body: '{}' })
+                response = call(:get, "/merchants/#{merchant_id}/orders/#{args[:order_id]}/transactions", { body: '' })
                 JSON.parse(response.body)
-            rescue MobilePayFailure => ex
+            rescue Failure => ex
                 return { error: ex.message }
             end
 

data/lib/mobilepay/client/refund_amount.rb

@@ -8,7 +8,7 @@ module Mobilepay
                 check_args(order_id: args[:order_id])
                 response = call(:put, "/merchants/#{merchant_id}/orders/#{args[:order_id]}", { body: args[:body] || '{}' })
                 JSON.parse(response.body)
-            rescue MobilePayFailure => ex
+            rescue Failure => ex
                 return { error: ex.message }
             end
 

data/lib/mobilepay/client/reservations.rb

@@ -10,7 +10,7 @@ module Mobilepay
                 address += "?customerId=#{args[:customer_id]}" if args[:customer_id]
                 response = call(:get, address, { body: '{}' })
                 JSON.parse(response.body)
-            rescue MobilePayFailure => ex
+            rescue Failure => ex
                 return { error: ex.message }
             end
 

data/lib/mobilepay/requests.rb

@@ -27,6 +27,7 @@ module Mobilepay
         def generate_headers(req, body)
             req['Content-Type'] = 'application/json'
             req['Ocp-Apim-Subscription-Key'] = subscription_key
+            req['AuthenticationSignature'] = generate_signature(req) unless privatekey.nil?
             req.body = body
             req
         end

data/lib/mobilepay/requests/generate_signature.rb

@@ -0,0 +1,22 @@
+require 'digest/sha1'
+require 'base64'
+require 'jose'
+
+module Mobilepay
+    module Requests
+        module GenerateSignature
+
+            # Generate Authentication Signature
+            def generate_signature(request)
+                payload = (request.uri.to_s + request.body.to_s).force_encoding('UTF-8')
+                payload_sha1 = Digest::SHA1.hexdigest(payload)
+                payload_base64 = Base64.encode64(payload_sha1)
+
+                jwk_rs256 = JOSE::JWK.generate_key([:rsa, 1024])
+                jwk_rs256.kty.key = privatekey
+                JOSE::JWS.sign(jwk_rs256, payload_base64, { "alg" => "RS256" }).compact
+            end
+
+        end
+    end
+end

data/lib/mobilepay/security.rb

@@ -1,18 +1,19 @@
 require 'json'
 require_relative 'security/public_key'
 require_relative 'requests'
+require_relative 'requests/generate_signature'
 
 module Mobilepay
     class Security
         include Mobilepay::Security::PublicKey
         include Mobilepay::Requests
+        include Mobilepay::Requests::GenerateSignature
 
-        class SecurityFailure < StandardError; end
-
-        attr_reader :subscription_key, :base_uri
+        attr_reader :subscription_key, :privatekey, :base_uri
 
         def initialize(args = {})
             @subscription_key = args[:subscription_key] || ''
+            @privatekey = nil
             @base_uri = 'https://api.mobeco.dk/merchantsecurity/api'
         end
 
@@ -26,7 +27,8 @@ module Mobilepay
 
         def check_response(response)
             if response.code != '200'
-                raise SecurityFailure, JSON.parse(response.body)['message']
+                error_message = response.body.empty? ? response.code : JSON.parse(response.body)['message']
+                raise Failure, error_message
             end
         end
     end

data/lib/mobilepay/security/public_key.rb

@@ -7,7 +7,7 @@ module Mobilepay
             def public_key
                 response = call
                 JSON.parse(response.body)
-            rescue SecurityFailure => ex
+            rescue Failure => ex
                 return { error: ex.message }
             end
 

data/lib/mobilepay/version.rb

@@ -1,3 +1,3 @@
 module Mobilepay
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
 end

data/mobilepay.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
     spec.email = ['kortirso@gmail.com']
 
     spec.summary = 'Gem for interaction with MobilePay API'
-    spec.description = 'Gem for interaction with MobilePay API'
+    spec.description = 'Actions with payments in MobilePay system'
     spec.homepage = 'https://github.com/kortirso/mobilepay'
     spec.license = 'MIT'
 
@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
 
     spec.add_development_dependency 'bundler', '~> 1.14'
     spec.add_development_dependency 'rake', '~> 10.0'
-    spec.add_development_dependency 'rspec', '~> 3.0'
+    spec.add_development_dependency 'jose', '~> 1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilepay
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Anton Bogdanov
@@ -39,20 +39,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: jose
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-description: Gem for interaction with MobilePay API
+        version: '1.1'
+description: Actions with payments in MobilePay system
 email:
 - kortirso@gmail.com
 executables: []
@@ -77,6 +77,7 @@ files:
 - lib/mobilepay/client/refund_amount.rb
 - lib/mobilepay/client/reservations.rb
 - lib/mobilepay/requests.rb
+- lib/mobilepay/requests/generate_signature.rb
 - lib/mobilepay/security.rb
 - lib/mobilepay/security/public_key.rb
 - lib/mobilepay/version.rb