fawry 1.0.0 → 1.3.1

data/lib/fawry/fawry_request.rb

@@ -17,6 +17,7 @@ module Fawry
     private
 
     # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     def build_request
       case action
       when 'charge'
@@ -31,7 +32,20 @@ module Fawry
         self.class.include Requests::PaymentStatusRequest
         validate_payment_status_params!
         @request = build_payment_status_request
+      when 'create_card_token'
+        self.class.include Requests::CreateCardTokenRequest
+        validate_card_token_params!
+        @request = build_create_card_token_request
+      when 'list_tokens'
+        self.class.include Requests::ListTokensRequest
+        validate_list_tokens_params!
+        @request = build_list_tokens_request
+      when 'delete_token'
+        self.class.include Requests::DeleteTokenRequest
+        validate_delete_token_params!
+        @request = build_delete_token_request
       end
+      # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/MethodLength
     end
   end

data/lib/fawry/requests/charge_request.rb

@@ -5,7 +5,7 @@ require 'digest'
 module Fawry
   module Requests
     module ChargeRequest
-      DEFAULTS = { payment_method: 'PAYATFAWRY', currency_code: 'EGP' }.freeze
+      DEFAULTS = { payment_method: 'PAYATFAWRY', currency_code: 'EGP', language: 'ar-eg' }.freeze
 
       def fire_charge_request
         fawry_api_response = Connection.post(request[:path], request[:params], request[:body], request[:options])
@@ -18,7 +18,7 @@ module Fawry
 
       def build_charge_request
         {
-          path: 'charge',
+          path: 'payments/charge',
           params: {},
           body: charge_request_transformed_params,
           options: options
@@ -45,6 +45,7 @@ module Fawry
           paymentExpiry: request_params[:payment_expiry],
           chargeItems: charge_items,
           currencyCode: request_params[:currency_code],
+          language: request_params[:language],
           signature: charge_request_signature
         }.compact
       end
@@ -52,11 +53,11 @@ module Fawry
       # rubocop:enable Metrics/AbcSize
 
       def fawry_merchant_code
-        ENV.fetch('FAWRY_MERCHANT_CODE') { request_params[:merchant_code] }
+        Fawry.configuration.fawry_merchant_code || ENV.fetch('FAWRY_MERCHANT_CODE') { request_params[:merchant_code] }
       end
 
       def fawry_secure_key
-        ENV.fetch('FAWRY_SECURE_KEY') { request_params[:fawry_secure_key] }
+        Fawry.configuration.fawry_secure_key || ENV.fetch('FAWRY_SECURE_KEY') { request_params[:fawry_secure_key] }
       end
 
       def validate_charge_params!

data/lib/fawry/requests/create_card_token_request.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'digest'
+
+module Fawry
+  module Requests
+    module CreateCardTokenRequest
+      def fire_create_card_token_request
+        fawry_api_response = Connection.post(request[:path], request[:params], request[:body], request[:options])
+        response_body = JSON.parse(fawry_api_response.body)
+
+        FawryResponse.new(response_body)
+      end
+
+      private
+
+      def build_create_card_token_request
+        {
+          path: 'cards/cardToken',
+          params: {},
+          body: create_card_token_request_transformed_params,
+          options: options
+        }
+      end
+
+      def create_card_token_request
+        @create_card_token_request ||= params
+      end
+
+      def create_card_token_request_transformed_params
+        {
+          merchantCode: fawry_merchant_code,
+          customerProfileId: create_card_token_request[:customer_profile_id],
+          customerMobile: create_card_token_request[:customer_mobile],
+          customerEmail: create_card_token_request[:customer_email],
+          cardNumber: create_card_token_request[:card_number],
+          expiryYear: create_card_token_request[:expiry_year],
+          expiryMonth: create_card_token_request[:expiry_month],
+          cvv: create_card_token_request[:cvv]
+        }.compact
+      end
+
+      def fawry_merchant_code
+        Fawry.configuration.fawry_merchant_code || ENV.fetch('FAWRY_MERCHANT_CODE') { request_params[:merchant_code] }
+      end
+
+      def fawry_secure_key
+        Fawry.configuration.fawry_secure_key || ENV.fetch('FAWRY_SECURE_KEY') { request_params[:fawry_secure_key] }
+      end
+
+      def validate_card_token_params!
+        contract = Contracts::CreateCardTokenRequestContract.new.call(create_card_token_request)
+        raise InvalidFawryRequestError, contract.errors.to_h if contract.failure?
+      end
+    end
+  end
+end

