From 77d089d9164f1ddd54ce038e03dec7b8752e9bf5 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Mon, 15 Apr 2019 09:21:52 +0200
Subject: [PATCH] Fix some rubocop issues
---
lib/passwordstate/client.rb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/passwordstate/client.rb b/lib/passwordstate/client.rb
index 5a99e45..b59d341 100644
--- a/lib/passwordstate/client.rb
+++ b/lib/passwordstate/client.rb
@@ -4,8 +4,8 @@ module Passwordstate
class Client
USER_AGENT = "RubyPasswordstate/#{Passwordstate::VERSION}".freeze
DEFAULT_HEADERS = {
- 'accept' => 'application/json',
- 'user-agent' => USER_AGENT
+ 'accept' => 'application/json',
+ 'user-agent' => USER_AGENT
}.freeze
attr_accessor :server_url, :auth_data, :headers, :validate_certificate
@@ -103,11 +103,13 @@ module Passwordstate
data = JSON.parse(res_obj.body) rescue nil
if data
return data if res_obj.is_a? Net::HTTPSuccess
+
data = data&.first
raise Passwordstate::HTTPError.new_by_code(res_obj.code, req_obj, res_obj, data&.fetch('errors', []) || [])
else
return res_obj.body if res_obj.is_a?(Net::HTTPSuccess) && options.fetch(:allow_html, true)
+
raise Passwordstate::HTTPError.new_by_code(res_obj.code, req_obj, res_obj, [{ 'message' => res_obj.body }])
end
end
@@ -144,6 +146,7 @@ module Passwordstate
logger.debug dir
return if http.body.nil?
+
clean_body = JSON.parse(http.body) rescue nil
if clean_body
clean_body = clean_body.each { |k, v| v.replace('[ REDACTED ]') if k.is_a?(String) && %w[password apikey].include?(k.downcase) }.to_json if http.body
--
GitLab