adsk_auth_service 1.0.22 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 993d4581e6e33c6469b150cd01f95a28838be237
-  data.tar.gz: f8dc565743b01e6311cb581d8d76fea215f1ce35
+  metadata.gz: 3831bc4e5b1f8295d772bcddbdaa8a05586b8a6a
+  data.tar.gz: 873d24eb28f728615f3e8906dd168eaeaffe2ea7
 SHA512:
-  metadata.gz: 5c529dbe99e75bce63603bdef52403405666991cc5b0d411adf28164c10783ae9e7bf3eb93757fe7d23ed72d2bbf68e11a344ce5857079f01144a24d5a155347
-  data.tar.gz: d287457273e32fc46809579cee347fcf3eeaf712543e343cf6e3d4a6bbd814eddac80a8a1bb25400df6299419c6cbbea66c786ead3a9d0a55f604c2e09de82d3
+  metadata.gz: 97bc45d30d1ba40da1c77dfb915982a7275acab6e45f4fef106f426bc8b3da3119fa1f03bdfc222c5bd87f7c67f63df61fe01233bf3097b760219c6409b148a4
+  data.tar.gz: c1cedc98cbd4dd56bc6efed8b6a2ef0a56bd10106b54723471b9f94e81353d0572f980bf86bd6eb9f52b70ff88e749e233e2c70cdb7c1e5221cc6086c144231d

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'rspec'
-gem 'config_service'
+gem 'config_service'
+gem 'faraday'

data/adsk_auth_service.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'adsk_auth_service'
-  s.version     = '1.0.22'
+  s.version     = '1.0.23'
   s.summary     = "Autodesk second phase token retrieval"
   s.description = "A gem for Autodesk 2-phase authentication service."
   s.authors     = ['Linh Chau']
@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/linhchauatl/adsk_auth_service'
   s.license     = 'MIT'
   s.add_runtime_dependency 'config_service'
+  s.add_runtime_dependency 'faraday'
 
   s.add_development_dependency 'rspec', '~> 3.1'
 end

data/lib/services/auth_service.rb

@@ -25,7 +25,7 @@ class AuthService
         NetUtil.call_webservices(url,
           'post',
           "client_id=#{key}&client_secret=#{secret}&grant_type=client_credentials", 
-          { headers: {'Content-Type' => 'application/x-www-form-urlencoded'} }).body
+          { headers: {'Content-Type' => 'application/x-www-form-urlencoded', 'grant_type' => 'client_credentials'} }).body
       )
     end
 

data/lib/utils/net_util.rb

@@ -1,89 +1,94 @@
 require 'net/https'
 require 'active_support'
+require 'faraday'
 
 class NetUtil
   READ_TIMEOUT = 600 # 10 minutes
   RETRY_TIMES = 3
   WAIT_TIME = 5 # Wait for 5 seconds before retry
   
+  class << self
   
-  # This method performs GET, PUT and POST requests to web services
-  # Call it like this:
-  # response = NetUtil.call_web_services(url)  <= This will perform a GET, with url provided by the caller
-  # response = NetUtil.call_web_services(url, 'post', doc) <= This will perform a POST, doc is the data to post, can be REXML::Document or XML String
-  # In the case of GET,  the returned XML data is 'response'
-  # In the case of POST and PUT, the returned XML data is 'response.body'
-  def NetUtil.call_webservices(url, method_name = 'get', data = '', options = { headers: {'Content-Type' => 'application/json'} })
-    method_name = method_name.to_s.downcase
-    try_time = 0
-    begin
-      NetUtil.send("do_#{method_name}", {url: url, data: data}.merge(options))
-    rescue StandardError => error
-      try_time += 1
-      if try_time > RETRY_TIMES
-        puts ("\n#{Time.now} Unrecoverable error in NetUtil.call_webservices: "\
-                                   "#{error}\n#{error.backtrace.join("\n")}\n")
-        # It is an unrecoverable error, throw the exception back, don't suppress it.
-        raise "Unrecoverable error calling web services.\nURL: #{url}.\nError message: #{error.message}." 
+    # This method performs GET, PUT and POST requests to web services
+    # Call it like this:
+    # response = NetUtil.call_web_services(url)  <= This will perform a GET, with url provided by the caller
+    # response = NetUtil.call_web_services(url, 'post', doc) <= This will perform a POST, doc is the data to post, can be REXML::Document or XML String
+    # In the case of GET,  the returned XML data is 'response'
+    # In the case of POST and PUT, the returned XML data is 'response.body'
+    def call_webservices(url, method_name = 'get', data = '', options = { headers: {'Content-Type' => 'application/json'} })
+      method_name = method_name.to_s.downcase
+      try_time = 0
+      begin
+        NetUtil.send("do_#{method_name}", {url: url, data: data}.merge(options))
+      rescue StandardError => error
+        try_time += 1
+        if try_time > RETRY_TIMES
+          puts ("\n#{Time.now} Unrecoverable error in NetUtil.call_webservices: "\
+                                     "#{error}\n#{error.backtrace.join("\n")}\n")
+          # It is an unrecoverable error, throw the exception back, don't suppress it.
+          raise "Unrecoverable error calling web services.\nURL: #{url}.\nError message: #{error.message}." 
+        end
+        
+        puts ("NetUtil.call_webservices #{url}:\nError happens: #{error}. Try #{try_time} time(s).")
+        sleep(WAIT_TIME)
+        retry
+      end
+    end
+    
+    def do_get(options)
+      do_get_headers = build_header(options)
+      params     = options[:params] || {}
+      do_get_url = options[:url]
+      do_get_uri = URI.parse(do_get_url)
+      conn = Faraday.new(:url => do_get_url) do |faraday|
+        faraday.adapter  Faraday.default_adapter 
       end
       