data/lib/fawry/requests/delete_token_request.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'digest'
+
+module Fawry
+  module Requests
+    module DeleteTokenRequest
+      def fire_delete_token_request
+        fawry_api_response = Connection.delete(request[:path], request[:params], request[:body], request[:options])
+        response_body = JSON.parse(fawry_api_response.body)
+
+        FawryResponse.new(response_body)
+      end
+
+      private
+
+      def build_delete_token_request
+        {
+          path: 'cards/cardToken',
+          params: {},
+          body: delete_token_request_transformed_params,
+          options: options
+        }
+      end
+
+      def request_params
+        @request_params = params
+      end
+
+      def delete_token_request_transformed_params
+        {
+          merchantCode: fawry_merchant_code,
+          customerProfileId: request_params[:customer_profile_id],
+          signature: delete_token_request_signature,
+          cardToken: request_params[:card_token]
+        }.compact
+      end
+
+      def fawry_merchant_code
+        Fawry.configuration.fawry_merchant_code || ENV.fetch('FAWRY_MERCHANT_CODE') { request_params[:merchant_code] }
+      end
+
+      def fawry_secure_key
+        Fawry.configuration.fawry_secure_key || ENV.fetch('FAWRY_SECURE_KEY') { request_params[:fawry_secure_key] }
+      end
+
+      def card_token
+        request_params[:card_token]
+      end
+
+      def validate_delete_token_params!
+        contract = Contracts::ListTokensRequestContract.new.call(request_params)
+        raise InvalidFawryRequestError, contract.errors.to_h if contract.failure?
+      end
+
+      def delete_token_request_signature
+        Digest::SHA256.hexdigest("#{fawry_merchant_code}#{request_params[:customer_profile_id]}"\
+                                 "#{card_token}#{fawry_secure_key}")
+      end
+    end
+  end
+end

data/lib/fawry/requests/list_tokens_request.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'digest'
+
+module Fawry
+  module Requests
+    module ListTokensRequest
+      def fire_list_tokens_request
+        fawry_api_response = Connection.get(request[:path], request[:params], request[:body], request[:options])
+        response_body = JSON.parse(fawry_api_response.body)
+
+        FawryResponse.new(response_body)
+      end
+
+      private
+
+      def build_list_tokens_request
+        {
+          path: 'cards/cardToken',
+          params: list_tokens_request_transformed_params,
+          body: {},
+          options: options
+        }
+      end
+
+      def request_params
+        @request_params = params
+      end
+
+      def list_tokens_request_transformed_params
+        {
+          merchantCode: fawry_merchant_code,
+          customerProfileId: request_params[:customer_profile_id],
+          signature: list_tokens_request_signature
+        }.compact
+      end
+
+      def fawry_merchant_code
+        Fawry.configuration.fawry_merchant_code || ENV.fetch('FAWRY_MERCHANT_CODE') { request_params[:merchant_code] }
+      end
+
+      def fawry_secure_key
+        Fawry.configuration.fawry_secure_key || ENV.fetch('FAWRY_SECURE_KEY') { request_params[:fawry_secure_key] }
+      end
+
+      def validate_list_tokens_params!
+        contract = Contracts::ListTokensRequestContract.new.call(request_params)
+        raise InvalidFawryRequestError, contract.errors.to_h if contract.failure?
+      end
+
+      def list_tokens_request_signature
+        Digest::SHA256.hexdigest("#{fawry_merchant_code}#{request_params[:customer_profile_id]}"\
+                                 "#{fawry_secure_key}")
+      end
+    end
+  end
+end

data/lib/fawry/requests/payment_status_request.rb

@@ -16,7 +16,7 @@ module Fawry
 
       def build_payment_status_request
         {
-          path: 'status',
+          path: 'payments/status',
           params: payment_status_request_transformed_params,
           body: {},
           options: options
@@ -36,11 +36,11 @@ module Fawry
       end
 
       def fawry_merchant_code
-        ENV.fetch('FAWRY_MERCHANT_CODE') { request_params[:merchant_code] }
+        Fawry.configuration.fawry_merchant_code || ENV.fetch('FAWRY_MERCHANT_CODE') { request_params[:merchant_code] }
       end
 
       def fawry_secure_key
-        ENV.fetch('FAWRY_SECURE_KEY') { request_params[:fawry_secure_key] }
+        Fawry.configuration.fawry_secure_key || ENV.fetch('FAWRY_SECURE_KEY') { request_params[:fawry_secure_key] }
       end
 
       def validate_payment_status_params!

data/lib/fawry/requests/refund_request.rb

@@ -16,7 +16,7 @@ module Fawry
 
       def build_refund_request
         {
-          path: 'refund',
+          path: 'payments/refund',
           params: {},
           body: refund_request_transformed_params,
           options: options
@@ -38,11 +38,11 @@ module Fawry
       end
 
       def fawry_merchant_code
-        ENV.fetch('FAWRY_MERCHANT_CODE') { request_params[:merchant_code] }
+        Fawry.configuration.fawry_merchant_code || ENV.fetch('FAWRY_MERCHANT_CODE') { request_params[:merchant_code] }
       end
 
       def fawry_secure_key
-        ENV.fetch('FAWRY_SECURE_KEY') { request_params[:fawry_secure_key] }
+        Fawry.configuration.fawry_secure_key || ENV.fetch('FAWRY_SECURE_KEY') { request_params[:fawry_secure_key] }
       end
 
       def validate_refund_params!

data/lib/fawry/utils.rb

@@ -2,6 +2,8 @@
 
 module Fawry
   module Utils
+    TRUTH_VALUES = [true, 'true', '1', 't'].freeze
+
     # Adds keys from fawry API response as methods
     # on object instance that return the value
     # of each key
@@ -17,7 +19,7 @@ module Fawry
     # fawry_res.status_code => 200
     # fawry_res.reference_number => 1234567
     def enrich_object(fawry_params)
-      fawry_params.keys.each do |key|
+      fawry_params.each_key do |key|
         method_name = key.to_s.split(/(?=[A-Z])/).map(&:downcase).join('_') # statusCode => status_code
         instance_variable_set("@#{method_name}", fawry_params[key])
         method_body = proc { instance_variable_get("@#{method_name}") }

data/lib/fawry/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fawry
-  VERSION = '1.0.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fawry
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.1
 platform: ruby
 authors:
-- Amr Bakry
-autorequire: 
+- Amr El Bakry
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-26 00:00:00.000000000 Z
+date: 2021-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-validation
@@ -65,9 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,23 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,58 +120,58 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.76.0
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.76.0
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.6
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.6
-description: 
+        version: '3.12'
+description:
 email:
-- amrrbakry17@gmail.com
+- amrr@hey.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
-- ".github/workflows/greetings.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- README-ar.md
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - fawry.gemspec
 - lib/fawry.rb
+- lib/fawry/config.rb
 - lib/fawry/connection.rb
 - lib/fawry/contracts/charge_request_contract.rb
+- lib/fawry/contracts/create_card_token_request_contract.rb
+- lib/fawry/contracts/delete_token_request_contract.rb
+- lib/fawry/contracts/list_tokens_request_contract.rb
 - lib/fawry/contracts/payment_status_request_contract.rb
 - lib/fawry/contracts/refund_request_contract.rb
 - lib/fawry/errors.rb
@@ -185,6 +179,9 @@ files:
 - lib/fawry/fawry_request.rb
 - lib/fawry/fawry_response.rb
 - lib/fawry/requests/charge_request.rb
+- lib/fawry/requests/create_card_token_request.rb
+- lib/fawry/requests/delete_token_request.rb
+- lib/fawry/requests/list_tokens_request.rb
 - lib/fawry/requests/payment_status_request.rb
 - lib/fawry/requests/refund_request.rb
 - lib/fawry/utils.rb
@@ -195,13 +192,13 @@ licenses:
 metadata:
   homepage_uri: https://github.com/amrrbakry/fawry
   source_code_uri: https://github.com/amrrbakry/fawry
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -210,8 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A library to interface with Fawry's payment gateway API (charge, refund,
   payment status, service callback).