zuora_connect 3.1.1.pre.c → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef73a28bd87609cedef16023f75320765d7b38b3e3417be5b5000be410596127
-  data.tar.gz: 62440f4e6e5ae219f40d9dc5b927b896cd26214cb9693191629929594c9f349a
+  metadata.gz: 5eedfed1cc9d304e303303bbda985be007df987f6c50c8cebf4bef6ee2f630a2
+  data.tar.gz: 77bbf5a323c63814cb50521ffd244c601b40e3f5c07bc8208f9996b83fe5090e
 SHA512:
-  metadata.gz: fe0dc6bf317c0ff0e76d069db2abd158175527cd5b971065b6c84d79412971c4fbab8ad5141bd4525497d41e38ca2b99c0760f662791a920955770692e278ef5
-  data.tar.gz: f15d374ed1aaa037ca1764d71f468eac6019b6515ac0a41f20835e732adc0dc9651b893f8f5f18b2a494e2e54f083be7dda77b9a6863dbd53a1d39f13e7cb221
+  metadata.gz: 519cf6f3002ff33a5849e297e74ccd7a541a9677fdbf28e7481848d3ef74f2521555c129fa215db87dc5565fa7c0afa4ea3ce19c6555ad0bec8878fe41d48d78
+  data.tar.gz: 6db95ad4869e55739c648492a830054c8f59b574a6ddabf80b8de24ff1e67356e7df492fcf742a6afea5bb65f34f215252dd2466d5c264578c5c0cd224866fe4

data/app/models/zuora_connect/app_instance_base.rb

@@ -353,10 +353,8 @@ module ZuoraConnect
     end
 
     def fetch_connect_data(session: {})
-      refresh_count ||= 0
       self.check_oauth_state
-      request_url = ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json"
-      response = HTTParty.get(request_url,:body => {:access_token => self.access_token})
+      response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
 
       if response.code == 200
         begin
@@ -369,43 +367,45 @@ module ZuoraConnect
         self.set_backup_creds
         self.save(validate: false) if self.changed?
       else
-        raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error communicating with Connect for '#{request_url}' with #{response.code}", response.body, response.code)
-      end
-    rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
-      refresh_count += 1
-      if refresh_count < 3
-        sleep(10)
-        ZuoraConnect.logger.debug("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
-        retry
-      else
-        ZuoraConnect.logger.fatal("REFRESH TASK - Connection Failed", ex)
-        raise
-      end
-    rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
-      refresh_count += 1
-      if refresh_count < 3
-        ZuoraConnect.logger.debug("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
-        self.refresh_oauth if ex.code == 401
-        retry
-      else
-        ZuoraConnect.logger.fatal("REFRESH TASK - Communication Failed #{ex.code}", ex, self.default_ougai_items)
-        raise
+        raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
       end
     end
 
+
     def refresh(session: {})
       refresh_count ||= 0
       skip_connect ||= ZuoraConnect.configuration.skip_connect
-      #Check how app was deployed
-      if !self.auto_deployed? && (!skip_connect || self['zuora_logins'].blank?)
-        self.fetch_connect_data(session: session)
-      else
-        self.build_task(task_data: self.zuora_logins, session: session)
+      begin
+        #Check how app was deployed
+        if !self.auto_deployed? && (!skip_connect || self['zuora_logins'].blank?)
+          self.fetch_connect_data(session: session)
+        else
+          self.build_task(task_data: self.zuora_logins, session: session)
+        end
+        self.last_refresh = Time.now.to_i
+        self.cache_app_instance
+        self.reset_mark_for_refresh
+      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+        refresh_count += 1
+        if refresh_count < 3
+          sleep(10)
+          ZuoraConnect.logger.debug("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
+          retry
+        else
+          ZuoraConnect.logger.fatal("REFRESH TASK - Connection Failed", ex)
+          raise
+        end
+      rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
+        refresh_count += 1
+        if refresh_count < 3
+          ZuoraConnect.logger.debug("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
+          self.refresh_oauth if ex.code == 401
+          retry
+        else
+          ZuoraConnect.logger.fatal("REFRESH TASK - Communication Failed #{ex.code}", ex, self.default_ougai_items)
+          raise
+        end
       end
-      self.last_refresh = Time.now.to_i
-      self.cache_app_instance
-      self.reset_mark_for_refresh
-     
     rescue => ex
       refresh_count += 1
       if self['zuora_logins'].present? && refresh_count < 3

data/lib/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = "3.1.1-c"
+  VERSION = "3.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.1.1.pre.c
+  version: 3.1.1
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -452,9 +452,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: