bitpay-client 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8c99b683ba6a20ac1e7a0739e29a654d1976cae
-  data.tar.gz: ba0aeebf8fdbec667e0bf76500e194eb549ab25f
+  metadata.gz: 1d735bbff357cf079a5f5ea6c357e3375644cde5
+  data.tar.gz: 55b7d5cbbe130d8412e74db9798e1a7bad3ac827
 SHA512:
-  metadata.gz: 3def8a32c76c98d4c43ece8785641cd8499d48bf5ce93525c67c1a6a48c0238ebc07964ae938e9144a671b28b13d3efc44c10c7cfded72dc5aa4dbf0564e7ba6
-  data.tar.gz: 11e62b62bbe443fb1d8a7f8ffbcbda5218ec64263dec0605444f2490193a1346bccd756003a8c0cee7827edd3d699bba55e2833c4c634e446dcebe34a3865566
+  metadata.gz: 43df16582f56058a03896e433f62a8c4338dd40c7598192d0811f437e628ebe601e53d28aa54913fae88a5f89f48b3306255df4153825d136f65504d468de85e
+  data.tar.gz: 4b679cc6bdae90dbb028081457b8990cf2c33ccc75024e43378ad7a687c36bd94fcee09d3ff2f0ea300e3e679db459483edba53c1c3463ea51f48fe2ad2b98c8

data/README.md

@@ -23,11 +23,11 @@ The client will generate a key when initialized if one does not already exist.
 
 ### Pairing with Bitpay.com
 
-To pair with bitpay.com you need to have an approved merchant account.
-1. Login to your account
-1. Navigate to bitpay.com/api-tokens (Dashboard > My Account > API Tokens)
-1. Copy an existing pairing code or create a new token and copy the pairing code.
-1. Use the bitpay command line tool to pair with bitpay.com `bitpay pair <pairing_code>` 
+To pair with bitpay.com you need to have an approved merchant account.  
+1. Login to your account  
+2. Navigate to bitpay.com/api-tokens (Dashboard > My Account > API Tokens)  
+3. Copy an existing pairing code or create a new token and copy the pairing code.  
+4. Use the bitpay command line tool to pair with bitpay.com `bitpay pair <pairing_code>`   
 
 ### To create an invoice with a paired client:
 

data/config/capybara.rb

@@ -1,5 +1,5 @@
 Capybara.javascript_driver = :poltergeist
 Capybara.default_driver = :poltergeist
 Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app, js_errors: false, phantomjs_options: ['--ignore-ssl-errors=yes'])
+  Capybara::Poltergeist::Driver.new(app, js_errors: false, phantomjs_options: ['--ignore-ssl-errors=yes', '--ssl-protocol=TLSv1'] )
 end

data/lib/bitpay/client.rb

@@ -29,6 +29,7 @@ module BitPay
       @https             = Net::HTTP.new @uri.host, @uri.port
       @https.use_ssl     = true
       @https.ca_file     = CA_FILE
+      @tokens            = {}
 
       # Option to disable certificate validation in extraordinary circumstance.  NOT recommended for production use
       @https.verify_mode = opts[:insecure] == true ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
@@ -36,20 +37,11 @@ module BitPay
       # Option to enable http request debugging
       @https.set_debug_output($stdout) if opts[:debug] == true
 
-      # Load all the available tokens into @tokens
-      load_tokens      
     end
 
     def pair_pos_client(claimCode)
       response = set_pos_token(claimCode)
-      case response.code
-      when "200"
-        get_token 'pos'
-      when "500"
-        raise BitPayError, JSON.parse(response.body)["error"]
-      else
-        raise BitPayError, "#{response.code}: #{JSON.parse(response.body)}"
-      end
+      get_token 'pos'
       response
     end
 
@@ -61,13 +53,13 @@ module BitPay
 
     def get_public_invoice(id:)
       request = Net::HTTP::Get.new("/invoices/#{id}")
-      response = @https.request request
-      (JSON.parse response.body)["data"]
+      response = process_request(request)
+      response["data"]
     end
     
     ## Generates REST request to api endpoint
     def send_request(verb, path, facade: 'merchant', params: {}, token: nil)
-      token ||= @tokens[facade] || raise(BitPayError, "No token for specified facade: #{facade}")
+      token ||= get_token(facade)
 
       # Verb-specific logic
       case verb.upcase
@@ -95,18 +87,35 @@ module BitPay
       end
 
       # Build request headers and submit
-      request['User-Agent'] = @user_agent
-      request['Content-Type'] = 'application/json'
-      request['X-BitPay-Plugin-Info'] = 'Rubylib' + VERSION
       request['X-Identity'] = @pub_key
  
-      response = @https.request request
-      JSON.parse response.body
+      response = process_request(request)
     end
 
 ##### PRIVATE METHODS #####
     private
 
