paynow_sdk 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cac4037ba1cf87bc33a26266b3ff01a59d31fc55399858a4a01dc8fde69c4b87
-  data.tar.gz: 563f661d03b3e3097d14b97f52acedd2abdb330f3ceaeb59b072d76a9a86528c
+  metadata.gz: 51a6b7dd3c5c39174dfe585ac3df8a036ad4d3c9aa39c247bf900a4c90672676
+  data.tar.gz: '0050613579b86b1c8038d5d4e9633cf39dfc3050aad5f830c6de4389bb14f27d'
 SHA512:
-  metadata.gz: 0a08a6124c7da41858969d2fdab69e80c14034a2150f935b10597ac76f39d00613e20afbf1404888fce83c6eccca41ad81bf9c43330219729a01f8e8e2a33dc8
-  data.tar.gz: 986c22c11ad93a32010a18ad9f19f88c322209f3b77a30f6211303452506ffdfb45674624e75aa6345d0e36b584604d50945bb9e67f350a845efaa49060e721e
+  metadata.gz: 3271f4b73cfe1acae7085e18802a8521de3920f095fa289042f30f6701909de2195a7c46c47b221032980b0015d874e7a1467d7fb628109366931d3de48f7c73
+  data.tar.gz: 9b6ec46c407bd87d22ee884f4965861048ee1d5795c3bfcb9ef3687d783299b2a4f9ad5d26be8c10fcd26050b0d8ef3ec2338dc97c6da4e6801fb8886cd7958c

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+test.rb

data/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "/usr/bin/python"
+}

data/Gemfile

@@ -6,3 +6,5 @@ gemspec
 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,30 +1,53 @@
 PATH
   remote: .
   specs:
-    paynow_sdk (0.1.4)
+    paynow_sdk (0.2.0)
 
 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)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.0512)
     minitest (5.14.1)
     minitest-reporters (1.4.2)
       ansi
       builder
       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
 
 DEPENDENCIES
+  httparty
   minitest (~> 5.0)
   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,78 +1,164 @@
 require "paynow_sdk/version"
+require "cgi"
+require "digest"
 require "httparty"
+require "uri"
+require "rest-client"
+require "net/http"
 
 #throws error when hash from Paynow does not match locally generated hash
 
-class HashMismatch < StandardError
+class HashMismatchException < Exception
   def initialize(message)
     super(message)
   end
 end
 
-# status of the transaction
-
 class StatusResponse
-  attr_accessor :paid, :status, :amount, :reference, :paynow_reference, :hash
+  @@paid = true
+  @@status = ""
+  @@amount = Float
+  @@reference = ""
+  @@paynow_reference = ""
+  @@hash = ""
+
+  def __status_update(data)
+    return "Not implemented"
+  end
 
   def initialize(data, update)
-    @data = data
-    @update = update
     if update
-      self.status_update(data)
+      __status_update(data)
     else
-      self.status = data["status"].downcase
-      self.paid = self.status == "paid"
-
+      @status = data["status"].downcase
+      @paid = @status == "paid"
       if data.include?("amount")
-        self.amount = data["amount"].to_f
+        @amount = data["amount"].to_f
       end
       if data.include?("reference")
-        self.reference = data["reference"].to_s
+        @reference = data["reference"]
       end
-      if data.include?("paynow_reference")
-        self.paynow_reference = data["paynow_reference"].to_s
+      if data.include?("paynowreference")
+        @paynow_reference = data["paynowreference"]
       end
       if data.include?("hash")
-        self.hash = data["hash"]
+        @hash = data["hash"]
       end
     end
   end
 
-  def self.status_update(data)
-    print "Not Implemented"
-  end
-end
+  # def self.paid; @@paid; end
+  # def self.paid=(val); @@paid = val; end
 
-#response from paynow during transaction
+  # def paid; @paid = @@paid if @paid.nil?; @paid; end
+  # def paid=(val); @paid = val; end
 
-class InitialResponse
-  attr_accessor :success, :instructions, :has_redirect, :hash, :redirect_url, :error, :poll_url
+  # def self.status; @@status; end
+  # def self.status=(val); @@status = val; end
 
-  def initialize(data)
-    @data = data
+  # def status; @status = @@status if @status.nil?; @status; end
+  # def status=(val); @status = val; end
+
+  # def self.amount; @@amount; end
+  # def self.amount=(val); @@amount = val; end
+
+  # def amount; @amount = @@amount if @amount.nil?; @amount; end
+  # def amount=(val); @amount = val; end
+
+  # def self.reference; @@reference; end
+  # def self.reference=(val); @@reference = val; end
+
+  # def reference; @reference = @@reference if @reference.nil?; @reference; end
+  # def reference=(val); @reference = val; end
+
+  # def self.paynow_reference; @@paynow_reference; end
+  # def self.paynow_reference=(val); @@paynow_reference = val; end
 
-    self.status = data["status"]
-    self.success = data["status"].downcase != "error"
-    self.has_redirect = data["browserurl"]
-    self.hash = data["hash"]
+  # def paynow_reference; @paynow_reference = @@paynow_reference if @paynow_reference.nil?; @paynow_reference; end
+  # def paynow_reference=(val); @paynow_reference = val; end
 
-    if !self.success
-      self.poll_url = data["pollurl"]
-      self.error = data["error"]
+  # def self.hash; @@hash; end
+  # def self.hash=(val); @@hash = val; end
+
+  # def hash; @hash = @@hash if @hash.nil?; @hash; end
+  # def hash=(val); @hash = val; end
+end
+
+class InitResponse
+  @@success = true
+  @@instructions = ""
+  @@has_redirect = true
+  @@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 @success
+      @poll_url = data["pollurl"]
+    end
+    if !@success
+      @error = data["error"]
     end
-    if !self.has_redirect
-      self.redirect_url = data["browserurl"]
+    if @has_redirect
+      @redirect_url = data["browserurl"]
     end
-    if data.include?(instructions)
-      self.instruction = data["instructions"]
+    if data.include?("instructions")
+      @instruction = data["instructions"]
     end
   end
-end
 
-#Create a transaction
+  def self.success; @@success; end
+  def self.success=(val); @@success = val; end
+
+  def success; @success = @@success if @success.nil?; @success; end
+  def success=(val); @success = val; end
+
+  def self.instructions; @@instructions; end
+  def self.instructions=(val); @@instructions = val; end
+
+  def instructions; @instructions = @@instructions if @instructions.nil?; @instructions; end
+  def instructions=(val); @instructions = val; end
+
+  def self.has_redirect; @@has_redirect; end
+  def self.has_redirect=(val); @@has_redirect = val; end
+
+  def has_redirect; @has_redirect = @@has_redirect if @has_redirect.nil?; @has_redirect; end
+  def has_redirect=(val); @has_redirect = val; end
+
+  def self.hash; @@hash; end
+  def self.hash=(val); @@hash = val; end
+
+  def hash; @hash = @@hash if @hash.nil?; @hash; end
+  def hash=(val); @hash = val; end
+
+  def self.redirect_url; @@redirect_url; end
+  def self.redirect_url=(val); @@redirect_url = val; end
+
+  def redirect_url; @redirect_url = @@redirect_url if @redirect_url.nil?; @redirect_url; end
+  def redirect_url=(val); @redirect_url = val; end
+
+  def self.error; @@error; end
+  def self.error=(val); @@error = val; end
+
+  def error; @error = @@error if @error.nil?; @error; end
+  def error=(val); @error = val; end
+
+  def self.poll_url; @@poll_url; end
+  def self.poll_url=(val); @@poll_url = val; end
+
+  def poll_url; @poll_url = @@poll_url if @poll_url.nil?; @poll_url; end
+  def poll_url=(val); @poll_url = val; end
+end
 
 class Payment
-  attr_accessor :items, :auth_email, :reference
+  @@reference = ""
+  @@items = []
+  @@auth_email = ""
 
   def initialize(reference, auth_email)
     @reference = reference
@@ -82,29 +168,51 @@ class Payment
   def add(title, amount)
     @items = []
     @items.push([title, amount])
+    self
   end
 
   def total
-    @total = 0.0
-    @items.map do |item|
-      @total += item[1]
-      @total
+    total = 0
+    for item in @items
+      total += item[1]
     end