-      puts ("NetUtil.call_webservices #{url}:\nError happens: #{error}. Try #{try_time} time(s).")
-      sleep(WAIT_TIME)
-      retry
+      response = conn.get do |req|
+        req.url do_get_uri.path, params
+        do_get_headers.each { |key, value| req.headers[key] = value}
+      end
     end
-  end
-  
-  def NetUtil.do_get(options)
-    # headers   = {'Content-Type' => 'text/xml'}
-    headers   = build_header(options)
-    url       = options[:url]
-    uri       = URI.parse(url)
-    req       = Net::HTTP.new(uri.host, uri.port)
-    req = set_ssl(req, url)
-    response = req.request_get(uri.path, headers)
-    return response.body
-  end
-  
-  def NetUtil.do_post(options)
-    run_p(options, 'post')
-  end
-  
-  def NetUtil.do_put(options)
-    run_p(options, 'put')
-  end
-  
-  
-  def NetUtil.run_p(options, method_name)
-    data = options[:data].to_s
     
-    headers   = build_header(options)
-    url       = options[:url]
-    uri       = URI.parse(url)
-    req       = Net::HTTP.new(uri.host, uri.port)
-    req       = set_ssl(req, url)
+    def do_post(options)
+      run_p(options, :post)
+    end
     
-    req.read_timeout  = READ_TIMEOUT
-    req.open_timeout  = READ_TIMEOUT
+    def do_put(options)
+      run_p(options, :put)
+    end
     
-    response, body   = req.send(method_name, uri.path, data, headers)
     
-    return response
-  end
-  
-  def NetUtil.build_header(options)
-    headers = (options[:headers] || { 'Content-Type' => 'application/json' }).dup
-    conntent_type = ( headers['Content-Type'].nil? )? 'application/json' : headers['Content-Type']
-    headers.delete('Content-Type')
-    {'Content-Type' => conntent_type}.merge(headers)
+    def run_p(options, method_name)
+      data = options[:data].to_s
+      
+      headers   = build_header(options)
+      url       = options[:url]
+      uri       = URI.parse(url)
+      req       = Net::HTTP.new(uri.host, uri.port)
+      req       = set_ssl(req, url)
+      
+      req.read_timeout  = READ_TIMEOUT
+      req.open_timeout  = READ_TIMEOUT
+      
+      return req.send(method_name, uri.path, data, headers)
+    end
+    
+    def build_header(options)
+      headers = (options[:headers] || { 'Content-Type' => 'application/json' }).dup
+      conntent_type = ( headers['Content-Type'].nil? )? 'application/json' : headers['Content-Type']
+      headers.delete('Content-Type')
+      {'Content-Type' => conntent_type}.merge(headers)
 
-  end
+    end
 
-  def NetUtil.set_ssl(request, url)
-    if url.start_with? 'https'
-      request.use_ssl = true 
-      request.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    def set_ssl(request, url)
+      if url.start_with? 'https'
+        request.use_ssl = true 
+        request.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+      request
     end
-    request
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adsk_auth_service
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors:
 - Linh Chau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: config_service
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement