paymob_accept 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a858f0d51d53e165acf7bb759286fd6d3ffba067068342e1356d98edf9523652
-  data.tar.gz: 05d5404002d4ff545c32c67f310d1c42cdb0ea6869fa03f46938a1cf9d15638f
+  metadata.gz: beebd510c172fc729ba4dbbd07646a2d1863364581a505e1b46db855cb4e243e
+  data.tar.gz: 958f6cc877b89a37fa367369b1856e33807c0deae2fed33f61ddfc0e5fd7deb0
 SHA512:
-  metadata.gz: 130578e9ccb379fc2b8bd76a22d149502d8177a52026abffca362456f30341055979f2b8478322ef55e1edd1408cf124916c6a885be23aa229d36cc02b4bc0c3
-  data.tar.gz: 793edd6500af9628d4746bb40c9b824e035e05bf3ddb819dfc546d41f82d1d6d44f98e7db5407fc0506184fe43f2c598771f14bd4f24b96f879648bf744e324c
+  metadata.gz: dc4667a2a84e21a8bd461543fc5a2decf3a61fb517a69aaf50f4230ce5aaad4d201c12751a27da7cd0760c03f9aceb9e85cf0b5c741d44681cd5eefc26a906e9
+  data.tar.gz: 216f96de1a00cfbe165f8d9b08015676eb6a12f3075ecd334a0bb9ecd3fcc9eb95dc5e0fee5ee91dd40f37542429cb8eddcfbb34254e4103d44e3c0773a6edc2

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.2'
+  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.2
+  version: 0.3.3
 platform: ruby
 authors:
 - OneOrder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday