paynow_sdk 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 225ccefb9727d2d3ed6ce68879c3f7f67c365986719e49e5bb830ead2eca239d
-  data.tar.gz: ca64fefbaeb0880cbcdc368e3ca12de5461da738a5a08e7d3ebadfaaca7a1ce3
+  metadata.gz: efdbc907da2dc69ea4101875b49b7cfa00fdca200014522d11627a2ba4ca7457
+  data.tar.gz: 4949deb2d18941a0979c33df19e3659286d1e4044f7a516bf320e1ca4ad24ebf
 SHA512:
-  metadata.gz: a3e9438fb4d06e8ff02b4e64a8c1c61cd11e8b655beb8c3cc1e2ffac002a440ce4701c5d09c5919347307647bb3f52f252b6bb7a54e9be2c42490f2c4ab15ed8
-  data.tar.gz: 6737ae30441c2e3dcf5f03374f984e83a9d3ce63a7f95667a2d1c2a1511adc88db66a92ec3eb5f445369ddb709db69978535d794c9d0fd8d5f6c30aa48414194
+  metadata.gz: '0974c6ca229bb78ffc76d36ef69c5fe4653f6217addf4151c975e98c6ae119093dc683286c3884e8c8fd3a7558fe86af91ae8883f5e6d6548e01dec1e80a63dd'
+  data.tar.gz: 6acf4442269516ce8c257f3478bf856ea876b3ca485185cc8a5be26a5dfcb6415dcaf99f6adbaef29a028cda51ab45d12d09fdfef05ab73ae9e569f7954a606b

data/Gemfile

@@ -7,3 +7,4 @@ gem "rake", "~> 12.0"
 gem "minitest", "~> 5.0"
 gem "minitest-reporters", "~> 1.4", ">= 1.4.2"
 gem "httparty"
+gem "rest-client", "~> 2.1"

data/Gemfile.lock

@@ -1,13 +1,18 @@
 PATH
   remote: .
   specs:
