zuora_api 1.6.255 → 1.7.00

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5e6a8e9ae21ef49ef02ea0c4f68a568d5e0e8bb8
-  data.tar.gz: 29eb9ef8d16d22b41e0b446d89f86e416c03fb21
+SHA256:
+  metadata.gz: ecec87283f238f546be12e3fadb16e9fabbee7aec1129d47401876359271f868
+  data.tar.gz: 98d980959dcf672fad54bdc87fa89061f6aee4627eebb4ef89da8573c204419b
 SHA512:
-  metadata.gz: 53b80cc5f612a4b59fc80280fd1e9b8a694de301aa43f481ab5af4f33647ae65188e51399d9be59c161d8d7dfb7eeecbcc6667e5f0ab195cb56c3de91c2ced15
-  data.tar.gz: b955ba0161c862c0a7b96ab5b29e282548ace81f23b8df999710d1647c5e1e66ff5898781454df41b9f7cc6905c4ad95353c0c75c10cd7f1c6d6a8d582d72809
+  metadata.gz: 0f18782b6e2bc5d2433c4f0b632fe931205392db8b334edf524accec0e17821394a064f82cb45983d0a0ae7cbbc106b8ae8911b90c35651445e139bf94d261d7
+  data.tar.gz: 56555f10ce5434a30a54d4cad556170987a033f1cbfef34dc0b246fd935878ae4e7bd989e4c7ba7f3f95a73d291c25983d39260b41a8c91a1dcb9a019e879eab

data/.gitlab-ci.yml

@@ -1,5 +1,4 @@
-
-image: ruby:2.3.1
+image: ruby:2.6
 stages:
   - setup
   - test
@@ -41,10 +40,24 @@ rubygems-deploy:
   stage: deploy
   allow_failure: false
   script:
+  - echo "deb http://ftp.us.debian.org/debian testing main contrib non-free" >> /etc/apt/sources.list
+  - apt-get update
+  - apt-get install -y git
+  - apt-get clean all
+  - gem install dpl
+  - if [[ "staging"  == $CI_BUILD_REF_SLUG ]];then  export VERSION=`git describe --match "[0-9]*\.[0-9]*\.[0-9]*[a-z]" --abbrev=0 --tags HEAD`; fi
+  - if [[ "master"  == $CI_BUILD_REF_SLUG ]];then export VERSION=`git describe --exclude "[0-9]*\.[0-9]*\.[0-9]*[a-z]" --abbrev=0 --tags HEAD`; fi
+  - echo $VERSION
+  - sed -i "s/0.0.1/$VERSION/" /Connect/zuora-gem/lib/zuora_api/version.rb
+  - git add /Connect/zuora-gem/lib/zuora_api/version.rb
+  - git config --global user.email "connect@zuora.com"
+  - git config --global user.name "Connect Automation"
+  - git commit -m "Automated Version Update $VERSION"
   - bundle install
   - gem install rake
   - version=$(rake install | grep -o 'pkg/zuora_api-.*gem')
   - curl -u $USERNAME:$PASSWORD https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials; chmod 0600 ~/.gem/credentials
   - gem push $version
   only:
-  - master
+    - master
+    - staging

data/CHANGELOG.md

@@ -1,6 +1,63 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.7.00] - 2018-8-05
+### Changed
+- Raise proper exception when oauth client is from deactivated user.
+- Support for rails < 6
+
+## [1.6.53] - 2018-7-29
+### Changed
+- Don't attempt zsession login if bearer token is bad
+
+## [1.6.51 - 1.6.51] - 2018-7-22
+### Changed
+- Retry on address not available.
+
+## [1.6.47 - 1.6.48] - 2018-6-26
+### Changed
+- Changed error raise statements when incorrect credentials are supplied to Basic/Oauth Logins
+
+## [1.6.45] - 2018-5-30
+### Changed
+- Fix retry so headers are reinstaniated on session failure. 
+
+## [1.6.41] - 2018-5-30
+### Changed
+- Retry added on SSL connection failure
+
+## [1.6.39-1.6.40] - 2018-5-30
+### Changed
+- Added validation to fix bad urls entered into object initialization
+
+## [1.6.38] - 2018-5-26
+### Changed
+- HttpParty validation before code extraction
+
+## [1.6.37] - 2018-5-23
+### Added
+- Added method to determine rest endpoint domain
+
+## [1.6.36] - 2018-5-22
+### Changed
+- Fixed zuora staging 2 endpoint
+
+## [1.6.33] - 2018-5-15
+### Changed
+- Added Errno::EHOSTUNREACH to list of retriable error codes
+
+## [1.6.32] - 2018-5-14
+### Changed
+- Don't log fatal errors, allow application to decide for file download
+- Don't change api url if the user set a high api url
+
+###Removed
+- Force encoding
+
+## [1.6.28] - 2018-3-12
+### Added
+- Way to avoid force encoding for filedownload
+
 ## [1.6.28] - 2018-3-12
 ### Added
 - Way to avoid force encoding for filedownload

data/lib/zuora_api/exceptions.rb

@@ -6,8 +6,8 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil, code =nil)
-        @code = code
+      def initialize(message = nil,response=nil)
+        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
         @default_message = "Error with Zuora Session."
@@ -22,8 +22,8 @@ module ZuoraAPI
       attr_reader :code, :response, :errors, :successes
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil, code =nil, errors = [], successes = [])
-        @code = code
+      def initialize(message = nil,response=nil, errors = [], successes = [],  *args)
+        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
         @default_message = "Error with Zuora Entity"
@@ -40,8 +40,8 @@ module ZuoraAPI
       attr_reader :code, :response, :errors, :successes
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil, code =nil, errors = [], successes = [])
-        @code = code
+      def initialize(message = nil,response=nil, errors = [], successes = [],  *args)
+        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
         @default_message = "Error communicating with Zuora."
@@ -58,8 +58,8 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil, code =nil)
-        @code = code
+      def initialize(message = nil,response=nil,  *args)
+        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
         @default_message = "Your request limit has been exceeded for zuora."
@@ -74,8 +74,24 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil, code =nil)
-        @code = code
+      def initialize(message = nil,response=nil,  *args)
+        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
+        @message = message
+        @response = response
+        @default_message = "Operation failed due to lock competition. Please retry"
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
+
+    class ZuoraDataIntegrity < Error
+      attr_reader :code, :response
+      attr_writer :default_message
+
+      def initialize(message = nil,response=nil,  *args)
+        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
         @default_message = "Operation failed due to lock competition. Please retry"
@@ -90,8 +106,8 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil, code =nil)
-        @code = code
+      def initialize(message = nil,response=nil, *args)
+        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
         @default_message = "There is a temporary error with zuora system."
@@ -106,8 +122,8 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil, code =nil)
-        @code = code
+      def initialize(message = nil,response=nil,  *args)
+        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
         @default_message = "Authentication type is not supported by this Login"

data/lib/zuora_api/login.rb

@@ -1,28 +1,38 @@
 require "httparty"
 require "nokogiri"
 require "uri"
+require 'zuora_api/exceptions'
 
 module ZuoraAPI
   class Login
     ENVIRONMENTS = [SANDBOX = 'Sandbox', PRODUCTION = 'Production', PREFORMANCE = 'Preformance', SERVICES = 'Services', UNKNOWN = 'Unknown', STAGING = 'Staging' ]
     REGIONS = [EU = 'EU', US = 'US', NA = 'NA' ]
-    MIN_Endpoint = '91.0'
+    MIN_Endpoint = '96.0'
     XML_SAVE_OPTIONS = Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
-    CONNECTION_EXCEPTIONS = [Net::OpenTimeout, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError]
+    CONNECTION_EXCEPTIONS = [Net::OpenTimeout, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError, Errno::EHOSTUNREACH, Errno::EADDRNOTAVAIL]
     CONNECTION_READ_EXCEPTIONS = [Net::ReadTimeout, Errno::ECONNRESET, Errno::EPIPE]
+    ZUORA_API_ERRORS = [ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition, ZuoraAPI::Exceptions::ZuoraAPITemporaryError, ZuoraAPI::Exceptions::ZuoraDataIntegrity]
+    
+    attr_accessor :region, :url, :wsdl_number, :current_session, :bearer_token, :oauth_session_expires_at, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :timeout_sleep, :hostname, :zconnect_provider
 
-    attr_accessor :region, :url, :wsdl_number, :current_session, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :timeout_sleep, :hostname, :zconnect_provider
-
-    def initialize(url: nil, entity_id: nil, session: nil, status: nil, **keyword_args)
-      raise "URL is nil or empty, but URL is required" if url.nil? | url.empty?
+    def initialize(url: nil, entity_id: nil, session: nil, status: nil, bearer_token: nil, oauth_session_expires_at: nil, **keyword_args)
+      raise "URL is nil or empty, but URL is required" if url.nil? || url.empty?
       # raise "URL is improper. URL must contain zuora.com, zuora.eu, or zuora.na" if /zuora.com|zuora.eu|zuora.na/ === url
-      @url = url.gsub(/(\d{2}\.\d)$/, MIN_Endpoint)
-      @hostname = /(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url)[0] if !/(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url).nil?
-      @entity_id = get_entity_id(entity_id: entity_id)
-      @errors = Hash.new
-      @current_session = session
-      @status = status.blank? ? "Active" : status
-      @user_info = Hash.new
+      self.hostname = /(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url)[0] if !/(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url).nil?
+      if !/apps\/services\/a\/\d{2}\.\d$/.match(url.strip)
+        self.url = "https://#{hostname}/apps/services/a/#{MIN_Endpoint}"
+      elsif MIN_Endpoint.to_f > url.scan(/(\d{2}\.\d)$/).dig(0,0).to_f 
+        self.url = url.gsub(/(\d{2}\.\d)$/, MIN_Endpoint)
+      else
+        self.url = url
+      end
+      self.entity_id = get_entity_id(entity_id: entity_id)
+      self.errors = Hash.new
+      self.current_session = session
+      self.bearer_token = bearer_token
+      self.oauth_session_expires_at = oauth_session_expires_at
+      self.status = status.blank? ? "Active" : status
+      self.user_info = Hash.new
       self.update_region
       self.update_environment
       self.update_zconnect_provider
@@ -36,21 +46,21 @@ module ZuoraAPI
         if !zsession.blank?
           response = HTTParty.get("https://#{self.hostname}/apps/v1/identity", :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json'})
           output_json = JSON.parse(response.body)
-        elsif !zconnect_accesstoken.blank?
-          code = zconnect_accesstoken.split("#!").last
-          encrypted_token, tenant_id = Base64.decode64(code).split(":")
+        elsif zconnect_accesstoken.present?
           begin
+            code = zconnect_accesstoken.split("#!").last
+            encrypted_token, tenant_id = Base64.decode64(code).split(":")
             body = {'token' => encrypted_token}.to_json
           rescue => ex
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Invalid ZConnect Cookie", {}, 400)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Invalid ZConnect Cookie")
           end
           response = HTTParty.post("https://#{self.hostname}/apps/zconnectsession/identity", :body => body, :headers => { 'Content-Type' => 'application/json' })
           output_json = JSON.parse(response.body)
         else
           if zconnect_accesstoken.blank? && cookies.keys.any? { |x| x.include? "ZConnect"}
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}", {}, 400)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}")
           else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present", {}, 400)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
           end
         end
       rescue JSON::ParserError => ex
@@ -64,17 +74,17 @@ module ZuoraAPI
       zsession = cookies["ZSession"]
       zconnect_accesstoken = get_zconnect_accesstoken(cookies)
       begin
-        if !zsession.blank?
+        if zsession.present?
           response = HTTParty.get("https://#{self.hostname}/apps/v1/navigation", :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json'})
           output_json = JSON.parse(response.body)
-        elsif !zconnect_accesstoken.blank?
+        elsif zconnect_accesstoken.present?
           response = HTTParty.get("https://#{self.hostname}/apps/zconnectsession/navigation", :headers => {'Cookie' => "#{self.zconnect_provider}=#{zconnect_accesstoken}",'Content-Type' => 'application/json'})
           output_json = JSON.parse(response.body)
         else
           if zconnect_accesstoken.blank? && cookies.keys.any? { |x| x.include? "ZConnect"}
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}", {}, 400)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}")
           else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present", {}, 400)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
           end
         end
       rescue JSON::ParserError => ex
@@ -96,9 +106,9 @@ module ZuoraAPI
           output_json = JSON.parse(response.body)
         else
           if zconnect_accesstoken.blank? && cookies.keys.any? { |x| x.include? "ZConnect"}
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}", {}, 400)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}")
           else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present", {}, 400)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
           end
         end
       rescue JSON::ParserError => ex
@@ -120,9 +130,9 @@ module ZuoraAPI
           output_json = JSON.parse(response.body)
         else
           if zconnect_accesstoken.blank? && cookies.keys.any? { |x| x.include? "ZConnect"}
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}", {}, 400)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}")
           else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present", {}, 400)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
           end
         end
       rescue JSON::ParserError => ex
@@ -170,12 +180,12 @@ module ZuoraAPI
         if entity_ids.blank? && cookies["ZuoraCurrentEntity"].present?
           entity_ids = Array(cookies["ZuoraCurrentEntity"].unpack("a8a4a4a4a12").join('-'))
         else
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Zuora Entity ID not provided", {}, 400)
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Zuora Entity ID not provided")
         end
         if user_id.blank? && cookies["Zuora-User-Id"].present?
           user_id = cookies["Zuora-User-Id"]
         else
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Zuora User ID not provided", {}, 400)
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Zuora User ID not provided")
         end
       elsif !client_id.nil? && !client_secret.nil?
         bearer_response = HTTParty.post("https://#{self.hostname}/oauth/token", :headers => {'Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json'}, :body => {'client_id' => client_id, 'client_secret' => URI::encode(client_secret), 'grant_type' => 'client_credentials'})
@@ -192,12 +202,12 @@ module ZuoraAPI
           output_json["clientSecret"] = new_client_secret
           return output_json
         elsif oauth_response.code == 401 && !oauth_response.message.blank?
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new(output_json["message"], {}, oauth_response.code)
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new(output_json["message"], oauth_response)
         else
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new(output_json["error"], {}, oauth_response.code)
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new(output_json["error"], oauth_response)
         end
       else
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Insufficient credentials provided", {}, 400)
+        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Insufficient credentials provided")
       end
     end
 
@@ -257,7 +267,7 @@ module ZuoraAPI
       if !self.url.blank?
         if /(?<=\.|\/|-|^)(apisandbox|sandbox)(?=\.|\/|-|$)/ === self.hostname
           self.environment = 'Sandbox'
-        elsif /(?<=\.|\/|^)(service|services[\d]*|ep-edge)(?=\.|\/|$)/ === self.hostname
+        elsif /(?<=\.|\/|^)(service[\d]*|services[\d]*|ep-edge)(?=\.|\/|$)/ === self.hostname
           self.environment = 'Services'
         elsif /(?<=\.|\/|-|^)(pt[\d]*)(?=\.|\/|-|$)/ === self.hostname
           self.environment = 'Performance'
@@ -332,17 +342,22 @@ module ZuoraAPI
       when 'Services'
         https = /https:\/\/|http:\/\//.match(self.url)[0]
         host = self.hostname
-        endpoint = "#{https}#{host}/apps/v1/#{url}"
+        endpoint = "#{https}rest#{host}/v1/#{url}"
       when 'Staging'
-        endpoint = "https://rest-staging2.zuora.com/".concat(url)
+        endpoint = "https://rest-staging2.zuora.com/v1/".concat(url)
       when 'Unknown'
         raise "Environment unknown, returning passed in parameter unaltered"
       end
       return endpoint
     end
 
+    def rest_domain
+      require 'addressable/uri'
+      return ::Addressable::URI.parse(self.rest_endpoint).host      
+    end
+
     def fileURL(url="")
-      return self.url.split(".com").first.concat(".com/apps/api/file/").concat(url)
+      return self.rest_endpoint("file/").concat(url)
     end
 
     def dateFormat
@@ -353,17 +368,16 @@ module ZuoraAPI
     end
 
     def get_session(prefix: false, auth_type: :basic)
-      Rails.logger.debug("Get session for #{auth_type} - #{self.class.to_s}")
+      Rails.logger.debug("Get session for #{auth_type} - #{self.class.to_s}") if Rails.env.to_s == 'development'
       case auth_type
       when :basic
         if self.current_session.blank?
-          Rails.logger.debug("Create new session")
           case self.class.to_s
           when 'ZuoraAPI::Oauth'
             if self.bearer_token.blank? || self.oauth_expired?
               self.new_session(auth_type: :bearer)
             end
-            self.get_z_session
+            self.get_z_session if self.status == 'Active'
           when 'ZuoraAPI::Basic'
             self.new_session(auth_type: :basic)
           else
@@ -386,7 +400,7 @@ module ZuoraAPI
       end
     end
 
-    def soap_call(ns1: 'ns1', ns2: 'ns2', batch_size: nil, single_transaction: false, debug: false, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError, ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition], z_session: true, timeout_retry: false, timeout: 120,**keyword_args)
+    def soap_call(ns1: 'ns1', ns2: 'ns2', batch_size: nil, single_transaction: false, debug: false, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError].concat(ZUORA_API_ERRORS), z_session: true, timeout_retry: false, timeout: 120,**keyword_args)
       tries ||= 2
       xml = Nokogiri::XML::Builder.new do |xml|
         xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/",
@@ -436,7 +450,7 @@ module ZuoraAPI
           return output_xml, input_xml, response
         end
       end
-    rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition => ex
+    rescue *ZUORA_API_ERRORS => ex
       if errors.include?(ex.class)
         raise ex
       else
@@ -458,6 +472,12 @@ module ZuoraAPI
       else
         raise ex
       end
+    rescue Errno::ECONNRESET => ex
+      if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
+        retry
+      else
+        raise ex
+      end
     rescue => ex
       raise ex
     else
@@ -499,94 +519,107 @@ module ZuoraAPI
           if error.class == String
             case error
             when "INVALID_SESSION"
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{error}::#{message}", body, response.code )
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{error}::#{message}", response)
             when "REQUEST_EXCEEDED_LIMIT"
-              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{error}::#{message}", body, response.code)
+              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{error}::#{message}", response)
             when "LOCK_COMPETITION"
-              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", body, response.code)
+              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", response)
             when "BATCH_FAIL_ERROR"
               if message.include?("optimistic locking failed")
-                raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", body, response.code) 
+                raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", response) 
               else
-                raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", body, response.code)
+                raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response)
               end
             when "TEMPORARY_ERROR"
-              raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new("#{error}::#{message}", body, response.code)
+              raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new("#{error}::#{message}", response)
+            when "INVALID_VALUE"
+              if message.include?("data integrity violation")
+                raise ZuoraAPI::Exceptions::ZuoraDataIntegrity.new("Data Integrity Violation", response)
+              else
+                raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response)
+              end
             else
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", body, response.code) if error.present?
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response) if error.present?
             end
           elsif error.class == Array
-              if error[0].include?("LOCK_COMPETITION") && error.count == 1
-                raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new(error.group_by {|v| v}.map {|k,v| "(#{v.size}x) - #{k == "::" ? 'UNKNOWN::No error provided' : k}"}.join(', '), body, response.code)
-              else
-                raise ZuoraAPI::Exceptions::ZuoraAPIError.new(error.group_by {|v| v}.map {|k,v| "(#{v.size}x) - #{k == "::" ? 'UNKNOWN::No error provided' : k}"}.join(', '), body, response.code, error, success)
-              end
+            if error[0].include?("LOCK_COMPETITION") && error.count == 1
+              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new(error.group_by {|v| v}.map {|k,v| "(#{v.size}x) - #{k == "::" ? 'UNKNOWN::No error provided' : k}"}.join(', '), response)
+            else
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new(error.group_by {|v| v}.map {|k,v| "(#{v.size}x) - #{k == "::" ? 'UNKNOWN::No error provided' : k}"}.join(', '), response, error, success)
+            end
           end
         end
-
+        
         if response.code == 429
-          raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", body, response.code)
+          raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
         end
 
       when :JSON
         body = body.dig("results").present? ? body["results"] : body if body.class == Hash
         if body.class == Hash && (!body["success"] || !body["Success"] || response.code != 200)
-          messages_array = (body["reasons"] || []).map {|error| error['message']}.compact
-          codes_array = (body["reasons"] || []).map {|error| error['code']}.compact
+          messages_array = body.fetch("reasons", []).map {|error| error['message']}.compact
+          messages_array = messages_array.push(body.dig("error", 'message')).compact if body.dig('error').class == Hash
+          codes_array =    body.fetch("reasons", []).map {|error| error['code']}.compact
+          codes_array = codes_array.push(body.dig("error", 'code')).compact  if body.dig('error').class == Hash
 
           if body['message'] == "No bearer token" && response.code == 400
-            raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new()
+            raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Authentication type is not supported by this Login", response)
           end
 
           if body['errorMessage']
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body['errorMessage'],body,response.code)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body['errorMessage'], response)
           end
 
           if body.dig("reasons").nil? ? false : body.dig("reasons")[0].dig("code") == 90000020
-            raise ZuoraAPI::Exceptions::BadEntityError.new("#{messages_array.join(', ')}", body, response.code)
+            raise ZuoraAPI::Exceptions::BadEntityError.new("#{messages_array.join(', ')}", response)
+          end
+
+          #Oauth Tokens - User deactivated
+          if body['message'] == 'Forbidden' && body['status'] == 403 && response.code == 403
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("Forbidden", response)
           end
 
-          if body['error'] == 'Unauthorized' && body['status'] = 401
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", body, response.code)
+          if body['error'] == 'Unauthorized' && body['status'] == 401
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", response)
           end
           #Authentication failed
-          if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(11) || response.code == 401
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", body, response.code)
+          if (codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(11) || response.code == 401) && !codes_array.include?(422)
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", response)
           end
 
           #Zuora REST Create Amendment error #Authentication failed
           if body["faultcode"].present? && body["faultcode"] == "fns:INVALID_SESSION"
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body['faultstring']}", body, response.code)
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body['faultstring']}", response)
           end
 
           #Request exceeded limit
           if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(70)
-            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{messages_array.join(', ')}", body, response.code)
+            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{messages_array.join(', ')}", response)
           end
 
           #Locking contention
           if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(50)
-            raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{messages_array.join(', ')}", body, response.code)
-          end
+            raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{messages_array.join(', ')}", response)
+          end          
 
           #All Errors catch
           if codes_array.size > 0
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{messages_array.join(', ')}", body, response.code)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{messages_array.join(', ')}", response)
           end
 
           #Zuora REST Query Errors
           if body["faultcode"].present?
             case body["faultcode"]
             when "fns:MALFORMED_QUERY"
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
             when "fns:REQUEST_EXCEEDED_LIMIT"
-              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
+              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
             when "fns:LOCK_COMPETITION"
-              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
+              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
             when "INVALID_SESSION"
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
             else
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
             end
           end
 
@@ -595,7 +628,7 @@ module ZuoraAPI
             (body["Errors"] || []).select { |obj| errors.push(obj["Message"]) }.compact
             (body["errors"] || []).select { |obj| errors.push(obj["Message"]) }.compact
             if errors.size > 0
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{errors.join(", ")}", body, response.code, errors)
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{errors.join(", ")}", response, errors)
             end
           end
         end
@@ -607,22 +640,27 @@ module ZuoraAPI
 
           if all_success.blank? && all_errors.present?
             error_codes = all_errors.flatten.group_by {|error| error['Code']}.keys.uniq
-            if error_codes.size == 1 && error_codes[0] == "LOCK_COMPETITION"
-              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("Retry Lock Competition", body, response.code)
+            error_messages = all_errors.flatten.group_by {|error| error['Message']}.keys.uniq
+            if error_codes.size == 1 || error_messages.size == 1
+              if error_codes.first == "LOCK_COMPETITION"
+                raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("Retry Lock Competition", response)
+              elsif error_messages.first.include?("data integrity violation")
+                raise ZuoraAPI::Exceptions::ZuoraDataIntegrity.new("Data Integrity Violation", response)
+              end 
             end
           end
 
           if all_errors.size > 0
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{all_errors.flatten.group_by {|error| error['Message']}.keys.uniq.join(' ')}", body, response.code, all_errors, all_success  )
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{all_errors.flatten.group_by {|error| error['Message']}.keys.uniq.join(' ')}", response, all_errors, all_success)
           end
         end
 
         #All other errors
-        if response.code != 200
+        if ![200,201].include?(response.code)
           if response.code == 429
-            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", body, response.code)
+            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
           else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{response.message}", body, response.code)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{response.message}", response)
           end
         end
       end
@@ -645,7 +683,7 @@ module ZuoraAPI
       }
       response = self.rest_call(method: :post, body: params.to_json, url: self.aqua_endpoint("batch-query/"))
       if(response[0]["id"].nil?)
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error in AQuA Process. #{response}")
+        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error in AQuA Process.", response)
       end
       return getFileById(id: response[0]["id"])
     end
@@ -658,7 +696,7 @@ module ZuoraAPI
         response, fullResponse = self.rest_call(method: :get, body: {}, url: self.aqua_endpoint("batch-query/jobs/#{id}"))
         result = response["batches"][0]["status"]
         if result == "error"
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Aqua Error: #{response}")
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Aqua Error", response)
           break
         end
       end
@@ -666,7 +704,7 @@ module ZuoraAPI
       return self.get_file(url: self.aqua_endpoint("file/#{fileId}"))
     end
 
