rma-payment-gateway 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93083bc4a39780d2b7387e013edf0e71d01bcdd128582383c0805edf8173f461
-  data.tar.gz: 1dbea3526aed562579e070a1cc99470be1ff94d76bce1c2f6fd8780c6b033bbf
+  metadata.gz: 7e2093f132f0620f9d9455eae15c1d2b4b2a7eb31fc4cfab608fe0244683c50b
+  data.tar.gz: e62e9cef18f17683d4eb208f56dc09ca8d3991fa7ce7471f73dc93672d6854b0
 SHA512:
-  metadata.gz: f9f2d09bf865b4b4575fc18e54f990e98cd13f732c53a337a78ccbcc9ae8de7a94cdd9ac52a2b0a91a3191d803672bcd9d6e1fb4464cf883e3c3bd445c3d0f51
-  data.tar.gz: 94d79e7619c070b68d7e29704d27bcc2e6bfca44dd745801e1be6b63ea8220e9bc24629eb4212971364d41268a2f1fb68d5b251f96ba435fef8c05e1c32b59de
+  metadata.gz: '0699e0a7456ca06ebac7a52e187b58aab1cab83ebf0cf835c10d78aa6d42891fba070094ade6ddc3d46b91d3780dd4a50783ae77fa8b83e250250a90bd3fb956'
+  data.tar.gz: '088a8cc8091ddbbde76bf65ea34ed473e6f51a4f4a64aedbb7d0b26801a70f20a21e5cc74c24c2091d4aad87bf297e4469a0cf231838435ef3c57d20463e6f42'

data/lib/rma/payment/gateway/account_inquiry.rb

@@ -33,7 +33,7 @@ module Rma
 
           validate_account_inquiry_response!(response)
 
-          response["result"]
+          response
         rescue StandardError => e
           raise AuthenticationError, "Failed to fetch account inquiry: #{e.message}"
         end
@@ -41,27 +41,20 @@ module Rma
         private
 
         def account_inquiry_request_body