+    total.round(2)
   end
 
   def info
-    @ticket = ""
-    @items.each do |item|
-      @ticket += item[0] + ", "
-      @ticket
+    out = ""
+    for item in @items
+      out += item[0] + ", "
     end
+    out
   end
+
+  def self.reference; @@reference; end
+  def self.reference=(val); @@reference = val; end
+
+  def reference; @reference = @@reference if @reference.nil?; @reference; end
+  def reference=(val); @reference = val; end
+
+  def self.items; @@items; end
+  def self.items=(val); @@items = val; end
+
+  def items; @items = @@items if @items.nil?; @items; end
+  def items=(val); @items = val; end
+
+  def self.auth_email; @@auth_email; end
+  def self.auth_email=(val); @@auth_email = val; end
+
+  def auth_email; @auth_email = @@auth_email if @auth_email.nil?; @auth_email; end
+  def auth_email=(val); @auth_email = val; end
 end
 
 class Paynow
-  attr_accessor :integration_id, :integration_key, :return_url, :result_url
-
-  @url_initiate_mobile_transaction = "https://www.paynow.co.zw/interface/remotetransaction"
+  @@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 = ""
 
   def initialize(integration_id, integration_key, return_url, result_url)
     @integration_id = integration_id
@@ -113,8 +221,12 @@ class Paynow
     @result_url = result_url
   end
 
-  def self.result_url(url)
-    self.result_url = url
+  def set_result_url(url)
+    @result_url = url
+  end
+
+  def set_return_url(url)
+    @return_url = url
   end
 
   def create_payment(reference, auth_email)
@@ -122,145 +234,154 @@ class Paynow
   end
 
   def send(payment)
-    paying(payment)
+    init(payment)
   end
 
   def send_mobile(payment, phone, method)
-    return paying_mobile(payment, phone, method)
+    init_mobile(payment, phone, method)
   end
 
   def process_status_update(data)
-    return StatusResponse(data)
+    StatusResponse.new(data, true)
   end
 
-  def paying(payment)
-    # if payment.total <= 0
-    #   raise "Transaction total cannot be less than 1"
-    # end
+  def init(payment)
+    if payment.total <= 0
+      raise TypeError, "Transaction total cannot be less than 1"
+    end
+    puts data = build(payment)
 
-    data = build(payment)
-    url_initiate_transaction = "https://www.paynow.co.zw/interface/initiatetransaction"
-    response = HTTParty.post(url_initiate_transaction, data)
-    response_object = rebuild_response(response.parsed_response)
+    p response = HTTParty.post("https://www.paynow.co.zw/interface/initiatetransaction?#{data.slice(1, -1)}")
 
-    if response_object.status.to_s == "error"
-      return InitalResponse.new(response_object)
-    end
-    if !verify_hash(response_object, integration_key)
-      raise HashMismatchException("Hashes do not match")
-    end
-    return InitalResponse.new(response_object)
-  end
+    # response_object = rebuild_response(response)
 
-  def paying_mobile(payment, phone, method)
-    # if payment.total <= 0
-    #   raise "Transaction total cannot be less than 1"
+    # if response_object["status"].to_s.downcase == "error"
+    #   InitResponse.new(response_object)
     # end
-
-    # if !payment.auth_email || payment.auth_email.length <= 0
-    #   raise "Auth email is required for mobile transactions. You can pass the auth email as the "
-    #   "second parameter in the create_payment method call"
+    # if verify_hash(response_object)
+    #   raise HashMismatchException, "Hashes do not match"
     # end
-
-    data = build(payment, phone, method)
-
-    response = HTTParty.post(url_initiate_mobile_transaction, data)
-    response_object = rebuild_response(response.parsed_response)
-
-    if response_object["status"].to_s == "error"
-      return InitalResponse.new(response_object)
-    end
-    if !verify_hash(response_object, integration_key)
-      raise HashMismatchException("Hashes do not match")
-    end
-    return InitalResponse.new(response_object)
+    # InitResponse.new(response_object)
   end
 
