zuora_api 1.6.3a → 1.6.3b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c292b68d4516c064e818be8fab8dede9b4991f2a
-  data.tar.gz: 766d2919def5cc16c08ffd787ac5e02efc2102cf
+SHA256:
+  metadata.gz: 7a5f3d85642928cb6296595c0d644bb39a4a91543d08536ce8cd500cfb848b60
+  data.tar.gz: bd2b2670f4997b05ddd9ad8f0be6be3c5376b5b373d68d695491d9d7a22249fe
 SHA512:
-  metadata.gz: be8d9fb020d087c989174466c52a0f9bd7c9188896a9a2f5dd6df84faba550c45950bdd9f1ad0179e5ae4fde8020b1aa6ea7f2aa7232820aecdc344cf0da0c24
-  data.tar.gz: 7987debce7355e853c3979b334ee83c27e8a5ccac83b9f2d3985fa703748759e36a6686967771d434bda6d006fd57222af197a846168a35af13cd12b72a0bcc1
+  metadata.gz: 59356375be3c396d05309b29859ece9d961312ad774abeb5f0138f89a29e004371cce349315ec53b8bf16230dd679e106bae18f629a9cadd0522d2c44dfcc096
+  data.tar.gz: e2b094fe4d063f7719a2f428290111e20e7e505a709522e71b885f662459534e2eb914c80e1e3d4635f9dc266cabf0d35fcae0b25495a50e4dc56dc8be85734e

data/.gitlab-ci.yml

@@ -1,5 +1,4 @@
-
-image: ruby:2.3.1
+image: ruby:2.6
 stages:
   - setup
   - test
@@ -41,8 +40,14 @@ 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 --match "[0-9]*\.[0-9]*\.[0-9]*" --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"
@@ -53,7 +58,6 @@ rubygems-deploy:
   - 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
-  - dpl --provider=rubygems --api-key=$API_KEY --gem=zuora_connect
   only:
     - master
-    - staging
+    - staging

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+## [1.6.28] - 2018-3-12
+### Added
+- Way to avoid force encoding for filedownload
+
+## [1.6.22] - 2019-01-03
+### Changed
+- get_identity method - supports ZSession auth now
+- updated rspecs accordingly
+
+## [1.6.18] - 2018-12-06
+### Added
+- zconnect_provider attribute accessor for identifying ZConnect cookies
+- Methods for Hallway integration:
+- get_identity
+- get_full_nav
+- set_nav
+- refresh_nav
+- get_oauth_client
+
+### Changed
+- The way environment and region are set
+
+

data/lib/insights_api/login.rb

@@ -42,7 +42,7 @@ module InsightsAPI
         if status['status']== "COMPLETE"
           signedUrl = status['signedUrl']
           return status
-        elsif status['status'] == "FAILED"
+        elsif status['status'] == "FAILED" || status['status'] == "ERROR"
           return status
         else
           sleep(60)

data/lib/zuora_api/exceptions.rb

@@ -86,6 +86,21 @@ module ZuoraAPI
       end
     end
 
+    class ZuoraAPITemporaryError < Error
+      attr_reader :code, :response
+      attr_writer :default_message
+
+      def initialize(message = nil,response=nil, code =nil)
+        @code = code
+        @message = message
+        @response = response
+        @default_message = "There is a temporary error with zuora system."
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end    
 
     class ZuoraAPIAuthenticationTypeError < Error
       attr_reader :code, :response

data/lib/zuora_api/login.rb

@@ -4,22 +4,203 @@ require "uri"
 
 module ZuoraAPI
   class Login
-    ENVIRONMENTS = [SANDBOX = 'Sandbox', PRODUCTION = 'Production', PREFORMANCE = 'Preformance', SERVICES = 'Services', UNKNOWN = 'Unknown' ]
-    REGIONS = [EU = 'EU', US = 'US' ]
-    XML_SAVE_OPTIONS = Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION 
-    attr_accessor :region, :url, :wsdl_number, :current_session, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :timeout_sleep
+    ENVIRONMENTS = [SANDBOX = 'Sandbox', PRODUCTION = 'Production', PREFORMANCE = 'Preformance', SERVICES = 'Services', UNKNOWN = 'Unknown', STAGING = 'Staging' ]
+    REGIONS = [EU = 'EU', US = 'US', NA = 'NA' ]
+    MIN_Endpoint = '91.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_READ_EXCEPTIONS = [Net::ReadTimeout, Errno::ECONNRESET, Errno::EPIPE]
+
+    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)
-      @url = url
-      @entity_id = entity_id
+      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.update_region
       self.update_environment
+      self.update_zconnect_provider
       @timeout_sleep = 5
     end
 
+    def get_identity(cookies)
+      zsession = cookies["ZSession"]
+      zconnect_accesstoken = get_zconnect_accesstoken(cookies)
+      begin
+        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(":")
+          begin
+            body = {'token' => encrypted_token}.to_json
+          rescue => ex
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Invalid ZConnect Cookie", {}, 400)
+          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)
+          else
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present", {}, 400)
+          end
+        end
+      rescue JSON::ParserError => ex
+        output_json = {}
+      end
+      raise_errors(type: :JSON, body: output_json, response: response)
+      return output_json
+    end
+
+    def get_full_nav(cookies)
+      zsession = cookies["ZSession"]
+      zconnect_accesstoken = get_zconnect_accesstoken(cookies)
+      begin
+        if !zsession.blank?
+          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?
+          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)
+          else
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present", {}, 400)
+          end
+        end
+      rescue JSON::ParserError => ex
+        output_json = {}
+      end
+      raise_errors(type: :JSON, body: output_json, response: response)
+      return output_json
+    end
+
+    def set_nav(state, cookies)
+      zsession = cookies["ZSession"]
+      zconnect_accesstoken = get_zconnect_accesstoken(cookies)
+      begin
+        if !zsession.blank?
+          response = HTTParty.put("https://#{self.hostname}/apps/v1/preference/navigation", :body => state.to_json, :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json'})
+          output_json = JSON.parse(response.body)
+        elsif !zconnect_accesstoken.blank?
+          response = HTTParty.post("https://#{self.hostname}/apps/zconnectsession/navigationstate", :body => state.to_json, :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)
+          else
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present", {}, 400)
+          end
+        end
+      rescue JSON::ParserError => ex
+        output_json = {}
+      end
+      raise_errors(type: :JSON, body: output_json, response: response)
+      return output_json
+    end
+
+    def refresh_nav(cookies)
+      zsession = cookies["ZSession"]
+      zconnect_accesstoken = get_zconnect_accesstoken(cookies)
+      begin
+        if !zsession.blank?
+          response = HTTParty.post("https://#{self.hostname}/apps/v1/navigation/fetch", :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json'})
+          output_json = JSON.parse(response.body)
+        elsif !zconnect_accesstoken.blank?
+          response = HTTParty.post("https://#{self.hostname}/apps/zconnectsession/refresh-navbarcache", :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)
+          else
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present", {}, 400)
+          end
+        end
+      rescue JSON::ParserError => ex
+        output_json = {}
+      end
+      raise_errors(type: :JSON, body: output_json, response: response)
+      return output_json
+    end
+
+    def get_zconnect_accesstoken(cookies)
+      accesstoken = nil
+      self.update_zconnect_provider
+      if !cookies[self.zconnect_provider].nil? && !cookies[self.zconnect_provider].empty?
+        accesstoken = cookies[self.zconnect_provider]
+      end
+      return accesstoken
+    end
+
+    def reporting_url(path)
+      map = {"US" => {"Sandbox" => "https://zconnectsandbox.zuora.com/api/rest/v1/",
+                      "Production" => "https://zconnect.zuora.com/api/rest/v1/",
+                      "Services"=> ""},
+             "EU" => {"Sandbox" => "https://zconnect.sandbox.eu.zuora.com/api/rest/v1/",
+                      "Production" => "https://zconnect.eu.zuora.com/api/rest/v1/",
+                      "Services"=> ""},
+             "NA" => {"Sandbox" => "https://zconnect.sandbox.na.zuora.com/api/rest/v1/",
+                      "Production" => "https://zconnect.na.zuora.com/api/rest/v1/",
+                      "Services"=> ""}
+      }
+      return map[zuora_client.region][zuora_client.environment].insert(-1, path)
+    end
+
+    # There are two ways to call this method. The first way is best.
+    # 1. Pass in cookies and optionally custom_authorities, name, and description
+    # 2. Pass in user_id, entity_ids, client_id, client_secret, and optionally custom_authorities, name, and description
+    # https://intranet.zuora.com/confluence/display/Sunburst/Create+an+OAuth+Client+through+API+Gateway#CreateanOAuthClientthroughAPIGateway-ZSession
+    def get_oauth_client (custom_authorities = [], info_name: "No Name", info_desc: "This client was created without a description.", user_id: nil, entity_ids: nil, client_id: nil, client_secret: nil, new_client_id: nil, new_client_secret: nil, cookies: nil)
+      authorization = ""
+      new_client_id = SecureRandom.uuid if new_client_id.blank?
+      new_client_secret = SecureRandom.hex(10) if new_client_secret.blank?
+
+      if !cookies.nil?
+        authorization = cookies["ZSession"]
+        authorization = "ZSession-a3N2w #{authorization}"
+        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)
+        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)
+        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'})
+        bearer_hash = JSON.parse(bearer_response.body)
+        bearer_token = bearer_hash["access_token"]
+        authorization = "Bearer #{bearer_token}"
+      end
+
+      if !authorization.blank? && !user_id.blank? && !entity_ids.blank?
+        endpoint = self.rest_endpoint("genesis/clients")
+        oauth_response = HTTParty.post(endpoint, :headers => {'authorization' => authorization, 'Content-Type' => 'application/json'}, :body => {'clientId' => new_client_id, 'clientSecret' => new_client_secret, 'userId' => user_id, 'entityIds' => entity_ids, 'customAuthorities' => custom_authorities, 'additionalInformation' => {'description' => info_desc, 'name' => info_name}}.to_json)
+        output_json = JSON.parse(oauth_response.body)
+        if oauth_response.code == 201
+          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)
+        else
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new(output_json["error"], {}, oauth_response.code)
+        end
+      else
+        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Insufficient credentials provided", {}, 400)
+      end
+    end
+
     def self.environments
       %w(Sandbox Production Services Performance Staging)
     end
@@ -32,7 +213,8 @@ module ZuoraAPI
       return {"US" => {"Sandbox" => "https://apisandbox.zuora.com/apps/services/a/",
                        "Production" => "https://www.zuora.com/apps/services/a/",
                        "Performance" => "https://pt1.zuora.com/apps/services/a/",
-                       "Services" => "https://services347.zuora.com/apps/services/a/"},
+                       "Services" => "https://services347.zuora.com/apps/services/a/",
+                       "Staging" => "https://staging2.zuora.com/apps/services/a/"},
               "EU" => {"Sandbox" => "https://sandbox.eu.zuora.com/apps/services/a/",
                        "Production" => "https://eu.zuora.com/apps/services/a/",
                        "Performance" => "https://pt1.eu.zuora.com/apps/services/a/",
@@ -44,43 +226,119 @@ module ZuoraAPI
             }
     end
 
+    def get_entity_id(entity_id: nil)
+      if entity_id.present?
+        entity_match = /[a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12}$/.match(entity_id)
+        if entity_match.blank?
+          raise "Entity length is wrong." if entity_id.length != 32
+          part_one, part_two, part_three, part_four, part_five = [entity_id[0..7], entity_id[8..11], entity_id[12..15], entity_id[16..19], entity_id[20..31]]
+          entity_id = "#{part_one}-#{part_two}-#{part_three}-#{part_four}-#{part_five}"
+        end
+      end
+      return entity_id
+    end
+
+    def update_region
+      if !self.hostname.blank?
+        if /(?<=\.|\/|^)(eu)(?=\.|\/|$)/ === self.hostname
+          self.region = "EU"
+        elsif /(?<=\.|\/|^)(na)(?=\.|\/|$)/ === self.hostname
+          self.region = "NA"
+        else
+          self.region = "US"
+        end
+      else # This will never happen
+        # raise "Can't update region because URL is blank"
+        self.region = "Unknown"
+      end
+    end
+
     def update_environment
       if !self.url.blank?
-        env_path = self.url.split('https://').last.split('.zuora.com').first
-        self.region = self.url.include?("eu.") ? "EU" : self.url.include?("na.") ? "NA" : "US"
-        if  env_path == 'apisandbox' || self.url.include?('sandbox')
+        if /(?<=\.|\/|-|^)(apisandbox|sandbox)(?=\.|\/|-|$)/ === self.hostname
           self.environment = 'Sandbox'
-        elsif env_path == 'www' || env_path == 'api' || self.url.include?('tls10.zuora.com') || self.url.include?('origin-www.zuora.com') || self.url.include?('zforsf.zuora.com') || self.url.include?('https://zuora.com') || self.url.include?('eu.zuora.com') || self.url.include?('https://na.zuora.com')
-          self.environment = 'Production'
-        elsif env_path.include?('service') || env_path.include?('ep-edge')
+        elsif /(?<=\.|\/|^)(service|services[\d]*|ep-edge)(?=\.|\/|$)/ === self.hostname
           self.environment = 'Services'
-        elsif env_path.include?('pt')
+        elsif /(?<=\.|\/|-|^)(pt[\d]*)(?=\.|\/|-|$)/ === self.hostname
           self.environment = 'Performance'
-        elsif env_path.include?('staging2') || env_path.include?('staging1')
-          self.region = 'US'
+        elsif /(?<=\.|\/|^)(staging1|staging2|stg)(?=\.|\/|$)/ === self.hostname
           self.environment = 'Staging'
+        elsif is_prod_env
+          self.environment = 'Production'
         else
           self.environment = 'Unknown'
         end
+      else # this will never happen
+        raise "Can't determine environment from blank URL"
+      end
+    end
+
+    def is_prod_env
+      is_prod = false
+      www_or_api = /(?<=\.|\/|^)(www|api)(?=\.|\/|$)/ === self.hostname
+      host_prefix_match = /(^|tls10\.|origin-www\.|zforsf\.|eu\.|na\.)(zuora\.com)/ === self.hostname
+      if www_or_api || host_prefix_match
+        is_prod = true
       end
+      return is_prod
+    end
+
+    def update_zconnect_provider
+      region = update_region
+      environment = update_environment
+      mappings = {"US" => {"Sandbox" => "ZConnectSbx", "KubeSTG" => "ZConnectDev", "KubeDEV" => "ZConnectDev", "KubePROD" => "ZConnectDev", "Services" => "ZConnectQA", "Production" => "ZConnectProd", "Performance" => "ZConnectPT1", "Staging" => "ZConnectQA"},
+                  "NA" => {"Sandbox" => "ZConnectSbxNA", "Services" => "ZConnectQANA", "Production" => "ZConnectProdNA", "Performance" => "ZConnectPT1NA"},
+                  "EU" => {"Sandbox" => "ZConnectSbxEU", "Services" => "ZConnectQAEU", "Production" => "ZConnectProdEU", "Performance" => "ZConnectPT1EU"},
+                  "Unknown" => {"Unknown" => "Unknown"}}
+      self.zconnect_provider = mappings[region][environment]
+      # raise "Can't find ZConnect Provider for #{region} region and #{environment} environment" if self.zconnect_provider.nil?
     end
 
     def aqua_endpoint(url="")
-      return  "#{self.url.split("/apps").first}/apps/api/".concat(url)
+      match = /.*(\/apps\/)/.match(self.url)
+      if !match.nil?
+        url_slash_apps_slash = match[0]
+      else
+        raise "self.url has no /apps in it"
+      end
+      return "#{url_slash_apps_slash}api/#{url}"
     end
 
     def rest_endpoint(url="")
-      if self.environment == 'Sandbox'
-        return self.region == "US" ? "https://rest.apisandbox.zuora.com/v1/".concat(url) : self.region == "EU" ? "https://rest.sandbox.eu.zuora.com/v1/".concat(url) : "https://rest.sandbox.na.zuora.com/v1/".concat(url)
-      elsif  self.environment == 'Production'
-        return  self.region == "US" ? "https://rest.zuora.com/v1/".concat(url) : self.region == "EU" ? "https://rest.eu.zuora.com/v1/".concat(url) : "https://rest.na.zuora.com/v1/".concat(url)
-      elsif self.environment == 'Services'
-        return  self.url.split('/')[0..2].join('/').concat('/apps/v1/').concat(url)
-      elsif self.environment == 'Performance'
-        return  self.url.split('/')[0..2].join('/').concat('/apps/v1/').concat(url)
-      else self.environment == 'Unknown'
-        return url
+      update_environment
+      endpoint = url
+
+      case self.environment
+      when 'Sandbox'
+        case self.region
+        when 'US'
+          endpoint = "https://rest.apisandbox.zuora.com/v1/".concat(url)
+        when 'EU'
+          endpoint = "https://rest.sandbox.eu.zuora.com/v1/".concat(url)
+        when 'NA'
+          endpoint = "https://rest.sandbox.na.zuora.com/v1/".concat(url)
+        end
+      when 'Production'
+        case self.region
+        when 'US'
+          endpoint = "https://rest.zuora.com/v1/".concat(url)
+        when 'EU'
+          endpoint = "https://rest.eu.zuora.com/v1/".concat(url)
+        when 'NA'
+          endpoint = "https://rest.na.zuora.com/v1/".concat(url)
+        end
+      when 'Performance'
+        endpoint = "https://rest.pt1.zuora.com/v1/".concat(url)
+      when 'Services'
+        https = /https:\/\/|http:\/\//.match(self.url)[0]
+        host = self.hostname
+        endpoint = "#{https}#{host}/apps/v1/#{url}"
+      when 'Staging'
+        endpoint = "https://rest-staging2.zuora.com/".concat(url)
+      when 'Unknown'
+        raise "Environment unknown, returning passed in parameter unaltered"
       end
+      return endpoint
     end
 
     def fileURL(url="")
@@ -91,15 +349,14 @@ module ZuoraAPI
       return self.wsdl_number > 68 ? '%Y-%m-%d' : '%Y-%m-%dT%H:%M:%S'
     end
 
-    def new_session(auth_type: :basic, debug: false) 
+    def new_session(auth_type: :basic, debug: false)
     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?
@@ -184,7 +441,15 @@ module ZuoraAPI
       else
         return output_xml, input_xml, response
       end
-    rescue Net::OpenTimeout, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError => ex
+    rescue *CONNECTION_EXCEPTIONS => ex
+      if !(tries -= 1).zero?
+        Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds")
+        sleep(self.timeout_sleep)
+        retry
+      else
+        raise ex
+      end
+    rescue *CONNECTION_READ_EXCEPTIONS => ex
       if !(tries -= 1).zero? && timeout_retry
         Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds")
         sleep(self.timeout_sleep)
@@ -219,8 +484,7 @@ module ZuoraAPI
           error = []
           success = []
           body.xpath('//ns1:result', 'ns1' =>'http://api.zuora.com/').each_with_index do |call, object_index|
-
-            if call.xpath('./ns1:Success', 'ns1' =>'http://api.zuora.com/').text == 'false'
+            if call.xpath('./ns1:Success', 'ns1' =>'http://api.zuora.com/').text == 'false' && call.xpath('./ns1:Errors', 'ns1' =>'http://api.zuora.com/').size > 0
               message = "#{call.xpath('./*/ns1:Code', 'ns1' =>'http://api.zuora.com/').text}::#{call.xpath('./*/ns1:Message', 'ns1' =>'http://api.zuora.com/').text}"
               error.push(message)
             else
@@ -232,22 +496,28 @@ module ZuoraAPI
         #By default response if not passed in for SOAP as all SOAP is 200
         if error.present?
           if error.class == String
-            if error == "INVALID_SESSION"
+            case error
+            when "INVALID_SESSION"
               raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{error}::#{message}", body, response.code )
-            end
-            if error == "REQUEST_EXCEEDED_LIMIT"
+            when "REQUEST_EXCEEDED_LIMIT"
               raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{error}::#{message}", body, response.code)
-            end
-            if error == "LOCK_COMPETITION"
+            when "LOCK_COMPETITION"
               raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", body, response.code)
-            end
-            if error.present?
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", body, response.code)
+            when "BATCH_FAIL_ERROR"
+              if message.include?("optimistic locking failed")
+                raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", body, response.code) 
+              else
+                raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", body, response.code)
+              end
+            when "TEMPORARY_ERROR"
+              raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new("#{error}::#{message}", body, response.code)
+            else
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", body, response.code) 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 
+              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
           end
@@ -258,6 +528,7 @@ module ZuoraAPI
         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
@@ -266,6 +537,10 @@ module ZuoraAPI
             raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new()
           end
 
+          if body['errorMessage']
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body['errorMessage'],body,response.code)
+          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)
           end
@@ -324,11 +599,18 @@ module ZuoraAPI
           end
         end
 
-        #Zuora REST Actions error (Create, Update, Delete)
+        #Zuora REST Actions error (Create, Update, Delete, Amend)
         if body.class == Array
           all_errors = body.select {|obj| !obj['Success'] || !obj['success'] }.map {|obj| obj['Errors'] || obj['errors'] }.compact
           all_success = body.select {|obj| obj['Success'] || obj['success']}.compact
 
+          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)
+            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  )
           end
@@ -388,9 +670,11 @@ module ZuoraAPI
 
       base = self.url.include?(".com") ? self.url.split(".com")[0].concat(".com") : self.url.split(".eu")[0].concat(".eu")
       url = object ? "#{base}/apps/api/describe/#{object}" : "#{base}/apps/api/describe/"
-      headers = !self.entity_id.blank? ? {"entityId" => self.entity_id, 'Content-Type' => "text/xml; charset=utf-8"} : {'Content-Type' => "text/xml; charset=utf-8"}
+      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
+
       output_xml = Nokogiri::XML(response.body)
       des_hash = Hash.new
       if object == nil
@@ -420,7 +704,7 @@ module ZuoraAPI
         end
         des_hash[:related_objects] = output_xml.xpath(".//related-objects").xpath(".//object").map{ |x| [x.xpath(".//name").text.to_sym, [ [:url, x.attributes["href"].value], [:label, x.xpath(".//name").text ] ].to_h] }.to_h
       end
-    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError => ex
+    rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => ex
       if !(tries -= 1).zero?
         Rails.logger.info("Describe - #{ex.class} Timed out will retry after 5 seconds")
         sleep(self.timeout_sleep)
@@ -428,17 +712,30 @@ module ZuoraAPI
       else
         raise ex
       end
+    rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
+      if !(tries -= 1).zero?
+        Rails.logger.info("Session expired. Starting new session.")
+        self.new_session
+        retry
+      else
+        raise ex
+      end
     rescue => ex
       raise ex
     else
       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, ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition], z_session: true, session_type: :basic, timeout_retry: false, timeout: 120, **keyword_args)
       tries ||= 2
-      headers["entityId"] = self.entity_id if !self.entity_id.blank?
+
+      if self.entity_id.present?
+        headers["Zuora-Entity-Ids"] = self.entity_id if headers.dig("Zuora-Entity-Ids").nil?
+        headers.delete_if { |key, value| ["entityId", "entityName"].include?(key.to_s) }
+      end
+
       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)
 
@@ -455,7 +752,7 @@ module ZuoraAPI
     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)
-      else 
+      else
         Rails.logger.debug("Rest Call - Session Bad Auth type")
         raise ex
       end
@@ -479,7 +776,15 @@ module ZuoraAPI
       end
     rescue ZuoraAPI::Exceptions::BadEntityError => ex
       raise ex
-    rescue Net::OpenTimeout, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError => ex
+    rescue *CONNECTION_EXCEPTIONS => ex
+      if !(tries -= 1).zero?
+        Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
+        sleep(self.timeout_sleep)
+        retry
+      else
+        raise ex
+      end
+    rescue *CONNECTION_READ_EXCEPTIONS => ex
       if !(tries -= 1).zero? && timeout_retry
         Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
         sleep(self.timeout_sleep)
@@ -539,7 +844,7 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(url: nil, headers: {}, count: 3, z_session: true, tempfile: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 2, timeout: 120, **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, force_encoding: true, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       #Make sure directory exists
@@ -552,100 +857,126 @@ module ZuoraAPI
         http = Net::HTTP.new(uri.host, uri.port)
         http.read_timeout = timeout #Seconds
         http.use_ssl = true  if uri.scheme.downcase == 'https'
-        headers = headers.merge({"Authorization" => self.get_session(prefix: true)}) if z_session
+        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?
+        end
 
         response_save = nil
-        http.request_get(uri.path, headers) do |response|
-          response_save = response
-          status_code = response.code if response
-
-          case response
-          when Net::HTTPNotFound
-            Rails.logger.fatal("404 - Not Found")
-            raise response
-
-          when Net::HTTPUnauthorized
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if count <= 0
-            Rails.logger.fatal("Unauthorized: Retry")
-            self.new_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)
-
-          when Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError
-            Rails.logger.fatal("#{response.class} timeout - retry")
-            return get_file(:url => url, :headers => headers, :count => count, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries - 1, :timeout => timeout)
-
-          when Net::HTTPClientError
-            Rails.logger.fatal("Login: #{self.username} Export")
-            raise response
-
-          when Net::HTTPOK
-            headers = {}
-            response.each_header do |k,v|
-              headers[k] = v
-            end
-            Rails.logger.debug("Headers: #{headers.to_s}")
-
-            size, export_progress = [0, 0]
-            encoding, type, full_filename = [nil, nil, nil]
-            if response.header["Content-Disposition"].present?
-              case response.header["Content-Disposition"]
-              when /.*; filename\*=.*/
-                full_filename = /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[2].strip
-                encoding = /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[1].strip
-              when /.*; filename=/
-                full_filename = /.*; filename=(.*)/.match(response.header["Content-Disposition"])[1].strip
+        begin
+          http.request_get(uri.request_uri, headers) do |response|
+            response_save = response
+            status_code = response.code if response
+
+            case response
+            when Net::HTTPNotFound
+              Rails.logger.fatal("404 - Not Found")
+              raise
+
+            when Net::HTTPUnauthorized
+              if count <= 0
+                if z_session
+                  raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
+                else
+                  raise
+                end
               end
-              file_ending = ".#{full_filename.partition(".").last}"
-            end
-            #If user supplied a filename use it, else default to content header filename, else default to uri pattern
-            filename =  full_filename.present? ? full_filename.split(file_ending).first : File.basename(uri.path).rpartition('.').first
-
-            if response.header["Content-Type"].present?
-              case response.header["Content-Type"]
-              when /.*;charset=.*/
-                type = /(.*);charset=(.*)/.match(response.header["Content-Type"])[1]
-                encoding = /(.*);charset=(.*)/.match(response.header["Content-Type"])[2]
-              else
-                type = response.header["Content-Type"]
-                encoding ||= 'UTF-8'
+              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)
+
+            when Net::HTTPClientError
+              raise
+
+            when Net::HTTPOK
+              headers = {}
+              response.each_header do |k,v|
+                headers[k] = v
+              end
+              Rails.logger.debug("Headers: #{headers.to_s}")
+              if output_file_name.present?
+                file_ending ||= output_file_name.end_with?(".csv.zip") ? ".csv.zip" : File.extname(output_file_name)
+                filename ||= File.basename(output_file_name, file_ending)
               end
-            end
-            Rails.logger.info("File: #{filename}#{file_ending}  #{encoding}  #{type}")
 
-            if response.header["Content-Length"].present?
-              export_size = response.header["Content-Length"].to_i
-            elsif response.header["ContentLength"].present?
-              export_size = response.header["ContentLength"].to_i
-            end
+              size, export_progress = [0, 0]
+              encoding, type, full_filename = [nil, nil, nil]
+              if response.header["Content-Disposition"].present?
+                case response.header["Content-Disposition"]
+                when /.*; filename\*=.*/
+                  full_filename ||= /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[2].strip
+                  encoding = /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[1].strip
+                when /.*; filename=/
+                  full_filename ||= /.*; filename=(.*)/.match(response.header["Content-Disposition"])[1].strip
+                else
+                  raise "Can't parse Content-Disposition header: #{response.header["Content-Disposition"]}"
+                end
+                file_ending ||= full_filename.end_with?(".csv.zip") ? ".csv.zip" : File.extname(full_filename)
+                filename ||= File.basename(full_filename, file_ending)
+              end
 
-            file_handle = nil
-            timestamp =  Time.now.to_i
-            if tempfile
-              require 'tempfile'
-              file_handle = ::Tempfile.new(["#{filename}_#{timestamp}", "#{file_ending}"], file_path)
-              file_handle.binmode
-            else
-              file_handle = File.new(file_path.join("#{filename}_#{timestamp}#{file_ending}"), "w+")
+              #If user supplied a filename use it, else default to content header filename, else default to uri pattern
+              file_ending ||= uri.path.end_with?(".csv.zip") ? ".csv.zip" : File.extname(uri.path)
+              filename ||= File.basename(uri.path, file_ending)
+
+              if response.header["Content-Type"].present?
+                case response.header["Content-Type"]
+                when /.*;charset=.*/
+                  type = /(.*);charset=(.*)/.match(response.header["Content-Type"])[1]
+                  encoding = /(.*);charset=(.*)/.match(response.header["Content-Type"])[2]
+                else
+                  type = response.header["Content-Type"]
+                  encoding ||= 'UTF-8'
+                end
+              end
+
+              if response.header["Content-Length"].present?
+                export_size = response.header["Content-Length"].to_i
+              elsif response.header["ContentLength"].present?
+                export_size = response.header["ContentLength"].to_i
+              end
+
+              Rails.logger.info("File: #{filename}#{file_ending}  #{encoding}  #{type} #{export_size}")
+
+              file_prefix = add_timestamp ? "#{filename}_#{Time.now.to_i}" : filename
+              if tempfile
+                require 'tempfile'
+                file_handle = ::Tempfile.new([file_prefix, "#{file_ending}"], file_path)
+              else
+                file_handle = File.new(file_path.join("#{file_prefix}#{file_ending}"), "w+")
+              end
               file_handle.binmode
-            end
 
-            response.read_body do |chunk|
-              file_handle << chunk.force_encoding(encoding)
+              response.read_body do |chunk|
+                if force_encoding
+                  file_handle << chunk.force_encoding(encoding)
+                else 
+                  file_handle << chunk
+                end
 
-              if defined?(export_size) && export_size != 0  && export_size.class == Integer
-                size += chunk.size
-                new_progress = (size * 100) / export_size
-                unless new_progress == export_progress
-                  Rails.logger.debug("Login: #{self.username} Export Downloading %s (%3d%%)" % [filename, new_progress])
+                if defined?(export_size) && export_size != 0  && export_size.class == Integer
+                  size += chunk.size
+                  new_progress = (size * 100) / export_size
+                  unless new_progress == export_progress
+                    Rails.logger.debug("Login: Export Downloading %s (%3d%%)" % [filename, new_progress])
+                  end
+                  export_progress = new_progress
                 end
-                export_progress = new_progress
               end
-            end
 
-            file_handle.close
-            Rails.logger.debug("Filepath: #{file_handle.path} Size: #{File.size(file_handle.path).to_f/1000000} mb")
+              file_handle.close
+              Rails.logger.debug("Filepath: #{file_handle.path} Size: #{File.size(file_handle.path).to_f/1000000} mb")
 