-    def describe_call(object = nil)
+    def describe_call(object = nil, log_errors = true)
       tries ||= 2
 
       base = self.url.include?(".com") ? self.url.split(".com")[0].concat(".com") : self.url.split(".eu")[0].concat(".eu")
@@ -674,7 +712,7 @@ module ZuoraAPI
       headers = self.entity_id.present? ? {"Zuora-Entity-Ids" => self.entity_id, 'Content-Type' => "text/xml; charset=utf-8"} : {'Content-Type' => "text/xml; charset=utf-8"}
       response = HTTParty.get(url,  headers: {"Authorization" => self.get_session(prefix: true, auth_type: :basic)}.merge(headers), :timeout => 120)
 
-      raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error.present? ? self.current_error : 'Describe call 401' ) if response.code == 401
+      raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error.present? ? self.current_error : 'Describe call 401', response) if response.code == 401
 
       output_xml = Nokogiri::XML(response.body)
       des_hash = Hash.new
@@ -714,11 +752,12 @@ module ZuoraAPI
         raise ex
       end
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      if !(tries -= 1).zero?
-        Rails.logger.info("Session expired. Starting new session.")
+      if !(tries -= 1).zero? && self.status == 'Active'
+        Rails.logger.debug("Describe session expired. Starting new session.")
         self.new_session
         retry
       else
+        Rails.logger.error("Describe session expired. Starting new session.") if log_errors
         raise ex
       end
     rescue => ex
@@ -727,7 +766,7 @@ module ZuoraAPI
       return des_hash
     end
 
-    def rest_call(method: :get, body: nil, headers: {}, url: rest_endpoint("catalog/products?pageSize=4"), debug: false, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError, ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition], z_session: true, session_type: :basic, timeout_retry: false, timeout: 120, **keyword_args)
+    def rest_call(method: :get, body: nil, headers: {}, url: rest_endpoint("catalog/products?pageSize=4"), debug: false, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError].concat(ZUORA_API_ERRORS), z_session: true, session_type: :basic, timeout_retry: false, timeout: 120, **keyword_args)
       tries ||= 2
 
       if self.entity_id.present?
@@ -738,9 +777,9 @@ module ZuoraAPI
       raise "Method not supported, supported methods include: :get, :post, :put, :delete, :patch, :head, :options" if ![:get, :post, :put, :delete, :patch, :head, :options].include?(method)
 
       authentication_headers = z_session ? {"Authorization" =>  self.get_session(prefix: true, auth_type: session_type) } : {}
-      headers = {'Content-Type' => "application/json; charset=utf-8"}.merge(headers).merge(authentication_headers)
+      modified_headers = {'Content-Type' => "application/json; charset=utf-8"}.merge(authentication_headers).merge(headers)
 
-      response = HTTParty::Request.new("Net::HTTP::#{method.to_s.capitalize}".constantize, url, body: body, headers: headers, timeout: timeout).perform
+      response = HTTParty::Request.new("Net::HTTP::#{method.to_s.capitalize}".constantize, url, body: body, headers: modified_headers, timeout: timeout).perform
       Rails.logger.debug("Response Code: #{response.code}") if debug
       begin
         output_json = JSON.parse(response.body)
@@ -751,8 +790,8 @@ module ZuoraAPI
 
       raise_errors(type: :JSON, body: output_json, response: response)
     rescue ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError => ex
-      if self.class.to_s == 'ZuoraAPI::Oauth'
-        self.rest_call(method: method.to_sym, url: url, debug: debug, errors: errors, z_session: z_session, session_type: :bearer, timeout_retry: timeout_retry, timeout: timeout)
+      if self.class.to_s == 'ZuoraAPI::Oauth' && ex.message.include?("Authentication type is not supported by this Login")
+        self.rest_call(method: method.to_sym, url: url, body: body, debug: debug, errors: errors, z_session: z_session, session_type: :bearer, timeout_retry: timeout_retry, timeout: timeout)
       else
         Rails.logger.debug("Rest Call - Session Bad Auth type")
         raise ex
@@ -769,7 +808,7 @@ module ZuoraAPI
           return [output_json, response]
         end
       end
-    rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition  => ex
+    rescue *ZUORA_API_ERRORS => ex
       if errors.include?(ex.class)
         raise ex
       else
@@ -793,6 +832,12 @@ module ZuoraAPI
       else
         raise ex
       end
+    rescue Errno::ECONNRESET => ex
+      if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
+        retry
+      else
+        raise ex
+      end
     rescue => ex
       raise ex
     else
@@ -820,7 +865,7 @@ module ZuoraAPI
         Rails.logger.debug("Fetch Catalog URL #{url}")
         output_json, response = self.rest_call(:debug => false, :url => url, :errors => [ZuoraAPI::Exceptions::ZuoraAPISessionError], :timeout_retry => true )
         if !output_json['success'] =~ (/(true|t|yes|y|1)$/i) || output_json['success'].class != TrueClass
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error Getting Catalog: #{output_json}")
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error Getting Catalog: #{output_json}", response)
         end
         output_json["products"].each do |product|
           catalog_map[product["id"]] = {"productId" => product["id"]}
