lib/gitlab/request.rb in gitlab-3.0.0 vs lib/gitlab/request.rb in gitlab-3.1.0

@@ -1,15 +1,18 @@
 require 'httparty'
+require 'json'
 
 module Gitlab
   # @private
   class Request
     include HTTParty
     format :json
     headers 'Accept' => 'application/json'
     parser Proc.new { |body, _| parse(body) }
 
+    attr_accessor :private_token
+
     # Converts the response body to an ObjectifiedHash.
     def self.parse(body)
       body = decode(body)
 
       if body.is_a? Hash
@@ -29,23 +32,27 @@
         raise Error::Parsing.new "The response is not a valid JSON"
       end
     end
 
     def get(path, options={})
+      set_private_token_header(options)
       validate self.class.get(path, options)
     end
 
     def post(path, options={})
+      set_private_token_header(options, path)
       validate self.class.post(path, options)
     end
 
     def put(path, options={})
+      set_private_token_header(options)
       validate self.class.put(path, options)
     end
 
-    def delete(path)
-      validate self.class.delete(path)
+    def delete(path, options={})
+      set_private_token_header(options)
+      validate self.class.delete(path, options)
     end
 
     # Checks the response code for common errors.
     # Returns parsed response for successful requests.
     def validate(response)
@@ -63,20 +70,29 @@
 
       response.parsed_response
     end
 
     # Sets a base_uri and default_params for requests.
-    # @raise [Error::MissingCredentials] if endpoint or private_token not set.
+    # @raise [Error::MissingCredentials] if endpoint not set.
     def set_request_defaults(endpoint, private_token, sudo=nil)
       raise Error::MissingCredentials.new("Please set an endpoint to API") unless endpoint
-      raise Error::MissingCredentials.new("Please set a private_token for user") unless private_token
+      @private_token = private_token
 
       self.class.base_uri endpoint
-      self.class.default_params :private_token => private_token, :sudo => sudo
+      self.class.default_params :sudo => sudo
       self.class.default_params.delete(:sudo) if sudo.nil?
     end
 
     private
+
+    # Sets a PRIVATE-TOKEN header for requests.
+    # @raise [Error::MissingCredentials] if private_token not set.
+    def set_private_token_header(options, path=nil)
+      unless path == '/session'
+        raise Error::MissingCredentials.new("Please set a private_token for user") unless @private_token
+        options[:headers] = {'PRIVATE-TOKEN' => @private_token}
+      end
+    end
 
     def error_message(response)
       "Server responded with code #{response.code}, message: #{response.parsed_response.message}. " \
       "Request URI: #{response.request.base_uri}#{response.request.path}"
     end