diff --git a/app/services/trace/client_service.rb b/app/services/trace/client_service.rb index df9a4321a..298c2cf0f 100644 --- a/app/services/trace/client_service.rb +++ b/app/services/trace/client_service.rb @@ -2,20 +2,14 @@ class Trace::ClientService < ApplicationService def post(url, params={}) puts "[trace][POST] request params: #{params}" - conn.post do |req| - req.url full_url(url) - req.body = params[:data].to_json - end + conn.post(full_url(url), params[:data]) end def authed_post(token, url, params={}) puts "[trace][POST] request params: #{params}" puts "[trace][POST] request token: #{token}" - conn.post do |req| - req.url full_url(url) - req.body = params[:data].to_json - req.headers['Authorization'] = token - end + conn.headers['Authorization'] = token + conn.post(full_url(url), params[:data]) end def get(url, params={}) @@ -42,67 +36,43 @@ class Trace::ClientService < ApplicationService def delete(url, params={}) puts "[trace][DELETE] request params: #{params}" - conn.delete do |req| - req.url full_url(url) - req.body = params[:data].to_json - end + conn.delete(full_url(url), params[:data]) end def authed_delete(token, url, params={}) puts "[trace][DELETE] request params: #{params}" puts "[trace][DELETE] request token: #{token}" - conn.delete do |req| - req.url full_url(url) - req.body = params[:data].to_json - req.headers['Authorization'] = token - end + conn.headers['Authorization'] = token + conn.delete(full_url(url), params[:data]) end def patch(url, params={}) puts "[trace][PATCH] request params: #{params}" - conn.patch do |req| - req.url full_url(url) - req.body = params[:data].to_json - end + conn.patch(full_url(url), params[:data]) end def authed_patch(token, url, params={}) puts "[trace][PATCH] request params: #{params}" puts "[trace][PATCH] request token: #{token}" - conn.patch do |req| - req.url full_url(url) - req.body = params[:data].to_json - req.headers['Authorization'] = token - end + conn.headers['Authorization'] = token + conn.patch(full_url(url), params[:data]) end def put(url, params={}) puts "[trace][PUT] request params: #{params}" - conn.put do |req| - req.url full_url(url) - req.body = params[:data].to_json - end + conn.put(full_url(url), params[:data]) end def authed_put(token, url, params={}) puts "[trace][PUT] request params: #{params}" puts "[trace][PUT] request token: #{token}" - conn.put do |req| - req.url full_url(url) - req.body = params[:data].to_json - req.headers['Authorization'] = token - end + conn.headers['Authorization'] = token + conn.put(full_url(url), params[:data]) end private def conn - @client ||= begin - Faraday.new(url: domain) do |req| - req.request :url_encoded - req.headers['Content-Type'] = 'application/json' - req.adapter Faraday.default_adapter - end - end + @client ||= Faraday.new(url: domain) @client end