lib/pardot/http.rb in ruby-pardot-1.2.0 vs lib/pardot/http.rb in ruby-pardot-1.3.0
- old
+ new
@@ -2,11 +2,12 @@
module Http
def get object, path, params = {}, num_retries = 0
smooth_params object, params
full_path = fullpath object, path
- check_response self.class.get(full_path, :query => params)
+ headers = create_auth_header object
+ check_response self.class.get(full_path, :query => params, :headers => headers)
rescue Pardot::ExpiredApiKeyError => e
handle_expired_api_key :get, object, path, params, num_retries, e
rescue SocketError, Interrupt, EOFError, SystemCallError, Timeout::Error, MultiXml::ParseError => e
@@ -14,11 +15,12 @@
end
def post object, path, params = {}, num_retries = 0, bodyParams = {}
smooth_params object, params
full_path = fullpath object, path
- check_response self.class.post(full_path, :query => params, :body => bodyParams)
+ headers = create_auth_header object
+ check_response self.class.post(full_path, :query => params, :body => bodyParams, :headers => headers)
rescue Pardot::ExpiredApiKeyError => e
handle_expired_api_key :post, object, path, params, num_retries, e
rescue SocketError, Interrupt, EOFError, SystemCallError, Timeout::Error, MultiXml::ParseError => e
@@ -37,10 +39,15 @@
def smooth_params object, params
return if object == "login"
authenticate unless authenticated?
- params.merge! :user_key => @user_key, :api_key => @api_key, :format => @format
+ params.merge! :format => @format
+ end
+
+ def create_auth_header object
+ return if object == "login"
+ { :Authorization => "Pardot api_key=#{@api_key}, user_key=#{@user_key}" }
end
def check_response http_response
rsp = http_response["rsp"]