Merge remote-tracking branch 'upstream/master'

Author: Unai Abrisketa

CHANGELOG.md

@@ -1,3 +1,8 @@
+### v0.18.1.pre
+
+* bug-fixes
+  * Prevent logging `code` and `refresh_token` on `/api/token` calls
+
 ### v0.18.0.pre
 
 * features

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    beyond_api (0.18.0.pre)
+    beyond_api (0.18.1.pre)
       faraday (~> 0.15)
 
 GEM

lib/beyond_api/connection.rb

@@ -26,8 +26,11 @@ def self.token
         faraday.options[:open_timeout] = BeyondApi.configuration.open_timeout.to_i
         faraday.options[:timeout] = BeyondApi.configuration.timeout.to_i
         faraday.response :logger, LOGGER, { headers: BeyondApi.configuration.log_headers,
-                                            bodies: BeyondApi.configuration.log_bodies }
-        faraday.headers["Accept"] = "application/json"
+                                            bodies: BeyondApi.configuration.log_bodies } do |logger|
+          logger.filter(/(code=)([a-zA-Z0-9]+)/, '\1[FILTERED]')
+          logger.filter(/(refresh_token=)([a-zA-Z0-9.\-\_]+)/, '\1[FILTERED]')
+        end
+        faraday.headers['Accept'] = 'application/json'
         faraday.adapter(:net_http)
         faraday.basic_auth(BeyondApi.configuration.client_id,
                            BeyondApi.configuration.client_secret)

lib/beyond_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BeyondApi
-  VERSION = "0.18.0.pre"
+  VERSION = "0.18.1.pre"
 end