analytics-psw 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd280c2c3f9b9ca6dbb9deece3998f3bccf748f8
-  data.tar.gz: da2ade09287d2bacbe5a3436c46a1169571c61b4
+  metadata.gz: 53f493ce435433361a616d0b779a87d335616a2b
+  data.tar.gz: 128a17668f84edeb98f19cc37a249641043a12dd
 SHA512:
-  metadata.gz: 2d71d2c479aa0eaad9c3cf4b0f7ab8a2f15a1eb262742c738b54de3a0708778c0bf377826b5c6817448a4dd4089e7f2c8829944c9f29861c7efb304ea32f7579
-  data.tar.gz: 03e673c04dbaf3215a23f746ab41676788259397851f01693fa4ef5472a81b8db47b89686da0071bd8219ea64817a713e7ec7c17c8884adce0373eab0c826723
+  metadata.gz: 1ea406d43608bf5910d4b5b2ddbfb608d2638247a8297c9dbda440883180829b0b14c001abb68abc14a27ab28df81c5539abfad2534712c424d93b8c4104d285
+  data.tar.gz: d151d52b9a8bdb9558eb5b0d0bde63a5e589ec30825fabd63447611bbdc78dafae851fb190ffd32103e5826a4709f4a2c4f79e9808306aa81b328749aa873dd5

data/lib/analytics-psw/utilities.rb

@@ -4,30 +4,39 @@ module AnalyticsPSW
 
     def update_token
       @expires = nil
-      url = "#{@server_url}/oauth/token?client_id=#{@client_id}&client_secret=#{@client_secret}"
-      token_response = http_request(:post, url)
-      @token = token_response['body']['access_token']
-      @expires = Time.now + token_response['body']['expires_in']
+      response = @conn.post do |request|
+        request.url "#{@server_url}/oauth/token?client_id=#{@client_id}&client_secret=#{@client_secret}"
+        request.headers['Content-Type'] = 'application/json'
+      end
+      if response['body'].present?
+        @token = response['body']['access_token']
+        @expires = Time.now + response['body']['expires_in']
+      end
     end
 
     def faraday_connection
       @proxy ? Faraday.new(@server_url, {proxy: {uri: @proxy}}) : Faraday.new(@server_url)
     end
 
-    def http_request(http_method, url, params = nil, body = nil)
-      update_token if @expires and Time.now > @expires
-      json_block  = ->(req) do
-        req.url url
-        req.headers['Content-Type'] = 'application/json'
-        req.headers['Authorization']= "Bearer #{@token}" if @token
-        req.params = params if params
-        req.body = body if body
+    def http_request(http_method, url, params = nil, body = nil, retries = 2)
+      while retries > 0
+        json_block  = ->(req) do
+          req.url url
+          req.headers['Content-Type'] = 'application/json'
+          req.headers['Authorization']= "Bearer #{@token}" if @token
+          req.params = params if params
+          req.body = body if body
+        end
+        response = parse_json_response(@conn.send(http_method, &json_block))
+        break if [200, 201, 202].include?(response['status'])
+        update_token if response['status'] == 401
+        retries -= 1
       end
-      parse_json_response(@conn.send(http_method, &json_block))
+      response
     end
-
+    
     def multi_get_json(service_location, query_parameters)
-      update_token if @expires and Time.now > @expires
+      update_token if need_token_update?
       results = []
       EventMachine.run do
         multi = EventMachine::MultiRequest.new
@@ -83,6 +92,9 @@ module AnalyticsPSW
       end
       parsed_response
     end
-
+    
+    def need_token_update?
+      (@client_id and @client_secret and @expires.nil?) or (@expires and Time.now > @expires)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: analytics-psw
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Lexmark International Technology S.A