debitech 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d3837cce2fed9f2d327af0a5e14a45956a7826
-  data.tar.gz: 9353b96c987b1314af7487cdd795ef54d9b4ebb5
+  metadata.gz: 80a1113ae193781f0000c1c5ce7d5dff6d4a8ef7
+  data.tar.gz: f129e8f59589dc5a53d1d16d51030599f3926e34
 SHA512:
-  metadata.gz: 7c309871d7f6a87f2e3abb27fe4a50cbaf137a19f22b923e536dcdc7bbacfc9854a65c3cdde6d0d1600b66ff09d37e9c3464351ee07e5e32850260c37edb0f7d
-  data.tar.gz: 15e0e23ba1d96ab869b5ce09985cafb68000969ed781be8b32d229592f4e0491781bb30a0dcdd74fc999dec7cb537201051a4f17884967cd908d6266aa2c1dc6
+  metadata.gz: f747691d6e2a953583edc59bd4e1f6189ab5d93aa2c4772357687d94b83c7c552590fd959f12a54ed395644f67a4e962deddc75f63fd1149ed2068eaff54a477
+  data.tar.gz: 46d07f8d33c8ccd8ad81822074cc029886acbac904bcec55161d9b2e0580692c882fec6e21a986efcdc8045e846c07364122c1b94c5915de607dc257037d88f6

data/README.md

@@ -50,8 +50,9 @@ Get the API docs in DIBS manager, setup the account.
     }
 
     # In the view: form to redirect the user to DIBS
-    # You can optionally pass a hash of further custom fields.
     <% api = Debitech::WebApi.new(debitech_web_config) %>
+    # You can optionally pass a hash of further custom fields.
+    # Note that if you override the "currency" here, you will also need to pass it explicitly into `valid_response?`.
     <% custom_fields = { pageSet: "my-custom-pageset" } %>
     <form accept-charset="iso-8859-1" action="<%= api.form_action %>" method="post">
       <% api.form_fields(custom_fields).each do |name, value| %>

data/lib/debitech/version.rb

@@ -1,4 +1,4 @@
 module Debitech
   # try to follow http://semver.org/
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/debitech/web_api.rb

@@ -15,18 +15,17 @@ module Debitech
     def form_fields(more_custom_fields = {})
       # Overriding via the initializer may be more convenient for per-env stuff like "method"".
       # Overriding via the method argument may be more convenient for per-request stuff like multiple pageSets.
-      base_fields.
-        merge(@custom_fields).
-        merge(more_custom_fields).
-        merge(:MAC => request_mac)
+      all_fields_except_mac = custom_fields.merge(more_custom_fields)
+      mac = request_mac(all_fields_except_mac)
+      all_fields_except_mac.merge(:MAC => mac)
     end
 
     def form_action
       "https://securedt.dibspayment.com/verify/bin/#{@merchant}/index"
     end
 
-    def valid_response?(mac, sum, reply, verify_id)
-      response_mac(sum, reply, verify_id) == mac.upcase.split("=").last
+    def valid_response?(mac, sum, reply, verify_id, currency = custom_fields[:currency])
+      response_mac(sum, reply, verify_id, currency) == mac.upcase.split("=").last
     end
 
     def approved_reply?(reply)
@@ -35,6 +34,10 @@ module Debitech
 
     private
 
+    def custom_fields
+      base_fields.merge(@custom_fields)
+    end
+
     def base_fields
       {
         :currency         => "SEK",
@@ -53,12 +56,14 @@ module Debitech
       }
     end
 
-    def request_mac
-      Mac.build [ base_fields[:data], base_fields[:currency], base_fields[:method], @secret_key ]
+    private
+
+    def request_mac(fields)
+      Mac.build [ fields[:data], fields[:currency], fields[:method], @secret_key ]
     end
 
-    def response_mac(sum, reply, verify_id)
-      Mac.build [ sum, base_fields[:currency], reply, verify_id, @secret_key ]
+    def response_mac(sum, reply, verify_id, currency)
+      Mac.build [ sum, currency, reply, verify_id, @secret_key ]
     end
   end
 end

data/spec/debitech/web_api_spec.rb

@@ -25,10 +25,16 @@ describe Debitech::WebApi do
       expect(api.form_fields(pageSet: "override").fetch(:pageSet)).to eq "override"
     end
 
-    it "calculate mac" do
+    it "calculates MAC" do
       expect(Debitech::WebApi.new({ :secret_key => "secretkey1" }).form_fields[:MAC]).to match /DF253765337968C5ED7E6EA530CD692942416ABE/
       expect(Debitech::WebApi.new({ :secret_key => "secretkey2" }).form_fields[:MAC]).to match /BEB3C370E37837734642111D44CA7E304A0F45F2/
     end
+
+    it "accounts for overrides in the MAC" do
+      mac_without_override = Debitech::WebApi.new({ :secret_key => "secretkey1" }).form_fields.fetch(:MAC)
+      mac_with_override = Debitech::WebApi.new({ :secret_key => "secretkey1" }).form_fields(method: "other-method").fetch(:MAC)
+      expect(mac_without_override).not_to eq(mac_with_override)
+    end
   end
 
   describe "form_action" do
@@ -74,5 +80,11 @@ describe Debitech::WebApi do
       api = Debitech::WebApi.new(secret_key)
       expect(api.valid_response?("MAC=667026AD7692F9AFDA362919EA72D8E6A250A849", "1,00", "A", 1234567)).to be true
     end
+
+    it "lets you pass currency explicitly" do
+      api = Debitech::WebApi.new(secret_key)
+      expect(api.valid_response?("MAC=667026AD7692F9AFDA362919EA72D8E6A250A849", "1,00", "A", 1234567, "SEK")).to be true
+      expect(api.valid_response?("MAC=667026AD7692F9AFDA362919EA72D8E6A250A849", "1,00", "A", 1234567, "EUR")).to be false
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: debitech
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Joakim Kolsjö