bunq-client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86efef959814c2a9cffd67b0f7be584824f3a9c2
-  data.tar.gz: ab09a13ff2ea0c56c06b6c97ca654ef81603df69
+  metadata.gz: 22487972e1aebeb56b45b8781968b99da449bc9a
+  data.tar.gz: 2f1b2e7500ae78bf18a066d45b751e38cf56fbc8
 SHA512:
-  metadata.gz: 48c4c7a30ad2597e9248c26a6acf2db12935464611c104e0a91831580d4c9c902aba7b20fd24d11691bdee2de89e3b920fd8bdafc86080ce0ad35ad108b13162
-  data.tar.gz: 6e4bc14013bdaebaa01c4fc0c1db459ad09ed598ae63ecb1e4b4d667f6532a7d0311af0e83015f7c8eff4d7720f16287632481c38f1e98595582fbb14a956570
+  metadata.gz: 00f65e325aa9b546c8f1124c6debf626b07d21a546be70f8af5f901bcb8d74bcdff85b067775ed17c2dd103502d422499201904d5f2fc1673780a363f42546e4
+  data.tar.gz: 29544093b45a56c096c45599263fcd29fccfd124a5e2a52515bc4d3eb8434ed0b59f5bba687d1f45ff63f88c68cae2768f8c727057a1ecc66f56df2f1503fb86

data/lib/bunq/bunq.rb

@@ -1,19 +1,4 @@
 require 'rest-client'
 require_relative './client'
 require_relative './signature'
-require_relative 'paginated'
-
-RestClient.add_before_execution_proc do |req, params|
-  next unless params[:url].include?('bunq.com')
-  req['X-Bunq-Client-Request-Id'] = params[:headers][:'X-Bunq-Client-Request-Id'] = SecureRandom.uuid
-
-  # can't sign the creation of an installation
-  # see https://doc.bunq.com/api/1/call/installation/method/post
-  next if params[:url].end_with?('/installation') && req.method == 'POST'
-  req['X-Bunq-Client-Signature'] = Bunq.signature.create(
-    params[:method].upcase,
-    req.path,
-    params[:headers],
-    params[:payload]
-  )
-end
+require_relative './paginated'

data/lib/bunq/resource.rb

@@ -6,6 +6,7 @@ require 'json'
 module Bunq
   class Resource
     attr_reader :resource
+    NO_PARAMS = {}
 
     def initialize(client, path)
       @client = client
@@ -24,25 +25,28 @@ module Bunq
     end
 
     def get(params = {}, &block)
-      @resource.get(params: params) do |response, request, result|
+      @resource.get({params: params}.merge(bunq_request_headers('GET', params))) do |response, request, result|
         verify_and_handle_response(response, request, result, &block)
       end
     end
 
+
     def post(payload, skip_verify = false, &block)
+      json = JSON.generate(payload)
       if skip_verify
-        @resource.post(JSON.generate(payload)) do |response, request, result|
+        @resource.post(json, bunq_request_headers('POST', NO_PARAMS, json)) do |response, request, result|
           handle_response(response, request, result, &block)
         end
       else
-        @resource.post(JSON.generate(payload)) do |response, request, result|
+        @resource.post(json, bunq_request_headers('POST', NO_PARAMS, json)) do |response, request, result|
           verify_and_handle_response(response, request, result, &block)
         end
       end
     end
 
     def put(payload, &block)
-      @resource.put(JSON.generate(payload)) do |response, request, result|
+      json = JSON.generate(payload)
+      @resource.put(json, bunq_request_headers('PUT', NO_PARAMS, json)) do |response, request, result|
         verify_and_handle_response(response, request, result, &block)
       end
     end
@@ -63,6 +67,27 @@ module Bunq
 
     attr_reader :client
 
+    def bunq_request_headers(verb, params, payload = nil)
+      request_id_header = {'X-Bunq-Client-Request-Id' => SecureRandom.uuid}
+
+      return request_id_header if @path.end_with?('/installation') && verb == 'POST'
+      request_id_header.merge('X-Bunq-Client-Signature' => sign_request(verb, params, request_id_header, payload))
+    end
+
+    def sign_request(verb, params, request_id_header, payload = nil)
+      Bunq.signature.create(
+        verb,
+        encode_params(@path, params),
+        @resource.headers.merge(request_id_header),
+        payload
+      )
+    end
+
+    def encode_params(path, params)
+      return path if params.empty?
+      "#{path}?#{URI.escape(params.collect { |k, v| "#{k}=#{v}" }.join('&'))}"
+    end
+
     def verify_and_handle_response(response, request, result, &block)
       Bunq.signature.verify!(response) unless client.configuration.disable_response_signature_verification
       handle_response(response, request, result, &block)

data/lib/bunq/signature.rb

@@ -1,7 +1,6 @@
 require_relative 'unexpected_response'
 
 module Bunq
-
   class Signature
     # headers in raw_headers hash in rest client are all lower case
     BUNQ_HEADER_PREFIX = 'X-Bunq-'.downcase
@@ -19,7 +18,11 @@ module Bunq
     end
 
     def create(verb, path, headers, body)
-      signature = private_key.sign(digest, signable_input(verb, path, headers.select { |header_name, _| signable_header?(header_name) }, body))
+      signature = private_key.sign(
+        digest,
+        signable_input(verb, path, headers.select { |header_name, _| signable_header?(header_name) }, body)
+      )
+
       Base64.strict_encode64(signature)
     end
 
@@ -43,9 +46,10 @@ module Bunq
     end
 
     def signable_input(verb, path, headers, body)
+      sortable_headers = Hash[headers.collect{ |k,v| [k.to_s, v] }]
       head = [
         [verb, path].join(' '),
-        headers.sort.to_h.map { |k,v| "#{k}: #{v}" }.join("\n")
+        sortable_headers.sort.to_h.map { |k,v| "#{k}: #{v}" }.join("\n")
       ].join("\n")
       "#{head}\n\n#{body}"
     end

data/lib/bunq/version.rb

@@ -1,3 +1,3 @@
 module Bunq
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunq-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Lars Vonk
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client