straight-server 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 833d00355a560e1e82ce97ef09a53b0f96bdd0b0
-  data.tar.gz: 96c715dbdd8718aaaded9810738df8ce64e8b13c
+  metadata.gz: 52533bcd5fc953b35fd81b8bf7f4a4b974954b01
+  data.tar.gz: 6d43d836466f5d29f849536b08286ee7497973f8
 SHA512:
-  metadata.gz: 7b3a8d3401e5d2116f35692996dc188bbc8adcbaad4b79d5b22ba2fcd862b3610f8a62ac5dbc022add0f1880bd5babd31a804f088060731a8ccdbcadee7a94ba
-  data.tar.gz: 1d611882cc686cb3d5e6905630ef3ec2fd708712bcaaa1dcbbacb83eca37965ff39f29570ad4000ab0a5aa14e2f1f5a66626238b074b5a215e53bf4deab2b4f9
+  metadata.gz: 1350baf54ebb72e7baf2ccfefd48fe9ffd39c309436e9ed9e52f2f174736935e6b0e9d424e6bf08bff5f1fefc6ae5c0a54343bf3082e11b285c82b606d99f461
+  data.tar.gz: 199b84bf7ed343c417d29d92195180c753ae73da916cd45dd4297d16b62253287ffc977056a9cc2164f8ba4ac4da09c8572368283b0b0de3f0d022b9d91fb903

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/examples/client/client.html

@@ -15,6 +15,8 @@
 
       <p>Use this form to generate a new order:</p>
       Gateway id: <input name="gateway_id"/><br/>
+      Signature: <input name="signature"/><br/>
+      Keychain id: <input name="order_id"/><br/>
       Amount (in default currency for the gateway, usually in satoshi, but could be USD or EUR): <input name="amount"/>
       <p><button id="create_order">Create Order</button></p>
     </div>

data/examples/client/client.js

@@ -5,7 +5,7 @@ jQuery(function($) {
       url: '/gateways/' + $("input[name=gateway_id]").val() + '/orders',
       type: 'POST',
       dataType: 'json',
-      data: { amount: $("input[name=amount]").val() },
+      data: { amount: $("input[name=amount]").val(), signature: $("input[name=signature]").val(), order_id :$("input[name=order_id]").val() },
       success: function(response) {
         window.location = '/pay/' + response.payment_id
       }

data/lib/straight-server/gateway.rb

@@ -111,11 +111,11 @@ module StraightServer
 
       StraightServer.logger.info "Creating new order with attrs: #{attrs}"
       signature = attrs.delete(:signature)
-      if !check_signature || sign_with_secret(attrs[:id]) == signature
-        raise InvalidOrderId if check_signature && (attrs[:id].nil? || attrs[:id].to_i <= 0)
+      if !check_signature || sign_with_secret(attrs[:keychain_id]) == signature
+        raise InvalidOrderId if check_signature && (attrs[:keychain_id].nil? || attrs[:keychain_id].to_i <= 0)
         order = order_for_keychain_id(
           amount:           attrs[:amount],
-          keychain_id:      increment_last_keychain_id!,
+          keychain_id:      attrs[:keychain_id] || increment_last_keychain_id!,
           currency:         attrs[:currency],
           btc_denomination: attrs[:btc_denomination]
         )

data/lib/straight-server/orders_controller.rb

@@ -24,7 +24,7 @@ module StraightServer
           amount:           @params['amount'], # this is satoshi
           currency:         @params['currency'],
           btc_denomination: @params['btc_denomination'],
-          id:               @params['order_id'],
+          keychain_id:      @params['order_id'],
           signature:        @params['signature'],
           data:             @params['data']
         }
@@ -56,6 +56,12 @@ module StraightServer
     end
 
     def show
+
+      unless @gateway
+        StraightServer.logger.warn "Gateway not found"
+        return [404, {}, "Gateway not found" ]
+      end
+
       order = Order[@params['id']] || (@params['id'] =~ /[^\d]+/ && Order[:payment_id => @params['id']])
       if order
         order.status(reload: true)

data/spec/lib/gateway_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe StraightServer::Gateway do
     @gateway.last_keychain_id = 0
     expect( -> { @gateway.create_order(amount: 1, signature: 'invalid', id: 1) }).to raise_exception(StraightServer::GatewayModule::InvalidSignature)
     expect(@gateway).to receive(:order_for_keychain_id).with(@order_for_keychain_id_args).once.and_return(@order_mock)
-    @gateway.create_order(amount: 1, signature: hmac_sha256(1, 'secret'), id: 1)
+    @gateway.create_order(amount: 1, signature: hmac_sha256(1, 'secret'), keychain_id: 1)
   end
 
   it "checks md5 signature only if that setting is set ON for a particular gateway" do
@@ -164,12 +164,13 @@ RSpec.describe StraightServer::Gateway do
     end
 
     it "saves and retrieves last_keychain_id from the file in the .straight dir" do
+      @gateway.check_signature = false
       expect(File.read("#{ENV['HOME']}/.straight/default_last_keychain_id").to_i).to eq(0)
       @gateway.increment_last_keychain_id!
       expect(File.read("#{ENV['HOME']}/.straight/default_last_keychain_id").to_i).to eq(1)
 
       expect(@gateway).to receive(:order_for_keychain_id).with(@order_for_keychain_id_args.merge({ keychain_id: 2})).once.and_return(@order_mock)
-      @gateway.create_order(amount: 1, signature: hmac_sha256(1, 'secret'), id: 1)
+      @gateway.create_order(amount: 1)
       expect(File.read("#{ENV['HOME']}/.straight/default_last_keychain_id").to_i).to eq(2)
     end
     
@@ -197,13 +198,14 @@ RSpec.describe StraightServer::Gateway do
     end
     
     it "saves and retrieves last_keychain_id from the db" do
+      @gateway.check_signature = false
       @gateway.save
       expect(DB[:gateways][:name => 'default'][:last_keychain_id]).to eq(0)
       @gateway.increment_last_keychain_id!
       expect(DB[:gateways][:name => 'default'][:last_keychain_id]).to eq(1)
 
       expect(@gateway).to receive(:order_for_keychain_id).with(@order_for_keychain_id_args.merge({ keychain_id: 2})).once.and_return(@order_mock)
-      @gateway.create_order(amount: 1, signature: hmac_sha256(1, 'secret'), id: 1)
+      @gateway.create_order(amount: 1)
       expect(DB[:gateways][:name => 'default'][:last_keychain_id]).to eq(2)
     end
 

data/straight-server.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: straight-server 0.2.1 ruby lib
+# stub: straight-server 0.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "straight-server"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Roman Snitko"]
-  s.date = "2015-05-07"
+  s.date = "2015-05-10"
   s.description = "Accepts orders via http, returns payment info via http or streams updates via websockets, stores orders in a DB"
   s.email = "roman.snitko@gmail.com"
   s.executables = ["goliath.log", "goliath.log_stdout.log", "straight-console", "straight-server", "straight-server-benchmark"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: straight-server
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: straight