-  def self.check_transaction_status(poll_url)
-    response = HTTParty.post(poll_url, data)
-    response_object = rebuild_response(response.parsed_response)
-
-    return StatusResponse.new(response_object)
+  # 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(response)
+    StatusResponse.new(response_object, false)
   end
 
   def build(payment)
     body = {
-      "resulturl": result_url,
-      "returnurl": return_url,
+      "id": @integration_id,
       "reference": payment.reference,
       "amount": payment.total,
-      "id": integration_id,
       "additionalinfo": payment.info,
+      "returnurl": @return_url,
+      "resulturl": @result_url,
       "authemail": payment.auth_email,
       "status": "Message",
     }
 
-    body.each do |key, value|
-      body[key] = %q[value].to_s
-    end
-
-    body["hash"] = ahash(body, integration_key)
-
-    return body
+    joined = body.values.join.to_s
+    add_key = joined += @integration_key
+    body["hash"] = createdhash(joined)
+    body = URI.encode_www_form(body)
+    CGI.escape(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",
-    }
+    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
 
-    body.each do |key, value|
-      if key == "authemail"
-        next
-      end
+  def createdhash(out)
+    Digest::SHA2.new(512).hexdigest(out).upcase
+  end
 
-      body[key] = %q[value].to_s
+  #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
-
-    body["hash"] = ahash(body, integration_key)
-
-    return body
+    old_hash = response["hash"]
+    new_hash = verify(response)
+    old_hash == new_hash
   end
 
-  def ahash(items, integration_key)
+  def verify(item)
     out = ""
-    items.each do |key, value|
-      if key.to_s.downcase == "hash"
+    for key, value in item
+      if key.to_s == "hash"
         next
       end
-      out = value.to_s
+      out += value.to_s
     end
-    out += integration_key.downcase
+    out += @integration_key.downcase
+    Digest::SHA2.new(512).hexdigest(out).upcase
+  end
 
-    # return hashlib.sha512(out.encode('utf-8')).hexdigest().upper()
+  #  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.verify_hash(response, integration_key)
-    if "hash" != response
-      raise "Response from Paynow does not contain a hash"
-    end
+  def self.url_initiate_transaction; @@url_initiate_transaction; end
+  def self.url_initiate_transaction=(val); @@url_initiate_transaction = val; end
 
-    old_hash = response["hash"]
-    new_hash = self.ahash(response, integration_key)
+  def url_initiate_transaction; @url_initiate_transaction = @@url_initiate_transaction if @url_initiate_transaction.nil?; @url_initiate_transaction; end
+  def url_initiate_transaction=(val); @url_initiate_transaction = val; end
 
-    return old_hash == new_hash
-  end
+  def self.url_initiate_mobile_transaction; @@url_initiate_mobile_transaction; end
+  def self.url_initiate_mobile_transaction=(val); @@url_initiate_mobile_transaction = val; end
 
-  def rebuild_response(response)
-    res = {}
-    response.map do |key, value|
-      res[key] = value[0].to_s
-    end
+  def url_initiate_mobile_transaction; @url_initiate_mobile_transaction = @@url_initiate_mobile_transaction if @url_initiate_mobile_transaction.nil?; @url_initiate_mobile_transaction; end
+  def url_initiate_mobile_transaction=(val); @url_initiate_mobile_transaction = val; end
 
-    return res
-  end
+  def self.integration_id; @@integration_id; end
+  def self.integration_id=(val); @@integration_id = val; end
+
+  def integration_id; @integration_id = @@integration_id if @integration_id.nil?; @integration_id; end
+  def integration_id=(val); @integration_id = val; end
+
+  def self.integration_key; @@integration_key; end
+  def self.integration_key=(val); @@integration_key = val; end
+
+  def integration_key; @integration_key = @@integration_key if @integration_key.nil?; @integration_key; end
+  def integration_key=(val); @integration_key = val; end
+
+  def self.return_url; @@return_url; end
+  def self.return_url=(val); @@return_url = val; end
+
+  def return_url; @return_url = @@return_url if @return_url.nil?; @return_url; end
+  def return_url=(val); @return_url = val; end
+
+  def self.result_url; @@result_url; end
+  def self.result_url=(val); @@result_url = val; end
+
+  def result_url; @result_url = @@result_url if @result_url.nil?; @result_url; end
+  def result_url=(val); @result_url = val; end
 end