+    ## Processes HTTP Request and returns parsed response
+    # Otherwise throws error
+    #
+    def process_request(request)
+
+      request['User-Agent'] = @user_agent
+      request['Content-Type'] = 'application/json'
+      request['X-BitPay-Plugin-Info'] = 'Rubylib' + VERSION
+
+      response = @https.request request
+
+      if response.kind_of? Net::HTTPSuccess
+        return JSON.parse(response.body)
+      elsif JSON.parse(response.body)["error"]
+        raise(BitPayError, "#{response.code}: #{JSON.parse(response.body)['error']}")
+      else
+        raise BitPayError, "#{response.code}: #{JSON.parse(response.body)}"
+      end
+        
+    end
+
     ## Requests token by appending nonce and signing URL
     #  Returns a hash of available tokens
     #
@@ -115,15 +124,12 @@ module BitPay
       urlpath = '/tokens?nonce=' + KeyUtils.nonce
 
       request = Net::HTTP::Get.new(urlpath)
-      request['content-type'] = "application/json"
-      request['user-agent'] = @user_agent
       request['x-identity'] = @pub_key
       request['x-signature'] = KeyUtils.sign(@uri.to_s + urlpath, @priv_key)
 
-      response = @https.request request
+      response = process_request(request)
 
-      # /tokens returns an array of hashes.  Let's turn it into a more useful single hash
-      token_array = JSON.parse(response.body)["data"] || {}
+      token_array = response["data"] || {}
 
       tokens = {}
       token_array.each do |t|
@@ -143,10 +149,7 @@ module BitPay
       params[:guid] = SecureRandom.uuid
       params[:id] = @client_id
       request.body = params.to_json
-      request['User-Agent'] = @user_agent
-      request['Content-Type'] = 'application/json'
-      request['X-BitPay-Plugin-Info'] = 'Rubylib' + VERSION
-      @https.request request
+      process_request(request)
     end
 
     def get_token(facade)

data/lib/bitpay/key_utils.rb

@@ -85,7 +85,7 @@ module BitPay
         # hence the requirement to use [].pack("H*") to convert to binary for each step
         
         #Generate Private Key
-        key = pem.nil? ? get_local_pem_file : OpenSSL::PKey::EC.new(pem)
+        key = OpenSSL::PKey::EC.new(pem ||= get_local_pem_file)
         key.public_key.group.point_conversion_form = :compressed
         public_key = key.public_key.to_bn.to_s(2)
         step_one = Digest::SHA256.hexdigest(public_key)

data/lib/bitpay/version.rb

@@ -3,5 +3,5 @@
 # or https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
 
 module BitPay
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/spec/client_spec.rb