-            return file_handle
+              return file_handle
+            end
+          end
+        rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS).concat([Net::HTTPBadResponse]) => e
+          sleep(5)
+          if (timeout_retries -= 1) >= 0
+            Rails.logger.warn("Download Failed: #{e.class} : #{e.message}")
+            retry
+          else
+            raise
           end
         end
       rescue Exception => e
@@ -656,8 +987,6 @@ module ZuoraAPI
     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
@@ -680,7 +1009,7 @@ module ZuoraAPI
       end
 
       response_query = HTTParty.post(self.url, body: request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8"}, :timeout => 120)
-      
+
       output_xml = Nokogiri::XML(response_query.body)
       raise 'Export Creation Unsuccessful : ' + output_xml.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text if  output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
       id = output_xml.xpath('//ns1:Id', 'ns1' =>'http://api.zuora.com/').text
@@ -704,7 +1033,7 @@ module ZuoraAPI
       while result != "Completed"
         sleep 3
         response_query = HTTParty.post(self.url, body: confirmRequest.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8"}, :timeout => 120)
-  
+
         output_xml = Nokogiri::XML(response_query.body)
         result = output_xml.xpath('//ns2:Status',  'ns2' =>'http://object.api.zuora.com/').text
         status_code = response_query.code if response_query
@@ -712,7 +1041,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}")
@@ -731,7 +1059,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
@@ -756,7 +1083,7 @@ module ZuoraAPI
       response = Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
         http.request req
       end
-      
+
       Rails.logger.debug("Response #{response.code} #{response.message}: #{response.body}")
 
       result = JSON.parse(response.body)

data/lib/zuora_api/logins/basic.rb

@@ -27,11 +27,11 @@ 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 SOAP XML: #{input_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}"} if debug
+      Rails.logger.debug('Connect') {"Request Code: #{@response_query.code} 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 SOAP XML: #{@output_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}"} if debug   
+      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?
         self.current_session = nil
@@ -70,6 +70,9 @@ module ZuoraAPI
             self.status = 'Locked'
             self.current_error = 'Locked user login, please wait or navigate to Zuora to unlock user'
             self.errors[:username] = self.current_error
+          elsif self.current_error.include?('Entity not exist:')
+            self.status = 'Entity Missing'
+            self.errors[:base] = self.current_error
           else
             self.status = 'Unknown'
             self.current_error =  @output_xml.xpath('//faultstring').text if self.current_error.blank?
@@ -85,10 +88,11 @@ module ZuoraAPI
         #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?
+        self.status = 'Active'
         self.current_session = retrieved_session
       end
       return self.status
-    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => 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"}
         sleep(self.timeout_sleep)
@@ -98,6 +102,12 @@ module ZuoraAPI
         self.status = 'Timeout'
         return self.status
       end
+    rescue EOFError
+      if self.url.match?(/.*services\d{1,}.zuora.com*/)
+        self.current_error = "Services tenant '#{self.url.scan(/.*\/\/(services\d{1,}).zuora.com*/).last.first}' is no longer available."
+        self.status = 'Not Available'
+        return self.status
+      end
     end
   end
 end

data/lib/zuora_api/logins/oauth.rb

@@ -24,9 +24,14 @@ module ZuoraAPI
       return self.status
     end
 
+    def get_active_bearer_token
+      self.get_bearer_token if self.oauth_expired?
+      return self.bearer_token
+    end
+    
     def get_z_session(debug: false)
       tries ||= 2
-      headers = self.entity_id.present? ? {:entityId => self.entity_id } : {}    
+      headers = self.entity_id.present? ? {"Zuora-Entity-Ids" => self.entity_id } : {}    
       output_json, response = self.rest_call(:url => self.rest_endpoint("connections"), :session_type => :bearer, :headers => headers)
       self.current_session = response.headers.to_h['set-cookie'][0].split(';')[0].split('=',2)[1].gsub('%3D', '=')
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
@@ -47,7 +52,7 @@ module ZuoraAPI
       else
         return [output_json, response]
       end
-    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => 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"}
         sleep(self.timeout_sleep)
@@ -87,7 +92,7 @@ module ZuoraAPI
       else
         return [output_json, response]
       end
-    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => 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"}
         sleep(self.timeout_sleep)

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.6.3a"
+  VERSION = "1.6.3b"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.6.3a
+  version: 1.6.3b
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,6 +153,7 @@ files:
 - ".gitlab-ci.yml"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -185,8 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 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