lib/sourcescrub/utils/request.rb in sourcescrub-0.0.4 vs lib/sourcescrub/utils/request.rb in sourcescrub-0.0.5

- old
+ new

@@ -1,10 +1,8 @@ # frozen_string_literal: true require 'faraday' -require 'faraday_middleware' -require 'logger' module Sourcescrub # Utils module Utils # Key Reminder @@ -26,16 +24,13 @@ headers: headers, request: { timeout: 10, open_timeout: 5 } - ) do |faraday| - faraday.response :json - faraday.response :logger, ::Logger.new(STDOUT), bodies: true if debug_mode? - end.get(uri, *args) + ).get(uri, *args) - response_body = response.body + response_body = JSON.parse(response.body) if response.status == 200 response_body = {} if response_body.is_a?(Array) && response_body.empty? return response_body.merge('headers' => response.headers) end @@ -87,18 +82,14 @@ url: TOKEN_URL, headers: { 'Content-Type' => 'application/x-www-form-urlencoded', 'Authorization' => Sourcescrub.account.basic } - ) do |faraday| - faraday.adapter Faraday.default_adapter - faraday.response :json - faraday.response :logger, ::Logger.new(STDOUT), bodies: true if debug_mode? - end.post(TOKEN_URI, body) + ).post(TOKEN_URI, body) raise 'Sourcescrub error: Service Unavailable' unless response.status == 200 - @token = response.body['access_token'] + @token = JSON.parse(response.body)['access_token'] end private def debug_mode?