-          params = {
+          {
             bfs_bfsTxnId: transaction_id,
             bfs_remitterBankId: bank_id,
             bfs_remitterAccNo: account_no,
             bfs_benfId: client.config.beneficiary_id,
             bfs_msgType: "AE"
           }
-
-          # Convert to URL-encoded format
-          URI.encode_www_form(params)
         end
 
         def validate_account_inquiry_response!(response)
-          unless response.is_a?(Hash) && response["result"]["bfs_responseCode"] == "00"
-            error_detail = response["result"]["bfs_responseDesc"] || "Unknown error"
+          unless response.is_a?(Hash) && response["bfs_responseCode"] == "00"
+            error_detail = response["bfs_responseDesc"] || "Unknown error"
             raise AuthenticationError, "Account inquiry failed: #{error_detail}"
           end
-
-          return if response["result"]
-
-          raise AuthenticationError, "No response data in response"
         end
       end
     end

data/lib/rma/payment/gateway/authorization.rb

@@ -32,7 +32,7 @@ module Rma
 
           validate_authorization_response!(response)
 
-          response["result"]
+          response
         rescue StandardError => e
           raise AuthenticationError, "Failed to authorize: #{e.message}"
         end
@@ -40,7 +40,7 @@ module Rma
         private
 
         def authorization_request_body
-          params = {
+          {
             bfs_benfTxnTime: Utils.generate_timestamp,
             bfs_orderNo: order_no,
             bfs_benfBankCode: "01",
@@ -52,9 +52,6 @@ module Rma
             bfs_msgType: "AR",
             bfs_version: "5.0"
           }
-
-          # Convert to URL-encoded format
-          URI.encode_www_form(params)
         end
 
         def validate_authorization_request!
@@ -65,14 +62,10 @@ module Rma
         end
 
         def validate_authorization_response!(response)
-          unless response.is_a?(Hash) && response["result"]["bfs_responseCode"] == "00"
-            error_detail = response["result"]["bfs_responseDesc"] || "Unknown error"
+          unless response.is_a?(Hash) && response["bfs_responseCode"] == "00"
+            error_detail = response["bfs_responseDesc"] || "Unknown error"
             raise AuthenticationError, "Authorization failed: #{error_detail}"
           end
-
-          return if response["result"]
-
-          raise AuthenticationError, "No response data in response"
         end
       end
     end

data/lib/rma/payment/gateway/client.rb

@@ -2,6 +2,7 @@
 
 require "faraday"
 require "json"
+require "openssl"
 
 module Rma
   module Payment
@@ -17,13 +18,17 @@ module Rma
       #
       # @param config [Rma::Payment::Gateway::Configuration] Configuration instance
       class Client
-        attr_reader :config, :access_token, :private_key
+        attr_reader :config, :access_token
 
         def initialize(config = nil)
           @config = config || Rma::Payment::Gateway.configuration
           validate_configuration!
         end
 
+        def private_key
+          @private_key ||= load_private_key
+        end
+
         # Authorization methods
         def authorization
           @authorization ||= Authorization.new(self)
@@ -41,7 +46,8 @@ module Rma
 
         # HTTP request methods
         def post(body: {}, headers: {})
-          request(:post, body: body, headers: headers)
+          signed = body.empty? ? body : body.merge(bfs_checkSum: compute_checksum(body))
+          request(:post, body: signed, headers: headers)
         end
 
         def get(headers: {})
@@ -50,6 +56,23 @@ module Rma
 
         private
 
+        def compute_checksum(params)
+          sorted_values = params.sort_by { |k, _| k }.to_h.values.join("|")
+          signature = private_key.sign(OpenSSL::Digest.new("SHA1"), sorted_values)
+          signature.unpack1("H*")&.upcase
+        end
+
+        def load_private_key
+          key_content = if !config.rsa_key_path.to_s.strip.empty?
+                          File.read(config.rsa_key_path)
+                        else
+                          config.rsa_key
+                        end
+          OpenSSL::PKey::RSA.new(key_content)
+        rescue OpenSSL::PKey::RSAError => e
+          raise ConfigurationError, "Invalid RSA key: #{e.message}"
+        end
+
         def validate_configuration!
           raise ConfigurationError, "Configuration is required" if config.nil?
           return if config.valid?
@@ -72,7 +95,7 @@ module Rma
         def connection
           @connection ||= Faraday.new(url: config.base_url) do |conn|
             conn.request :url_encoded
-            conn.response :json, content_type: /\bjson$/
+            conn.response :json
             conn.adapter Faraday.default_adapter
             conn.options.timeout = config.timeout
             conn.options.open_timeout = config.open_timeout
@@ -87,7 +110,7 @@ module Rma
         def handle_response(response)
           case response.status
           when 200..299
-            response.body
+            parse_body(response.body)
           when 400..499
             handle_client_error(response)
           when 500..599
@@ -98,25 +121,32 @@ module Rma
         end
 
         def handle_client_error(response)
-          body = response.body || {}
-          error_message = body["result"]["bfs_responseDesc"] || "Client error"
-
-          raise InvalidParameterError.new(
-            error_message,
-            response_code: body["result"]["bfs_responseCode"],
-            response_detail: body["result"]["bfs_responseDesc"]
-          )
+          body = parse_body(response.body) || {}
+          error_message = body["bfs_responseDesc"] || "Client error"
+          raise InvalidParameterError, error_message
         end
 
         def handle_server_error(response)
-          body = response.body || {}
-          error_message = body["result"]["bfs_responseDesc"] || "Server error"
-
-          raise APIError.new(
-            error_message,
-            response_code: body["result"]["bfs_responseCode"],
-            response_description: body["result"]["bfs_responseDesc"]
-          )
+          body = parse_body(response.body) || {}
+          error_message = body["bfs_responseDesc"] || "Server error"
+          raise APIError, error_message
+        end
+
+        def parse_body(body)
+          return body if body.is_a?(Hash)
+          return {} if body.nil? || body.empty?
+
+          begin
+            return JSON.parse(body)
+          rescue JSON::ParserError
+            # Not JSON, fall through to URL-encoded parsing
+          end
+
+          parse_url_encoded(body)
+        end
+
+        def parse_url_encoded(query_string)
+          Rack::Utils.parse_nested_query(query_string)
         end
       end
     end

data/lib/rma/payment/gateway/debit_request.rb

@@ -30,7 +30,7 @@ module Rma
 
           validate_debit_request_response!(response)
 
-          response["result"]
+          response
         rescue StandardError => e
           raise AuthenticationError, "Failed to fetch debit request: #{e.message}"
         end
@@ -38,26 +38,19 @@ module Rma
         private
 
         def debit_request_body
-          params = {
+          {
             bfs_bfsTxnId: transaction_id,
             bfs_remitterOtp: otp,
             bfs_benfId: client.config.beneficiary_id,
             bfs_msgType: "DR"
           }
-
-          # Convert to URL-encoded format
-          URI.encode_www_form(params)
         end
 
         def validate_debit_request_response!(response)
-          unless response.is_a?(Hash) && response["result"]["bfs_responseCode"] == "00"
-            error_detail = response["result"]["bfs_responseDesc"] || "Unknown error"
+          unless response.is_a?(Hash) && response["bfs_responseCode"] == "00"
+            error_detail = response["bfs_responseDesc"] || "Unknown error"
             raise AuthenticationError, "Debit request failed: #{error_detail}"
           end
-
-          return if response["result"]
-
-          raise AuthenticationError, "No response data in response"
         end
       end
     end

data/lib/rma/payment/gateway/utils.rb

@@ -21,7 +21,7 @@ module Rma
           return false if account_number.nil? || account_number.empty?
 
           # Account numbers should be numeric and between 8-15 digits
-          account_number.to_s.match?(/^\d{8,15}$/)
+          account_number.to_s.match?(/^\d{8,40}$/)
         end
 
         # Validate phone number format (Bhutan)
@@ -49,7 +49,7 @@ module Rma
         def self.valid_amount?(amount)
           return false if amount.nil?
 
-          amount.is_a?(Numeric) && amount >= 0
+          amount.is_a?(Numeric) && amount > 0
         end
 
         # Format amount to 2 decimal places

data/lib/rma/payment/gateway/version.rb

@@ -3,7 +3,7 @@
 module Rma
   module Payment
     module Gateway
-      VERSION = "1.0.1"
+      VERSION = "1.0.3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rma-payment-gateway
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Tashi Dendup