@@ -845,7 +890,7 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(url: nil, headers: {}, count: 3, z_session: true, tempfile: true, output_file_name: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 2, timeout: 120, session_type: :basic, force_encoding: true, **execute_params)
+    def get_file(url: nil, headers: {}, count: 3, z_session: true, tempfile: true, output_file_name: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 2, timeout: 120, session_type: :basic, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       #Make sure directory exists
@@ -857,7 +902,7 @@ module ZuoraAPI
         uri = URI.parse(url)
         http = Net::HTTP.new(uri.host, uri.port)
         http.read_timeout = timeout #Seconds
-        http.use_ssl = true  if uri.scheme.downcase == 'https'
+        http.use_ssl = true  if !uri.scheme.nil? && uri.scheme.downcase == 'https'
         if z_session
           headers = headers.merge({"Authorization" => self.get_session(prefix: true)})
           headers = headers.merge({"Zuora-Entity-Ids" => self.entity_id}) if !self.entity_id.blank?
@@ -871,7 +916,6 @@ module ZuoraAPI
 
             case response
             when Net::HTTPNotFound
-              Rails.logger.fatal("404 - Not Found")
               raise
 
             when Net::HTTPUnauthorized
@@ -882,9 +926,8 @@ module ZuoraAPI
                   raise
                 end
               end
-              Rails.logger.fatal("Unauthorized: Retry")
               self.new_session if z_session
-              return get_file(:url => url, :headers => headers, :count => count - 1, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries, :timeout => timeout, :force_encoding => force_encoding)
+              return get_file(:url => url, :headers => headers, :count => count - 1, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries, :timeout => timeout)
 
             when Net::HTTPClientError
               raise
@@ -949,11 +992,7 @@ module ZuoraAPI
               file_handle.binmode
 
               response.read_body do |chunk|
-                if force_encoding
-                  file_handle << chunk.force_encoding(encoding)
-                else 
-                  file_handle << chunk
-                end
+                file_handle << chunk
 
                 if defined?(export_size) && export_size != 0  && export_size.class == Integer
                   size += chunk.size
@@ -980,16 +1019,13 @@ module ZuoraAPI
             raise
           end
         end
-      rescue Exception => e
-        Rails.logger.fatal("Download Failed: #{response_save} - #{e.class} : #{e.message}")
-        Rails.logger.fatal("Download Failed: #{e.backtrace.join("\n")}")
+      rescue => ex
+        Rails.logger.fatal(ex)
         raise
       end
     end
 
     def getDataSourceExport(query, extract: true, encrypted: false, zip: true)
-      Rails.logger.debug("Build export")
-      Rails.logger.debug("#{query}")
       request = Nokogiri::XML::Builder.new do |xml|
         xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
           xml['SOAP-ENV'].Header do
@@ -1044,7 +1080,6 @@ module ZuoraAPI
       end
 
       file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
-      Rails.logger.debug('=====> Export finished')
       export_file = get_file(:url => self.fileURL(file_id))
       export_file_path = export_file.path
       Rails.logger.debug("=====> Export path #{export_file.path}")
@@ -1063,7 +1098,6 @@ module ZuoraAPI
     end
 
     def query(query, parse = false)
-      Rails.logger.debug("Querying Zuora for #{query}")
       output_xml, input_xml = self.soap_call({:debug => false, :timeout_retry => true}) do |xml|
         xml['ns1'].query do
           xml['ns1'].queryString query

data/lib/zuora_api/logins/basic.rb

@@ -1,15 +1,17 @@
 module ZuoraAPI
   class Basic < Login
-    attr_accessor :username, :password
-    def initialize(username: nil, password: nil, **keyword_args)
-      @username = username
-      @password = password
+    attr_accessor :username, :password, :session
+    def initialize(username: nil, password: nil, session: nil, **keyword_args)
+      self.username = username
+      self.password = password
+      self.current_session = session
+      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Request Basic Login but either 'Username' or 'Password' were not passed.") if self.current_session.blank? && (self.password.blank? && self.username.blank?)
       super
     end
 
-    def new_session( auth_type: :basic, debug: false)
+    def new_session(auth_type: :basic, debug: false)
       raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Basic Login, does not support Authentication of Type: #{auth_type}") if auth_type != :basic
-      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Basic Login requires username and password to be set.") if auth_type == :basic && (self.password.blank? && self.username.blank?)
+      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Request Basic Login but either 'Username' or 'Password' were not passed.") if (self.password.blank? && self.username.blank?)
 
       tries ||= 2
       request = Nokogiri::XML::Builder.new do |xml|
@@ -27,16 +29,16 @@ module ZuoraAPI
       
       input_xml = Nokogiri::XML(request.to_xml(:save_with => XML_SAVE_OPTIONS).strip)
       input_xml.xpath('//ns1:session', 'ns1' =>'http://api.zuora.com/').children.remove
-      Rails.logger.debug('Connect') {"Request Code: #{@response_query.code} SOAP XML: #{input_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}"} if debug
+      Rails.logger.debug('Connect') {"SOAP XML: #{input_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}"} if debug
       
-      @response_query = HTTParty.post(self.url,:body => request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, :headers => {'Content-Type' => "text/xml; charset=utf-8"}, :timeout => 10)
-      @output_xml = Nokogiri::XML(@response_query.body)
-      Rails.logger.debug('Connect') {"Response Code: #{@response_query.code} SOAP XML: #{@output_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}"} if debug   
+      response_query = HTTParty.post(self.url,:body => request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, :headers => {'Content-Type' => "text/xml; charset=utf-8"}, :timeout => 10)
+      output_xml = Nokogiri::XML(response_query.body)
+      Rails.logger.debug('Connect') {"Response Code: #{response_query.code} SOAP XML: #{output_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}"} if debug   
 
-      if !@response_query.success?
+      if !response_query.success?
         self.current_session = nil
-        if @output_xml.namespaces.size > 0  && @output_xml.xpath('//soapenv:Fault').size > 0
-          self.current_error = @output_xml.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text
+        if output_xml.namespaces.size > 0  && output_xml.xpath('//soapenv:Fault').size > 0
+          self.current_error = output_xml.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text
           if self.current_error.include?('deactivated')
             self.status = 'Deactivated'
             self.current_error = 'Deactivated user login, please check with Zuora tenant administrator'
@@ -75,19 +77,19 @@ module ZuoraAPI
             self.errors[:base] = self.current_error
           else
             self.status = 'Unknown'
-            self.current_error =  @output_xml.xpath('//faultstring').text if self.current_error.blank?
+            self.current_error =  output_xml.xpath('//faultstring').text if self.current_error.blank?
             self.errors[:base] = self.current_error
           end
 
         else
           self.status = 'Unknown'
-          self.current_error =  @output_xml.xpath('//faultstring').text if self.current_error.blank?
+          self.current_error =  output_xml.xpath('//faultstring').text if self.current_error.blank?
           self.errors[:base] = self.current_error
         end
       else             
         #Username & password combo
-        retrieved_session = @output_xml.xpath('//ns1:Session', 'ns1' =>'http://api.zuora.com/').text
-        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("No session found for api call.") if retrieved_session.blank?
+        retrieved_session = output_xml.xpath('//ns1:Session', 'ns1' =>'http://api.zuora.com/').text
+        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("No session found for api call.", response_query) if retrieved_session.blank?
         self.status = 'Active'
         self.current_session = retrieved_session
       end

data/lib/zuora_api/logins/oauth.rb

@@ -5,9 +5,9 @@ module ZuoraAPI
     def initialize(oauth_client_id: nil, oauth_secret: nil, bearer_token: nil, oauth_session_expires_at: nil, **keyword_args)
       self.oauth_client_id = oauth_client_id
       self.oauth_secret = oauth_secret
-      self.bearer_token = bearer_token if !bearer_token.blank?
-      self.oauth_session_expires_at = oauth_session_expires_at if !oauth_session_expires_at.blank?
-      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Request Oauth Login but either 'Oauth Client Id' or 'Oauth Secret' were not passed") if @oauth_client_id.blank? || @oauth_secret.blank?
+      self.bearer_token = bearer_token
+      self.oauth_session_expires_at = oauth_session_expires_at
+      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Request Oauth Login but either 'Oauth Client Id' or 'Oauth Secret' were not passed") if self.bearer_token.blank? && (self.oauth_client_id.blank? || self.oauth_secret.blank?)
       super
     end
 
@@ -16,10 +16,10 @@ module ZuoraAPI
         get_bearer_token()
       elsif auth_type == :basic
         get_bearer_token() if self.oauth_expired?
-        get_z_session()
+        get_z_session() if self.status == 'Active'
       else
         get_bearer_token()
-        get_z_session()
+        get_z_session() if self.status == 'Active'
       end
       return self.status
     end
@@ -66,6 +66,8 @@ module ZuoraAPI
 
     def get_bearer_token
       tries ||= 2
+      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Request Oauth Login but either 'Oauth Client Id' or 'Oauth Secret' were not passed") if self.oauth_client_id.blank? || self.oauth_secret.blank?
+
       output_json, response = self.rest_call(:method => :post, 
         :url => self.rest_endpoint.chomp('v1/').concat("oauth/token"), 
         :z_session => false,
@@ -83,15 +85,19 @@ module ZuoraAPI
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
       self.bearer_token = nil
       self.oauth_session_expires_at = nil
-      self.current_error = "Invalid login, please check client ID and Client Secret or URL endpoint"
-      self.status = 'Invalid Login'
-      return self.status
-    rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition  => ex
-      if errors.include?(ex.class)
-        raise ex
+      self.current_error = ex.message
+      case ex.message
+      when "Forbidden"
+        self.current_error = "The user associated to OAuth credential, '#{self.oauth_client_id}', set has been deactivated."
+        self.status = 'Deactivated'
       else
-        return [output_json, response]
+        self.current_error = "Invalid login, please check client ID and Client Secret or URL endpoint"
+        self.status = 'Invalid Login'
       end
+
+      return self.status
+    rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition  => ex
+      raise ex
     rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => ex
       if !(tries -= 1).zero?
         Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.6.255"
+  VERSION = "1.7.00"
 end

data/zuora_api.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency("nokogiri")
   spec.add_dependency("httparty")
   spec.add_dependency("rubyzip")
-  spec.add_dependency("railties", ">= 4.1.0", "< 5.2")
+  spec.add_dependency("railties", ">= 4.1.0", "< 6")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.6.255
+  version: 1.7.00
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,7 +131,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
 description: Gem that provides easy integration to Zuora
 email:
 - connect@zuora.com
@@ -186,8 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gem that provides easy integration to Zuora