adsk_auth_service 1.0.23 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3831bc4e5b1f8295d772bcddbdaa8a05586b8a6a
-  data.tar.gz: 873d24eb28f728615f3e8906dd168eaeaffe2ea7
+  metadata.gz: 907324dac0c36867e32fd63368528a56726fed22
+  data.tar.gz: ab1484824bcd901561a394216db9a5801d052921
 SHA512:
-  metadata.gz: 97bc45d30d1ba40da1c77dfb915982a7275acab6e45f4fef106f426bc8b3da3119fa1f03bdfc222c5bd87f7c67f63df61fe01233bf3097b760219c6409b148a4
-  data.tar.gz: c1cedc98cbd4dd56bc6efed8b6a2ef0a56bd10106b54723471b9f94e81353d0572f980bf86bd6eb9f52b70ff88e749e233e2c70cdb7c1e5221cc6086c144231d
+  metadata.gz: 79e733a19761c1baa179e23ea395b98890b1256af54d6ef6d428c95ffe6551e9847fb9234808c17f52d0909e60bed71947111efe1ee506fb77a0946a91da87f1
+  data.tar.gz: b0e3e5b534412deb91c46dcd17a805657050fe8c77c83aee44835a1d3ef5c7a0d44933d8c377727d615fd005d11a794f0359a0d8a01144fd5bc62a576a66efb2

data/Gemfile

@@ -1,5 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'rspec'
 gem 'config_service'
-gem 'faraday'
+gem 'rest-client'
+
+group :test do
+  gem 'rspec'
+end

data/adsk_auth_service.gemspec

@@ -1,20 +1,19 @@
 Gem::Specification.new do |s|
   s.name        = 'adsk_auth_service'
-  s.version     = '1.0.23'
+  s.version     = '1.1.0'
   s.summary     = "Autodesk second phase token retrieval"
   s.description = "A gem for Autodesk 2-phase authentication service."
   s.authors     = ['Linh Chau']
   s.email       = 'chauhonglinh@gmail.com'
   s.files       = [
-                    './Gemfile', './adsk_auth_service.gemspec', 
+                    './Gemfile', './adsk_auth_service.gemspec',
                     'lib/adsk_auth_service.rb',
-                    'lib/services/auth_service.rb',
-                    'lib/utils/net_util.rb',
+                    'lib/services/auth_service.rb'
                   ]
   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_runtime_dependency 'rest-client'
 
   s.add_development_dependency 'rspec', '~> 3.1'
 end

data/lib/adsk_auth_service.rb

@@ -10,7 +10,7 @@ rescue Exception => error
 end
 
 
-['services', 'utils'].each do |sub_path|
+['services'].each do |sub_path|
   load_gem_lib(sub_path)
   rb_files =  Dir.glob("#{File.expand_path('.')}/lib/#{sub_path}/*.rb")
   rb_files.each { |rb_file| require rb_file }

data/lib/services/auth_service.rb

@@ -1,11 +1,11 @@
 require 'active_support'
 require 'active_support/core_ext'
-require_relative '../utils/net_util'
+require 'rest-client'
 
 class AuthService
   class << self
     def load_config
-      @@config ||= ConfigService.load_config('auth_keys.yml')[ConfigService.environment] rescue {}
+      @@config ||= ConfigService.load_config('auth_keys.yml')[ConfigService.environment]
     end
 
     def set_config(options = {})
@@ -20,16 +20,13 @@ class AuthService
       url     = options['url']              || @@config['url']
       key     = options['consumer_key']     || @@config['consumer_key']
       secret  = options['consumer_secret']  || @@config['consumer_secret']
-
-      ActiveSupport::JSON.decode(
-        NetUtil.call_webservices(url,
-          'post',
-          "client_id=#{key}&client_secret=#{secret}&grant_type=client_credentials", 
-          { headers: {'Content-Type' => 'application/x-www-form-urlencoded', 'grant_type' => 'client_credentials'} }).body
-      )
+      response = RestClient.post(url,
+                                "client_id=#{key}&client_secret=#{secret}&grant_type=client_credentials",
+                                 {'Content-Type' => 'application/x-www-form-urlencoded', 'grant_type' => 'client_credentials'} )
+      JSON.parse(response)
     end
 
   end
 
   load_config
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adsk_auth_service
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.1.0
 platform: ruby
 authors:
 - Linh Chau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: config_service
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -62,7 +62,6 @@ files:
 - "./adsk_auth_service.gemspec"
 - lib/adsk_auth_service.rb
 - lib/services/auth_service.rb
-- lib/utils/net_util.rb
 homepage: https://github.com/linhchauatl/adsk_auth_service
 licenses:
 - MIT
@@ -83,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Autodesk second phase token retrieval

data/lib/utils/net_util.rb

@@ -1,95 +0,0 @@
-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 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
-      
-      response = conn.get do |req|
-        req.url do_get_uri.path, params
-        do_get_headers.each { |key, value| req.headers[key] = value}
-      end
-    end
-    
-    def do_post(options)
-      run_p(options, :post)
-    end
-    
-    def do_put(options)
-      run_p(options, :put)
-    end
-    
-    
-    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
-
-    def set_ssl(request, url)
-      if url.start_with? 'https'
-        request.use_ssl = true 
-        request.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      request
-    end
-  end
-end
-
-