zuora_connect 1.4.57 → 1.4.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8bad9c8e35e2ce96888b415c7654892db2ee7cb
-  data.tar.gz: 60f5c4ef8fdbc0ce8d8d0918ae69dc44729e8f37
+  metadata.gz: f3fdf964f66f49e9a0a9a3307c7c945381acc0ef
+  data.tar.gz: de26b3ef267bc0d4ef5341a1cb2dfe6ee73450a8
 SHA512:
-  metadata.gz: a1ceef9d2802520ad5991ebda7fbbf2279671c463ba2d14fa87e05dd7e4bca225c7cdaa200b770a9e891831a57b62df066625b1bf254a1bd318c779e7f7258ad
-  data.tar.gz: 97a90aaf22ea1c09dc858a7d7311a79d25d5d915fc9f0cf37d0075e7a9a3a8082fdac8bc0d366fc77a93f8af7e41db37867de863ba32b6bd1cbdf98d7c0d20cb
+  metadata.gz: e1bfba26eca8b56f4370496103364f33a7a4734d5bb80324e02e1d30e083b787cf3309779a50faa71eaced1aab525ae49c8eb6fcd413471099f67c3f4f299350
+  data.tar.gz: 008d296b0ef62b246ec8111e17c3fa725d6fd1c3775bad0736ce117c2ae6ca19f42215bb3d548a7a6fd627949f09f7b66cf281464d6f6f81b1e59d62691c6103

data/app/models/zuora_connect/app_instance_base.rb

@@ -302,7 +302,7 @@ module ZuoraConnect
     end
 
     def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token)
-      @api_version = (username.include?("@") ? "v1" : "v2")
+      @api_version = "v2"
       @username = username
       @password = password
       @last_refresh = session["#{self.id}::last_refresh"]
@@ -360,11 +360,7 @@ module ZuoraConnect
 
     def updateOption(optionId, value)
       if self.access_token && self.refresh_token
-        if self.api_version == "v1"
-          return HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/application_options/#{optionId}/edit?value=#{value}",:basic_auth => auth = {:username => self.username, :password => self.password})
-        else
-          return HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/application_options/#{optionId}/edit?value=#{value}",:body => {:access_token => self.username})
-        end
+        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
       end
@@ -377,14 +373,21 @@ module ZuoraConnect
     #This can change to another existing login
     def update_logins(options)
       count ||= 0
-      response = HTTParty.post(ZuoraConnect.configuration.url + "/api/v2/tools/tasks/#{self.id}/logins",:body => {:access_token => self.username}.merge(options))
+      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
         return JSON.parse(response.body)
       else
         raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
       end
-    rescue
-      if count < 2 && response.code == 401
+    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError
+      if count < 2
+        count += 1
+        retry
+      else
+        raise
+      end
+    rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
+      if count < 2 && ex.code == 401
         self.refresh_oauth
         count += 1
         retry
@@ -396,11 +399,7 @@ module ZuoraConnect
     def refresh(session = nil)
       count ||= 0
       start = Time.now
-      if self.api_version == "v1"
-        response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:basic_auth => auth = {:username => self.username, :password => self.password})
-      else
-        response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
-      end
+      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
 
       Rails.logger.info("[#{self.id}] REFRESHING - Connect Request Time #{response_time.round(2).to_s}")
@@ -410,8 +409,15 @@ module ZuoraConnect
       else
         raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
       end
-    rescue
-      if self.api_version == "v2" && count < 2 && response.code == 401
+    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError
+      if count < 2
+        count += 1
+        retry
+      else
+        raise
+      end
+    rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
+      if count < 2 && ex.code == 401
         self.refresh_oauth
         count += 1
         retry
@@ -501,7 +507,15 @@ module ZuoraConnect
         Rails.logger.fatal("REFRESHING - OAuth Failed - Code #{response.code}")
         raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Refreshing Access Token", response.body, response.code)
       end
-    rescue
+
+    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
+      if count < 2
+        count += 1
+        retry
+      else
+        raise
+      end
+    rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
       if count < 3
         Rails.logger.info("REFRESHING - OAuth Failed - Retrying(#{count})")
         self.reload

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.4.57"
+  VERSION = "1.4.58"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.4.57
+  version: 1.4.58
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-session_store