@@ -53,13 +53,13 @@ describe BitPay::Client do
     it 'throws a BitPayError with the error message if the token setting fails' do
       stub_const('ENV', {'BITPAY_PEM' => PEM})
       stub_request(:any, /#{BitPay::TEST_API_URI}.*/).to_return(status: 500, body: "{\n  \"error\": \"Unable to create token\"\n}")
-      expect { bitpay_client.pair_pos_client(:claim_code) }.to raise_error(BitPay::BitPayError, 'Unable to create token')
+      expect { bitpay_client.pair_pos_client(:claim_code) }.to raise_error(BitPay::BitPayError, '500: Unable to create token')
     end 
 
     it 'gracefully handles 4xx errors' do
       stub_const('ENV', {'BITPAY_PEM' => PEM})
       stub_request(:any, /#{BitPay::TEST_API_URI}.*/).to_return(status: 403, body: "{\n  \"error\": \"this is a 403 error\"\n}")
-      expect { bitpay_client.pair_pos_client(:claim_code) }.to raise_error(BitPay::BitPayError, '403: {"error"=>"this is a 403 error"}')
+      expect { bitpay_client.pair_pos_client(:claim_code) }.to raise_error(BitPay::BitPayError, '403: this is a 403 error')
     end
   end
 
@@ -73,6 +73,11 @@ describe BitPay::Client do
       bitpay_client.create_invoice(id: "addd", price: 20, currency: "USD")
       assert_requested :post, "#{BitPay::TEST_API_URI}/invoices"
     end
+
+    it 'should pass through the API error message from load_tokens' do
+      stub_request(:get, /#{BitPay::TEST_API_URI}\/tokens.*/).to_return(status: 500, body: '{"error": "load_tokens_error"}')
+      expect { bitpay_client.create_invoice(id: "addd", price: 20, currency: "USD") }.to raise_error(BitPay::BitPayError, '500: load_tokens_error')         
+    end
   end
 end
 

data/spec/features/pair_spec.rb

@@ -9,7 +9,9 @@ describe "pairing a token", javascript: true, type: :feature do
     click_button('loginButton')
     click_link "My Account"
     click_link "API Tokens", match: :first
-    find(".token-access-new-button").find(".btn").click
+    find(".token-access-new-button").find(".btn").find(".icon-plus").click
+    sleep 0.25
+    click_button("Add Token")
     find(".token-claimcode", match: :first).text
   end
   let(:pem) { BitPay::KeyUtils.generate_pem }

data/spec/features/pos_spec.rb

@@ -12,10 +12,11 @@ describe "create an invoice", javascript: true, type: :feature do
       click_link "My Account"
       click_link "API Tokens", match: :first
       find(".token-access-new-button").find(".btn").click
+      sleep 0.25
+      click_button("Add Token")
       find(".token-claimcode", match: :first).text
     }
     set_client = -> {
-      private_key =  BitPay::KeyUtils.get_private_key_from_pem PEM
       client = BitPay::Client.new(api_uri: ROOT_ADDRESS, pem: PEM, insecure: true)
       client.pair_pos_client(get_claim_code.call)
       client

data/spec/key_utils_spec.rb

@@ -20,8 +20,8 @@ describe BitPay::KeyUtils do
   describe '.generate_pem' do
     it 'should write a new key to ~/.bitpay/bitpay.pem' do
       file = class_double("File").as_stubbed_const
-      double = double("Object").as_null_object
-      allow(file).to receive(:path).with(BitPay::BITPAY_CREDENTIALS_DIR).and_return(double)
+      fileutils = class_double("FileUtils").as_stubbed_const
+      allow(fileutils).to receive(:mkdir_p).with(BitPay::BITPAY_CREDENTIALS_DIR).and_return(nil)
       expect(file).to receive(:open).with(BitPay::PRIVATE_KEY_PATH, 'w')
       key_utils.generate_pem
     end
@@ -31,17 +31,17 @@ describe BitPay::KeyUtils do
   describe '.retrieve_or_generate_pem' do
     it 'should write a new key to ~/.bitpay/bitpay.pem if there is no existing file' do
       file = class_double("File").as_stubbed_const
-      double = double("Object").as_null_object
+      fileutils = class_double("FileUtils").as_stubbed_const
       allow(file).to receive(:read).with(BitPay::PRIVATE_KEY_PATH).and_throw(StandardError)
-      allow(file).to receive(:path).with(BitPay::BITPAY_CREDENTIALS_DIR).and_return(double)
+      allow(fileutils).to receive(:mkdir_p).with(BitPay::BITPAY_CREDENTIALS_DIR).and_return(nil)
       expect(file).to receive(:open).with(BitPay::PRIVATE_KEY_PATH, 'w')
       key_utils.retrieve_or_generate_pem
     end
 
     it 'should retrieve the pem if there is an existing file' do
       file = class_double("File").as_stubbed_const
-      double = double("Object").as_null_object
-      allow(file).to receive(:path).with(BitPay::BITPAY_CREDENTIALS_DIR).and_return(double)
+      fileutils = class_double("FileUtils").as_stubbed_const
+      allow(fileutils).to receive(:mkdir_p).with(BitPay::BITPAY_CREDENTIALS_DIR).and_return(nil)
       expect(file).to receive(:open).with(BitPay::PRIVATE_KEY_PATH, 'w')
       key_utils.generate_pem
     end
@@ -60,11 +60,17 @@ describe BitPay::KeyUtils do
 
   describe '.generate_sin_from_pem' do
     let(:pem){PEM}
-    let(:sin){"TeyN4LPrXiG5t2yuSamKqP3ynVk3F52iHrX"}
+    let(:sin){CLIENT_ID}
 
     it 'will return the right sin for the right pem' do
       expect(key_utils.generate_sin_from_pem(pem)).to eq sin
     end
+
+    it 'will retrieve the locally stored PEM if one is not provided' do
+      allow(File).to receive(:read).with(BitPay::PRIVATE_KEY_PATH) {PEM}
+      expect(key_utils.generate_sin_from_pem(nil)).to eq sin
+    end
+
   end
 
   context "errors when priv_key is not provided" do

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ require_relative '../config/capybara.rb'
 PEM = "-----BEGIN EC PRIVATE KEY-----\nMHQCAQEEICg7E4NN53YkaWuAwpoqjfAofjzKI7Jq1f532dX+0O6QoAcGBSuBBAAK\noUQDQgAEjZcNa6Kdz6GQwXcUD9iJ+t1tJZCx7hpqBuJV2/IrQBfue8jh8H7Q/4vX\nfAArmNMaGotTpjdnymWlMfszzXJhlw==\n-----END EC PRIVATE KEY-----\n"
 
 PUB_KEY = '038d970d6ba29dcfa190c177140fd889fadd6d2590b1ee1a6a06e255dbf22b4017'
-CLIENT_ID = "TfFVQhy2hQvchv4VVG4c7j4XPa2viJ9HrR8"
+CLIENT_ID = "TeyN4LPrXiG5t2yuSamKqP3ynVk3F52iHrX"
 
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitpay-client
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Bitpay, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json