request.rb in ribose-0.4.1

- old
+ new

@@ -1,7 +1,9 @@
 module Ribose
   class Request
+
+    DEFAULT_CONTENT_TYPE = "application/json"
     # Initialize a Request
     #
     # @param http_method [Symbol] HTTP verb as sysmbol
     # @param endpoint [String] The relative API endpoint
     # @param data [Hash] Attributes / Options as a Hash
@@ -22,10 +24,16 @@
     def request(options = {})
       parsable = extract_config_option(:parse) != false
       options[:query] = extract_config_option(:query) || {}
 
       response = agent.call(http_method, api_endpoint, data, options)
+
+      # update client headers from response
+      client.client_id    = response.headers['client']
+      client.uid          = response.headers['uid']
+      client.access_token = response.headers['access-token']
+
       parsable == true ? response.data : response
     end
 
     # Make a HTTP GET Request
     #
@@ -69,21 +77,27 @@
     private
 
     attr_reader :client, :data, :http_method
 
     def ribose_host
-      Ribose.configuration.api_host
+      Ribose.configuration.api_host.host
     end
 
     def extract_config_option(key)
       if data.is_a?(Hash)
         data.delete(key.to_sym)
       end
     end
 
     def find_suitable_client
-      client = extract_config_option(:client) || Ribose::Client.new
+      # client = extract_config_option(:client) || Ribose::Client.new
+      client = extract_config_option(:client) ||
+               Ribose::Client.from_login(
+                 email:     Ribose.configuration.user_email,
+                 password:  Ribose.configuration.user_password,
+                 api_token: Ribose.configuration.api_token
+               )
       client.is_a?(Ribose::Client) ? client : raise(Ribose::Unauthorized)
     end
 
     def require_auth_headers?
       extract_config_option(:auth_header) != false
@@ -99,13 +113,21 @@
         path: ["", @endpoint].join("/").squeeze("/"),
       )
     end
 
     def sawyer_options
+      faraday_options = { builder: custom_rack_builder }
+      unless Ribose.configuration.verify_ssl?
+        faraday_options.merge!(ssl: Faraday::SSLOptions.new(
+          false, nil, nil, OpenSSL::SSL::VERIFY_NONE
+          )
+        )
+      end
+
       {
         links_parser: Sawyer::LinkParsers::Simple.new,
-        faraday: Faraday.new(builder: custom_rack_builder),
+        faraday: Faraday.new(faraday_options),
       }
     end
 
     def custom_rack_builder
       Faraday::RackBuilder.new do |builder|
@@ -113,22 +135,26 @@
       end
     end
 
     def set_content_type(headers)
       header = custom_content_headers
-      default_type = "application/json"
 
-      headers[:content_type] = default_type
-      headers[:accept] = header.fetch(:accept, default_type)
+      headers[:content_type] = DEFAULT_CONTENT_TYPE
+      headers[:accept] = header.fetch(:accept, DEFAULT_CONTENT_TYPE)
     end
 
     def agent
       @agent ||= Sawyer::Agent.new(ribose_host, sawyer_options) do |http|
         set_content_type(http.headers)
 
+        # set headers for devise-token-auth
+        http.headers["access-token"] = client.access_token
+        http.headers["client"]       = client.client_id
+        http.headers["uid"]          = client.uid
+
         if require_auth_headers?
           http.headers["X-Indigo-Token"] = client.api_token
-          http.headers["X-Indigo-Email"] = client.user_email
+          http.headers["X-Indigo-Email"] = client.api_email
         end
       end
     end
   end
 end