KRED-2061

handle array

Author: philiplambok-mekari

lib/xendit_api/client.rb

@@ -30,12 +30,10 @@ def initialize(authorization = nil, options = {})
 
         logger = find_logger(options[:logger])
         if logger
-          connection.response :logger, logger, { headers: false, bodies: true, errors: true } do |_log|
-            faraday.response :logger, {
-              full_hide_params: options[:filtered_logs] || [],
-              mask_params: options[:mask_params] || []
-            }, formatter: FaradayLogFormatter
-          end
+          connection.response :logger, logger,
+                              full_hide_params: options[:filtered_logs] || [],
+                              mask_params: options[:mask_params] || [],
+                              formatter: XenditApi::Middleware::FaradayLogFormatter
         end
         connection.use XenditApi::Middleware::HandleResponseException, logger
         connection.adapter Faraday.default_adapter

lib/xendit_api/json_masker.rb

@@ -20,13 +20,28 @@ def initialize(data, options = {})
     def to_hash
       return @data if @mask_params.empty? && @full_hide_params.empty?
 
-      filter(@data)
+      case @data
+      when Array
+        @data.map do |item|
+          if item.is_a?(Hash)
+            XenditApi::JsonMasker.new(item, @options).to_hash
+          else
+            item
+          end
+        end
+      when Hash
+        filter(@data)
+      else
+        @data
+      end
     end
 
     private
 
     # rubocop:disable Style/CaseLikeIf
     def filter(output)
+      return output unless output.is_a?(Hash)
+
       output.each do |key, value|
         output[key] = if value.is_a?(Hash)
                         XenditApi::JsonMasker.new(value, @options).to_hash

lib/xendit_api/middleware/faraday_log_formatter.rb

@@ -1,35 +1,42 @@
 require 'faraday/logging/formatter'
+require 'xendit_api/json_masker'
+require 'xendit_api/url_masker'
 
-class FaradayLogFormatter < Faraday::Logging::Formatter
-  MAX_LOG_SIZE = 10_000
+module XenditApi
+  module Middleware
+    class FaradayLogFormatter < Faraday::Logging::Formatter
+      MAX_LOG_SIZE = 10_000
 
-  def initialize(env = {})
-    @log_opts = env[:logger] || {}
-    super(logger: env[:logger], options: env[:options])
-  end
+      def initialize(env = {})
+        @logger = env[:logger]
+        @options = env[:options]
+        super(logger: env[:logger], options: env[:options])
+      end
 
-  def request(env)
-    masked_url = UrlMasker.mask(env[:url].to_s, @log_opts)
-    Rails.logger.info "#{env[:method].upcase} #{masked_url}"
-    return if env[:request_body].blank?
-    return if env[:request_body].size > MAX_LOG_SIZE
+      def request(env)
+        masked_url = XenditApi::UrlMasker.mask(env[:url].to_s, @options)
+        @logger.info "#{env[:method].upcase} #{masked_url}"
+        return if env[:request_body].to_s.empty?
+        return if env[:request_body].to_s.size > MAX_LOG_SIZE
 
-    message = {
-      body: JsonMasker.mask(env[:request_body], @log_opts)
-    }
-    Rails.logger.info({ request: message }.to_json)
-  end
+        message = {
+          body: XenditApi::JsonMasker.mask(env[:request_body], @options)
+        }
+        @logger.info({ request: message }.to_json)
+      end
 
-  def response(env)
-    return if env[:response_body].blank?
-    return if env[:request_body].to_s.size > MAX_LOG_SIZE
+      def response(env)
+        return if env[:response_body].to_s.empty?
+        return if env[:request_body].to_s.size > MAX_LOG_SIZE
 
-    message = {
-      status: env[:status],
-      body: JsonMasker.mask(env[:response_body], @log_opts)
-    }
-    Rails.logger.info({ response: message }.to_json)
-  end
+        message = {
+          status: env[:status],
+          body: XenditApi::JsonMasker.mask(env[:response_body], @options)
+        }
+        @logger.info({ response: message }.to_json)
+      end
 
-  def exception(exc); end
+      def exception(exc); end
+    end
+  end
 end

spec/xendit_api/json_masker_spec.rb

@@ -15,6 +15,42 @@
       expect(described_class.mask([], mask_params: %w[card_number expiration_date cvv name email], full_hide_params: %w[amount account_number])).to eq([])
     end
 
+    it 'returns expected when data is an array' do
+      parsed = [
+        {
+          card_number: '123456789012',
+          cvv: '123',
+          address: 'Jakarta',
+          email: 'hello@email.com'
+        },
+        {
+          card_number: '123456789012',
+          cvv: '123',
+          address: 'Jakarta',
+          email: 'hello@email.com'
+        }
+      ]
+
+      masked = [
+        {
+          'card_number' => '*****',
+          'cvv' => '*****',
+          'address' => 'Jakarta',
+          'email' => 'hel************'
+        },
+        {
+          'card_number' => '*****',
+          'cvv' => '*****',
+          'address' => 'Jakarta',
+          'email' => 'hel************'
+        }
+      ]
+
+      output = described_class.mask(parsed.to_json, mask_params: %w[email], full_hide_params: %w[card_number cvv])
+
+      expect(output).to eq(masked)
+    end
+
     it 'returns expected with valid JSON' do
       parsed = {
         card_number: '1234567890123456',