-    paynow_sdk (0.1.8)
+    paynow_sdk (0.1.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
     builder (3.2.4)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -21,8 +26,17 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     multi_xml (0.6.0)
+    netrc (0.11.0)
     rake (12.3.3)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     ruby-progressbar (1.10.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
 
 PLATFORMS
   ruby
@@ -33,6 +47,7 @@ DEPENDENCIES
   minitest-reporters (~> 1.4, >= 1.4.2)
   paynow_sdk!
   rake (~> 12.0)
+  rest-client (~> 2.1)
 
 BUNDLED WITH
    2.1.4

data/lib/paynow_sdk.rb

@@ -1,7 +1,9 @@
 require "paynow_sdk/version"
-require "httparty"
 require "cgi"
 require "digest"
+require "httparty"
+require "uri"
+require "rest-client"
 
 #throws error when hash from Paynow does not match locally generated hash
 
@@ -13,18 +15,18 @@ end
 
 class StatusResponse
   @@paid = true
-  @@status = String
+  @@status = ""
   @@amount = Float
-  @@reference = String
-  @@paynow_reference = String
-  @@hash = String
+  @@reference = ""
+  @@paynow_reference = ""
+  @@hash = ""
 
   def __status_update(data)
     return "Not implemented"
   end
 
   def initialize(data, update)
-    if is_bool(update)
+    if update
       __status_update(data)
     else
       @status = data["status"].downcase
@@ -83,26 +85,25 @@ end
 
 class InitResponse
   @@success = true
-  @@instructions = String
+  @@instructions = ""
   @@has_redirect = true
-  @@hash = String
-  @@redirect_url = String
-  @@error = String
-  @@poll_url = String
+  @@hash = ""
+  @@redirect_url = ""
+  @@error = ""
+  @@poll_url = ""
 
   def initialize(data)
     @status = data["status"]
     @success = data["status"].downcase != "error"
     @has_redirect = data.include?("browserurl")
     @hash = data.include?("hash")
-    if is_bool(!@success)
-      return
+    if !@success
+      @poll_url = data["pollurl"]
     end
-    @poll_url = data["pollurl"]
-    if is_bool(!@success)
+    if !@success
       @error = data["error"]
     end
-    if is_bool(@has_redirect)
+    if @has_redirect
       @redirect_url = data["browserurl"]
     end
     if data.include?("instructions")
@@ -154,9 +155,9 @@ class InitResponse
 end
 
 class Payment
-  @@reference = String
+  @@reference = ""
   @@items = []
-  @@auth_email = String
+  @@auth_email = ""
 
   def initialize(reference, auth_email)
     @reference = reference
@@ -166,23 +167,23 @@ class Payment
   def add(title, amount)
     @items = []
     @items.push([title, amount])
-    return self
+    self
   end
 
-  def total()
+  def total
     total = 0.0
     for item in @items
       total += item[1].to_f
     end
-    return total
+    total
   end
 
-  def info()
+  def info
     out = ""
     for item in @items
       out += item[0] + ", "
     end
-    return out
+    out
   end
 
   def self.reference; @@reference; end
@@ -205,10 +206,10 @@ class Payment
 end
 
 class Paynow
-  @@url_initiate_transaction = URI("https://www.paynow.co.zw/interface/initiatetransaction")
-  @@url_initiate_mobile_transaction = "https://www.paynow.co.zw/interface/remotetransaction"
-  @@integration_id = String
-  @@integration_key = String
+  @@url_initiate_transaction = "https://www.paynow.co.zw/interface/initiatetransaction/"
+  @@url_initiate_mobile_transaction = "https://www.paynow.co.zw/interface/remotetransaction/"
+  @@integration_id = ""
+  @@integration_key = ""
   @@return_url = ""
   @@result_url = ""
 
@@ -228,124 +229,114 @@ class Paynow
   end
 
   def create_payment(reference, auth_email)
-    return Payment.new(reference, auth_email)
+    Payment.new(reference, auth_email)
   end
 
   def send(payment)
-    return __init(payment)
+    init(payment)
   end
 
   def send_mobile(payment, phone, method)
-    return __init_mobile(payment, phone, method)
+    init_mobile(payment, phone, method)
   end
 
   def process_status_update(data)
-    return StatusResponse.new(data, true)
+    StatusResponse.new(data, true)
   end
 
-  def qs_to_hash(querystring)
-    keyvals = querystring.split("&").inject({}) do |result, q|
-      k, v = q.split("=")
-      if !v.nil?
-        result.merge({ k => v })
-      elsif !result.key?(k)
-        result.merge({ k => true })
-      else
-        result
-      end
-    end
-    keyvals
-  end
-
-  def __init(payment)
-    if payment.total() <= 0
+  # def qs_to_hash(querystring)
+  #   keyvals = querystring.split("&").inject({}) do |result, q|
+  #     k, v = q.split("=")
+  #     if !v.nil?
+  #       result.merge({ k => v })
+  #     elsif !result.key?(k)
+  #       result.merge({ k => true })
+  #     else
+  #       result
+  #     end
+  #   end
+  #   keyvals
+  # end
+
+  def init(payment)
+    if payment.total <= 0
       raise TypeError, "Transaction total cannot be less than 1"
     end
-    data = __build(payment)
-    response = HTTParty.post(@url_initiate_transaction, data)
-    response_object = __rebuild_response(CGI.parse(response))
-    if response_object["status"].to_s.downcase == "error"
-      return InitResponse.new(response_object)
-    end
-    if is_bool(!__verify_hash(response_object, @integration_key))
-      raise HashMismatchException, "Hashes do not match"
-    end
-    return InitResponse.new(response_object)
-  end
+    data = build(payment)
+
+    response = RestClient.post("https://www.paynow.co.zw/interface/initiatetransaction/", data)
+    response_object = rebuild_response(response)
 
-  def __init_mobile(payment, phone, method)
-    if payment.total() <= 0
-      raise TypeError, "Transaction total cannot be less than 1"
-    end
-    if is_bool(!payment.auth_email || payment.auth_email.size <= 0)
-      raise TypeError, "Auth email is required for mobile transactions. You can pass the auth email as the second parameter in the create_payment method call"
-    end
-    data = __build_mobile(payment, phone, method)
-    response = HTTParty.post(@url_initiate_mobile_transaction, data)
-    response_object = __rebuild_response(CGI.parse(response))
     if response_object["status"].to_s.downcase == "error"
-      return InitResponse.new(response_object)
-    end
-    if is_bool(!__verify_hash(response_object, @integration_key))
-      raise HashMismatchException, "Hashes do not match"
+      InitResponse.new(response_object)
     end
-    return InitResponse.new(response_object)
+    # if !verify_hash(response_object, @integration_key)
+    #   raise HashMismatchException, "Hashes do not match"
+    # end
+    InitResponse.new(response_object)
   end
 
+  # def init_mobile(payment, phone, method)
+  #   if payment.total <= 0
+  #     raise TypeError, "Transaction total cannot be less than 1"
+  #   end
+  #   if is_bool(!payment.auth_email || payment.auth_email.size <= 0)
+  #     raise TypeError, "Auth email is required for mobile transactions. You can pass the auth email as the second parameter in the create_payment method call"
+  #   end
+  #   data = build_mobile(payment, phone, method)
+  #   response = HTTParty.post(@url_initiate_mobile_transaction, data)
+  #   response_object = rebuild_response(response)
+  #   if response_object["status"].to_s.downcase == "error"
+  #     InitResponse.new(response_object)
+  #   end
+  #   if is_bool(!verify_hash(response_object, @integration_key))
+  #     raise HashMismatchException, "Hashes do not match"
+  #   end
+  #   InitResponse.new(response_object)
+  # end
+
   def check_transaction_status(poll_url)
     response = HTTParty.post(poll_url, data: {})
-    response_object = __rebuild_response(CGI.parse(response))
-    return StatusResponse.new(response_object, false)
+    response_object = rebuild_response(response)
+    StatusResponse.new(response_object, false)
   end
 
-  def __build(payment)
-    body = { "resulturl" => @result_url, "returnurl" => @return_url, "reference" => payment.reference, "amount" => payment.total(), "id" => @integration_id, "additionalinfo" => payment.info(), "authemail" => payment.auth_email || "", "status" => "Message" }
-    for (key, value) in body
-      body[key] = CGI::escape(value.to_s)
-    end
-    body["hash"] = __hash(body, @integration_key)
+  def build(payment)
+    body = { "resulturl": @result_url, "returnurl": @return_url, "reference": payment.reference, "amount": payment.total, "id": @integration_id, "additionalinfo": payment.info, "authemail": payment.auth_email || "", "status": "Message" }
+    joined = body.values.join.to_s
+    add_key = joined += @integration_key
+    body["hash"] = createdhash(add_key)
+    body = URI.encode_www_form(body)
     body
   end
 
-  def __build_mobile(payment, phone, method)
-    body = { "resulturl" => @result_url, "returnurl" => @return_url, "reference" => payment.reference, "amount" => payment.total(), "id" => @integration_id, "additionalinfo" => payment.info(), "authemail" => payment.auth_email, "phone" => phone, "method" => method, "status" => "Message" }
-    for (key, value) in body
-      if key == "authemail"
-        next
-      end
-      body[key] = CGI::escape(value.to_s)
-    end
-    body["hash"] = __hash(body, @integration_key)
+  def build_mobile(payment, phone, method)
+    body = { "resulturl": @result_url, "returnurl": @return_url, "reference": payment.reference, "amount": payment.total, "id": @integration_id, "additionalinfo": payment.info, "authemail": payment.auth_email, "phone": phone, "method": method, "status": "Message" }
+    joined = body.values.join.to_s
+    add_key = joined += @integration_key
+    body["hash"] = createdhash(add_key)
+    body = URI.encode_www_form(body)
     body
   end
 
-  def __hash(items, integration_key)
-    out = ""
-    for (key, value) in items
-      if key.to_s.downcase == "hash"
-        next
-      end
-      out += value.to_s
-    end
-    out += integration_key.downcase
+  def createdhash(out)
     Digest::SHA2.new(512).hexdigest(out).upcase
   end
 
-  def __verify_hash(response, integration_key)
-    if !response.include?("hash")
-      raise TypeError, "Response from Paynow does not contain a hash"
-    end
-    old_hash = response["hash"]
-    new_hash = __hash(response, integration_key)
-    return old_hash == new_hash
-  end
+  #verify the hash send to paynow is equal to the hash from paynow
+  # def verify_hash(response)
+  #   # if !response.include?("hash")
+  #   #   raise TypeError, "Response from Paynow does not contain a hash"
+  #   # end
+  #   old_hash = response["hash"]
+  #   new_hash = createdhash(response)
+  #   old_hash == new_hash
+  # end
 
-  def __rebuild_response(response)
-    res = {}
-    for (key, value) in response.to_a
-      res[key] = value[0].to_s
-    end
-    return res
+  #  rebuild a response from paynow into hash like the we send
+
+  def rebuild_response(response)
+    URI.decode_www_form(response).to_h
   end
 
   def self.url_initiate_transaction; @@url_initiate_transaction; end

data/lib/paynow_sdk/version.rb

@@ -1,3 +1,3 @@
 module PaynowSdk
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/test.rb

@@ -0,0 +1,54 @@
+# require "digest"
+# require "cgi"
+require "uri"
+
+# @inter = "3e9fed89-60e1-4ce5-ab6e-6b1eb2d4f977"
+# url_initiate_transaction = "https://www.paynow.co.zw/interface/initiatetransaction/"
+
+# def build
+#   body = {
+#     "id": "1201",
+#     "reference": "TEST REF",
+#     "amount": "99.99",
+#     "additionalinfo": "A test ticket transaction",
+#     "returnurl": "http://www.google.com/search?q=returnurl",
+#     "resulturl": "http://www.google.com/search?q=resulturl",
+#     "status": "Message",
+#   }
+
+#   joined = body.values.join.to_s
+#   add_key = joined += @inter
+#   body["hash"] = hash(add_key)
+#   body = URI.encode_www_form(body)
+#   p body
+# end
+
+# def hash(encrypt)
+#   Digest::SHA2.new(512).hexdigest(encrypt).upcase
+# end
+
+# def something
+#   build = "http://www.example.com/something?param1=value1&param2=value2&param3=value3"
+#   rebuild(build)
+# end
+
+# def rebuild(parm)
+#   joined = CGI.parse(parm)
+#   add_key = joined.values.join.to_s
+#   reb = add_key += @inter
+#   hash(reb)
+# end
+
+# def init(payment)
+#   if payment.total <= 0
+#     raise TypeError, "Transaction total cannot be less than 1"
+#   end
+#   data = build(payment)
+
+#   response = HTTParty.post(@url_initiate_mobile_transaction, data)
+#   response_object = rebuild_response(CGI::parse(response))
+# end
+
+build = "id=1201&reference=TEST+REF&amount=99.99&additionalinfo=A+test+ticket+transaction&returnurl=http%3A%2F%2Fwww.google.com%2Fsearch%3Fq%3Dreturnurl&resulturl=http%3A%2F%2Fwww.google.com%2Fsearch%3Fq%3Dresulturl&status=Message&hash=2A033FC38798D913D42ECB786B9B19645ADEDBDE788862032F1BD82CF3B92DEF84F316385D5B40DBB35F1A4FD7D5BFE73835174136463CDD48C9366B0749C689"
+
+p URI.decode_www_form(build).to_h