paymob_accept 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f07b80f4fe23b6ca6da25649d650917ebf48802ce93903ca44dde300acf0f89
-  data.tar.gz: 4238ee5fa6e5267b27deac4b3f45701759515420ae4cfc255621691ef8f9b616
+  metadata.gz: beebd510c172fc729ba4dbbd07646a2d1863364581a505e1b46db855cb4e243e
+  data.tar.gz: 958f6cc877b89a37fa367369b1856e33807c0deae2fed33f61ddfc0e5fd7deb0
 SHA512:
-  metadata.gz: f29651bddc3f492f908304e0aa1f552b597ba9e8feeaff5f67f1bb045b2b8791f5bf66cf72a16291ae43b7036da4277dc5276dd75550351a4fe476396e7af127
-  data.tar.gz: f761e0b4eb1faafd6688beafdf195416ec2db6160265d9227b3e94c332bddf5c4f493965d2a3ce2767c0f9622ad36b90a5e699e21b7d1307f7c85c1ebe499d91
+  metadata.gz: dc4667a2a84e21a8bd461543fc5a2decf3a61fb517a69aaf50f4230ce5aaad4d201c12751a27da7cd0760c03f9aceb9e85cf0b5c741d44681cd5eefc26a906e9
+  data.tar.gz: 216f96de1a00cfbe165f8d9b08015676eb6a12f3075ecd334a0bb9ecd3fcc9eb95dc5e0fee5ee91dd40f37542429cb8eddcfbb34254e4103d44e3c0773a6edc2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paymob_accept (0.3.1)
+    paymob_accept (0.3.2)
       faraday
       json-schema
 

data/lib/paymob_accept/api/pay.rb

@@ -30,9 +30,9 @@ module PaymobAccept
 
       private
 
-      def pay_auth(customer:, address:, amount_cents:, amount_currency:)
+      def pay_auth(customer:, address:, amount_cents:, amount_currency:, iframe_id: nil, cc_token: nil)
         generate_payment_intent(customer: customer, address: address, amount_cents: amount_cents, amount_currency: amount_currency,
-                                integration_id: auth_integration_id)
+                                integration_id: auth_integration_id, iframe_id: iframe_id, cc_token: cc_token)
       end
 
       # Return an iFrame URL if an iframe_id is provided. Otherwise, returns a payment token

data/lib/paymob_accept/hmac.rb

@@ -1,16 +1,30 @@
 module PaymobAccept
   module Hmac
-    FILTERED_KEYS = %w[amount_cents created_at currency error_occured has_parent_transaction id
+    FILTERED_TRANSACTION_KEYS = %w[amount_cents created_at currency error_occured has_parent_transaction id
                        integration_id is_3d_secure is_auth is_capture is_refunded is_standalone_payment
                        is_voided order.id owner
                        pending source_data.pan source_data.sub_type source_data.type success].freeze
 
+    FILTERED_TOKEN_KEYS = %w[card_subtype created_at email id masked_pan merchant_id order_id token].freeze
+
     class << self
+
       def validate(paymob_response:, hmac_key: PaymobAccept.configuration.hmac_key)
-        raise ArgumentError, 'hmac_key is required' if hmac_key.nil?
+        validate_transaction?(paymob_response: paymob_response, hmac_key: hmac_key) || validate_token?(paymob_response: paymob_response, hmac_key: hmac_key)
+      end
+
+      def validate_transaction?(paymob_response:, hmac_key: PaymobAccept.configuration.hmac_key)
+        digest = OpenSSL::Digest.new('sha512')
+        concatenated_str = FILTERED_TRANSACTION_KEYS.map do |element|
+          paymob_response.dig('obj', *element.split('.'))
+        end.join
+        secure_hash = OpenSSL::HMAC.hexdigest(digest, hmac_key, concatenated_str)
+        secure_hash == paymob_response['hmac']
+      end
 
+      def validate_token?(paymob_response:, hmac_key: PaymobAccept.configuration.hmac_key)
         digest = OpenSSL::Digest.new('sha512')
-        concatenated_str = FILTERED_KEYS.map do |element|
+        concatenated_str = FILTERED_TOKEN_KEYS.map do |element|
           paymob_response.dig('obj', *element.split('.'))
         end.join
         secure_hash = OpenSSL::HMAC.hexdigest(digest, hmac_key, concatenated_str)

data/lib/paymob_accept/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PaymobAccept
-  VERSION = '0.3.1'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paymob_accept
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - OneOrder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday