Merge branch 'master' of github.com:SecurableIO/Auth-Tool

Author: dfan14051

lib/auth_tool.rb

@@ -10,9 +10,10 @@ module AuthTool
   #   The client_secrets hash for the API
   #
   # @return [AuthTool::Client] The client.
-  def self.get_client client_secrets
+  def self.get_client(client_secrets, token =  {})
     raise "Expected Hash, received #{client_secrets.class}" if client_secrets.class != Hash
-    client = create_client(client_secrets)
+    client = create_client(client_secrets) if token == {}
+    client = create_client(client_secrets, token) if token != {}
     return client
   end
 
@@ -95,7 +96,12 @@ def self.call(client, http_verb, uri, params = {})
   #   Configuration options for the client.
   #
   # @return [AuthTool::Client] New client object
-  def self.create_client options
-    AuthTool::Client.new options
+  def self.create_client(options, *token)
+    
+    if token.length > 0
+      AuthTool::Client.new(options,token[0])
+    else 
+      AuthTool::Client.new(options)
+    end
   end
 end

lib/auth_tool/client.rb

@@ -19,6 +19,7 @@ def initialize(options, *args)
       self.params = config.delete('params') if @has_params
       if @oauth_version == 1
         oauth1 config
+        puts 'SSLDKJFKLSDJFKLSDJFKLDSJKLFJDSKLFJDSJFKLDSJFKLDSF'
         self.signet.token_credential_key = credentials["oauth_token"] if credentials.has_key? "oauth_token"
         self.signet.token_credential_secret = credentials["oauth_token_secret"] if credentials.has_key? "oauth_token_secret"
       elsif @oauth_version == 2

lib/auth_tool/oauth_1.rb

@@ -64,13 +64,13 @@ def self.call(client, http_verb = 'get', uri, params)
       body = params.delete('body') if params.has_key? 'body'
       conn = Faraday.new(:params => params)
       options = {:method => http_verb, :header => header, :body => body, :uri => uri, :connection => conn}
-      
+
       begin
         response = client.signet.fetch_protected_resource(options)
       rescue
         p 'fetch_protected_resource failed'
       end
-
+      
       return JSON.parse(response.body)
     end
   end