zuora_connect 1.5.13 → 1.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4aa843cfaaa52510961165dff8cd70413c0be92
-  data.tar.gz: 4d030a6e5ab5373f13486ed26f6904083b57286f
+  metadata.gz: b73f9738a5746908f0cbf6db3bd327b69980e0f6
+  data.tar.gz: 8abe423e467c692445c180a108def67225ebf21e
 SHA512:
-  metadata.gz: b2e6b09882b99450c5724c58091ab59f9b43e7fcf036c413a3354497973685544afaadf8ad23125e5f242c91175292df9865c46a95cee71df458bcc6c373e20a
-  data.tar.gz: b8d01e503b830326b5a5496fe426587e90aceb8ec662ec5044548b7fa80b0be8a3562ae179ea357e60e72f1dd5dea7256ab4984998d70a79d4983dfc30b516c8
+  metadata.gz: c491398a80320a9ed09625b0f0809642ed2c9898c24e8c890858103849cb6b131ba55e746e8f35bcdeba0c89c302cd531ae49348b7d784ac5ea30b2e24e22c9b
+  data.tar.gz: 1457f3288b2ebd62ab6675b211b89006a3e79cde2323da9fde9b1bc9cd5851a2ec3b90a1bbaef183c57189e46a14b8c5c11c966ca6e3f442fc9c2bc1a40224dc

data/app/models/zuora_connect/app_instance_base.rb

@@ -8,6 +8,7 @@ module ZuoraConnect
     def init
       @options = Hash.new
       @logins = Hash.new
+      @api_version = "v2"
       self.attr_builder("timezone", ZuoraConnect.configuration.default_time_zone)
       self.attr_builder("locale", ZuoraConnect.configuration.default_locale)
       PaperTrail.whodunnit = "Backend" if defined?(PaperTrail)
@@ -396,6 +397,8 @@ module ZuoraConnect
 
     def updateOption(optionId, value)
       if self.access_token && self.refresh_token
+        #Refresh token if already expired
+        self.refresh_oauth if self.oauth_expired?
         return HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/application_options/#{optionId}/edit?value=#{value}",:body => {:access_token => self.username})
       else
         return false
@@ -408,6 +411,9 @@ module ZuoraConnect
     #This can add a new login
     #This can change to another existing login
     def update_logins(options)
+      #Refresh token if already expired
+      self.refresh_oauth if self.oauth_expired?
+
       count ||= 0
       response = HTTParty.post(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}/logins",:body => {:access_token => self.username}.merge(options))
       if response.code == 200
@@ -416,15 +422,16 @@ module ZuoraConnect
         raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
       end
     rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError
-      if (count += 1) < 2
+      if (count += 1) < 3
         retry
       else
         raise
       end
     rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
-      if count < 2 && ex.code == 401
-        self.refresh_oauth
-        count += 1
+      if (count += 1) < 3
+        if ex.code == 401
+          self.refresh_oauth
+        end
         retry
       else
         raise
@@ -432,8 +439,12 @@ module ZuoraConnect
     end
 
     def refresh(session = nil)
+      #Refresh token if already expired
+      self.refresh_oauth if self.oauth_expired?
+
       count ||= 0
       start = Time.now
+      Rails.logger.info("[#{self.id}] REFRESHING - Get Task Info")
       response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
       response_time = Time.now - start
 
@@ -445,16 +456,16 @@ module ZuoraConnect
         raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
       end
     rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError
-      if count < 2
-        count += 1
+      if (count += 1) < 3
         retry
       else
         raise
       end
     rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
-      if count < 2 && ex.code == 401
-        self.refresh_oauth
-        count += 1
+      if (count += 1) < 3
+        if ex.code == 401
+          self.refresh_oauth
+        end
         retry
       else
         raise
@@ -533,9 +544,9 @@ module ZuoraConnect
       response_time = Time.now - start
       Rails.logger.info("[#{self.id}] REFRESHING - OAuth in #{response_time.round(2).to_s}")
 
-      response_body = JSON.parse(response.body)
-
       if response.code == 200
+        response_body = JSON.parse(response.body)
+
         self.refresh_token = response_body["refresh_token"]
         self.access_token = response_body["access_token"]
         self.oauth_expires_at = Time.at(response_body["created_at"].to_i) + response_body["expires_in"].seconds
@@ -546,18 +557,16 @@ module ZuoraConnect
       end
 
     rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
-      if count < 2
-        count += 1
+      if (count += 1) < 3
         retry
       else
         raise
       end
     rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
-      if count < 3
+      if (count += 1) < 3
         Rails.logger.info("REFRESHING - OAuth Failed - Retrying(#{count})")
         self.reload
         sleep(5)
-        count += 1
         retry
       else
         Rails.logger.fatal("REFRESHING - OAuth Failed")
@@ -566,7 +575,7 @@ module ZuoraConnect
     end
 
     def oauth_expired?
-      (expires_at < Time.now)
+      (self.oauth_expires_at < Time.now)
     end
 
     def attr_builder(field,val)

data/lib/zuora_connect/controllers/helpers.rb

@@ -5,16 +5,18 @@ module ZuoraConnect
       extend ActiveSupport::Concern
 
       def authenticate_app_api_request
+        #Skip session for api requests
+        request.session_options[:skip] = true
         start_time = Time.now
         if !request.headers["API-Token"].blank?
           @appinstance = ZuoraConnect::AppInstance.where(:api_token => request.headers["API-Token"]).first
-          Rails.logger.debug("[#{@appinstance.id}] API REQUEST - API token") if !@appinstance.blank?
+          Rails.logger.debug("[#{@appinstance.id}] API REQUEST - API token") if @appinstance.present?
           check_instance
         else
           authenticate_or_request_with_http_basic do |username, password|
             @appinstance = ZuoraConnect::AppInstance.where(:token => password).first
             @appinstance ||= ZuoraConnect::AppInstance.where(:api_token => password).first
-            Rails.logger.debug("[#{@appinstance.id}] API REQUEST - Basic Auth") if !@appinstance.blank?
+            Rails.logger.debug("[#{@appinstance.id}] API REQUEST - Basic Auth") if @appinstance.present?
             check_instance
           end
         end
@@ -65,7 +67,7 @@ module ZuoraConnect
 
     private
       def setup_instance_via_data
-        reset_session
+        session.clear
         values = JSON.parse(ZuoraConnect::AppInstance.decrypt_response(Base64.urlsafe_decode64(request["data"])))
         Rails.logger.debug("Data: #{values.to_json}")
         if values["param_data"]
@@ -98,7 +100,7 @@ module ZuoraConnect
       end
 
       def setup_instance_via_session
-        if !session["appInstance"].blank?
+        if session["appInstance"].present?
           @appinstance = ZuoraConnect::AppInstance.where(:id => session["appInstance"]).first
         else
           raise ZuoraConnect::Exceptions::SessionInvalid.new("Session Blank -- Relaunch Application")
@@ -125,7 +127,7 @@ module ZuoraConnect
 
       #API ONLY
       def check_instance
-        if !@appinstance.blank?
+        if @appinstance.present?
           @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
           Thread.current[:appinstance] = @appinstance
           PaperTrail.whodunnit = "API User" if defined?(PaperTrail)

data/lib/zuora_connect/version.rb

@@ -1,4 +1,4 @@
 module ZuoraConnect
-  VERSION = "1.5.13"
+  VERSION = "1.5.14"
 end
  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.5.14
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment