zuora_api 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a2562d0e1fc0b764b99527767d97fb9704dca85
-  data.tar.gz: 00d14264577aa610bbfe43a6ee7a4e6fd96aba78
+  metadata.gz: 65fac01cabaf327d7cf9b15fbce13cfb784ecc28
+  data.tar.gz: 3d02d5242b1800403685ef3408891337de774f98
 SHA512:
-  metadata.gz: 6e798a1b0c0b48b485b07982a08d011d3792806743f10e8f7e897ca532e5ce0044a0ebe9e5a0ba2be8531b692a4a129cb74cfc0fe1a08b0ec024cbab2c517549
-  data.tar.gz: 59e269e8983d29af0fc7d8ff85ad4b36aa50a9539d90a4e2920c1774d21cb7422b00c64e008ebca18154ebfc80edc64f05549e247410d706f813b4d46fd1563b
+  metadata.gz: cb9dc6f29b775a6174470fd1c122da7951ba05a5b43a700cd23001e2b584654d337e2b5489b900f158d9a1ddab7d4eb3efc7ac02139df7925e410e81647159f8
+  data.tar.gz: e9f520c636e4c6f7b2a51088af86bd916fd6191102e4f555f16c2bc9af97f70a379af42cc067d5fd2a7a02a09efdc42a7ede6408560e66df11795ae168bb0bb3

data/.gitlab-ci.yml

@@ -47,17 +47,4 @@ rubygems-deploy:
   - curl -u $USERNAME:$PASSWORD https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials; chmod 0600 ~/.gem/credentials
   - gem push $version
   only:
-  - master
-
-rubygems-deploy:
-  stage: deploy
-  allow_failure: false
-  when: manual
-  script:
-  - 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:
-  - staging
+  - master

data/lib/zuora_api.rb

@@ -1,8 +1,9 @@
 require 'rails'
 require "zuora_api/login"
+require "zuora_api/logins/basic"
+require "zuora_api/logins/oauth"
 require 'zuora_api/exceptions'
 require "insights_api/login"
-require "zuora_api/metrics_helper"
 module ZuoraAPI
   # Your code goes here...
 end

data/lib/zuora_api/exceptions.rb

@@ -2,7 +2,6 @@ module ZuoraAPI
   module Exceptions
     class Error < StandardError; end
     class AuthorizationNotPerformed < Error; end
-
     class ZuoraAPISessionError < Error
       attr_reader :code, :response
       attr_writer :default_message
@@ -19,6 +18,24 @@ module ZuoraAPI
       end
     end
 
+    class BadEntityError < Error
+      attr_reader :code, :response, :errors, :successes
+      attr_writer :default_message
+
+      def initialize(message = nil,response=nil, code =nil, errors = [], successes = [])
+        @code = code
+        @message = message
+        @response = response
+        @default_message = "Error with Zuora Entity"
+        @errors = errors
+        @successes = successes
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
+
     class ZuoraAPIError < Error
       attr_reader :code, :response, :errors, :successes
       attr_writer :default_message
@@ -68,5 +85,22 @@ module ZuoraAPI
         @message || @default_message
       end
     end
+
+
+    class ZuoraAPIAuthenticationTypeError < 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 = "Authentication type is not supported by this Login"
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
   end
 end

data/lib/zuora_api/login.rb

@@ -6,29 +6,26 @@ 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 :username, :password, :region,:url, :wsdl_number, :current_session, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :timeout_sleep
+    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
 
-    def initialize(username: nil, password: nil, status: nil, url: nil, entity_id: nil, session: nil, **keyword_args)
-      @username = username
-      @password = password
+    def initialize(url: nil, entity_id: nil, session: nil, status: nil, **keyword_args)
       @url = url
       @entity_id = entity_id
-      @current_session = session
       @errors = Hash.new
+      @current_session = session
       @status = status.blank? ? "Active" : status
       @user_info = Hash.new
       self.update_environment
       @timeout_sleep = 5
     end
 
-
     def self.environments
-      %w(Sandbox Production Services Performance)
+      %w(Sandbox Production Services Performance Staging)
     end
 
     def self.regions
-      %w(US EU)
+      %w(US EU NA)
     end
 
     def self.endpoints
@@ -39,23 +36,28 @@ module ZuoraAPI
               "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/",
-                       "Services" => "https://services347.eu.zuora.com/apps/services/a/"}
+                       "Services" => "https://services347.eu.zuora.com/apps/services/a/"},
+              "NA" => {"Sandbox" => "https://sandbox.na.zuora.com/apps/services/a/",
+                       "Production" => "https://na.zuora.com/apps/services/a/",
+                       "Performance" => "https://pt1.na.zuora.com/apps/services/a/",
+                       "Services" => "https://services347.na.zuora.com/apps/services/a/"}
             }
     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" : "US"
+        self.region = self.url.include?("eu.") ? "EU" : self.url.include?("na.") ? "NA" : "US"
         if  env_path == 'apisandbox' || self.url.include?('sandbox')
           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')
+        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')
           self.environment = 'Services'
         elsif env_path.include?('pt')
           self.environment = 'Performance'
-        elsif env_path.include?('app-0')
+        elsif env_path.include?('staging2') || env_path.include?('staging1')
+          self.region = 'US'
           self.environment = 'Staging'
         else
           self.environment = 'Unknown'
@@ -69,9 +71,9 @@ module ZuoraAPI
 
     def rest_endpoint(url="")
       if self.environment == 'Sandbox'
-        return self.region == "US" ? "https://rest.apisandbox.zuora.com/v1/".concat(url) : "https://rest.sandbox.eu.zuora.com/v1/".concat(url)
+        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) : "https://rest.eu.zuora.com/v1/".concat(url)
+        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'
@@ -89,130 +91,45 @@ module ZuoraAPI
       return self.wsdl_number > 68 ? '%Y-%m-%d' : '%Y-%m-%dT%H:%M:%S'
     end
 
-    def new_session(debug: false)
-      tries ||= 2
-      request = Nokogiri::XML::Builder.new do |xml|
-        xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' =>"http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:api' => "http://api.zuora.com/" ) do
-          if (self.password.blank? && !self.current_session.blank?)
-            Rails.logger.debug("Method [Session]")
-            xml['SOAP-ENV'].Header do
-              xml['api'].SessionHeader do
-                xml['api'].session self.current_session
-              end
-            end
-            xml['SOAP-ENV'].Body do
-              xml['api'].getUserInfo
+    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}") 
+      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
+          when 'ZuoraAPI::Basic'
+            self.new_session(auth_type: :basic)
           else
-            xml['SOAP-ENV'].Header
-            xml['SOAP-ENV'].Body do
-              xml['api'].login do
-                xml['api'].username self.username
-                xml['api'].password self.password
-                xml['api'].entityId self.entity_id if !self.entity_id.blank?
-              end
-            end
+            raise "No Zuora Login Specified"
           end
         end
-      end
-
-
-      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
-
-      @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
-
-
-      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 self.current_error.include?('deactivated')
-            self.status = 'Deactivated'
-            self.current_error = 'Deactivated user login, please check with Zuora tenant administrator'
-            self.errors[:username] = self.current_error
-          elsif self.current_error.include?('inactive')
-            self.status = 'Inactive'
-            self.current_error = 'Inactive user login, please check with Zuora tenant administrator'
-            self.errors[:username] = self.current_error
-          elsif self.current_error.include?("invalid username or password") || self.current_error.include?("Invalid login. User name and password do not match.")
-            self.status = 'Invalid Login'
-            self.current_error = 'Invalid login, please check username and password or URL endpoint'
-            self.errors[:username] = self.current_error
-            self.errors[:password] = self.current_error
-          elsif self.current_error.include?('unsupported version')
-            self.status = 'Unsupported API Version'
-            self.current_error = 'Unsupported API version, please verify URL endpoint'
-            self.errors[:url] = self.current_error
-          elsif self.current_error.include?('invalid api version')
-            self.status = 'Invalid API Version'
-            self.current_error = 'Invalid API version, please verify URL endpoint'
-            self.errors[:url] = self.current_error
-          elsif self.current_error.include?('invalid session')
-            self.status = 'Invalid Session'
-            self.current_error = 'Session invalid, please update session and verify URL endpoint'
-            self.errors[:session] = self.current_error
-          elsif self.current_error.include?('Your IP address')
-            self.status = 'Restricted IP'
-            self.current_error = 'IP restricted, contact Zuora tenant administrator and remove IP restriction'
-            self.errors[:base] = self.current_error
-          elsif self.current_error.include?('This account has been locked')
-            self.status = 'Locked'
-            self.current_error = 'Locked user login, please wait or navigate to Zuora to unlock user'
-            self.errors[:username] = self.current_error
-          else
-            self.status = 'Unknown'
-            self.current_error =  @output_xml.xpath('//faultstring').text if self.current_error.blank?
-            self.errors[:base] = self.current_error
+        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if self.status != 'Active'
+        return prefix ? "ZSession #{self.current_session}" : self.current_session.to_s
+      when :bearer
+        case self.class.to_s
+        when 'ZuoraAPI::Oauth'
+          if self.bearer_token.blank? || self.oauth_expired?
+            self.new_session(auth_type: :bearer)
           end
-        else
-          self.current_error = "Code = #{@response_query.code} Message = #{@response_query.body.to_s}"
-          self.status = 'No Service'
+        when 'ZuoraAPI::Basic'
+          raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Basic Login, does not support Authentication of Type: #{auth_type}")
         end
-      else
-        #If Session only is used for Gem TODO Depercate
-        if (self.password.blank? && self.current_session.present?)
-          self.current_session = self.current_session
-          self.username        = @output_xml.xpath('//ns1:Username', 'ns1' =>'http://api.zuora.com/').text if self.username.blank?
-
-        #Username & password combo
-        elsif (self.password.present? && self.username.present?)
-          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.current_session = retrieved_session
-        end
-
-        self.current_error     = nil
-        self.status            = 'Active'
+        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if self.status != 'Active'
+        return prefix ? "Bearer #{self.bearer_token}" : self.bearer_token.to_s
       end
-      return self.status
-    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError => ex
-      if !(tries -= 1).zero?
-        Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
-        sleep(self.timeout_sleep)
-        retry
-      else
-        self.current_error = "Request timed out. Try again"
-        self.status = 'Timeout'
-        return self.status
-      end
-    end
-
-    def get_session
-      Rails.logger.debug("Create new session") if self.current_session.blank?
-      self.new_session if self.current_session.blank?
-      raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if self.status != 'Active'
-      return self.current_session
     end
 
-    def soap_call(ns1: 'ns1', ns2: 'ns2', batch_size: nil, single_transaction: false, debug: true, 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, ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition], z_session: true, timeout_retry: false, timeout: 120,**keyword_args)
       tries ||= 2
-      error_type = ""
-      start_time = Time.now
-
       xml = 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/",
@@ -221,7 +138,7 @@ module ZuoraAPI
                                  "xmlns:#{ns1}" => "http://api.zuora.com/") do
           xml['SOAP-ENV'].Header do
             xml["#{ns1}"].SessionHeader do
-              xml["#{ns1}"].session self.get_session
+              xml["#{ns1}"].session self.get_session(prefix: false, auth_type: :basic)
             end
             if single_transaction
               xml["#{ns1}"].CallOptions do
@@ -242,19 +159,17 @@ module ZuoraAPI
 
       input_xml = Nokogiri::XML(xml.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("Request SOAP XML: #{input_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}") if debug
 
       response = HTTParty.post(self.url,:body => xml.doc.to_xml(:save_with => XML_SAVE_OPTIONS).strip, :headers => {'Content-Type' => "text/xml; charset=utf-8"}, :timeout => timeout)
       output_xml = Nokogiri::XML(response.body)
-      Rails.logger.debug('Connect') {"Response SOAP XML: #{output_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}"} if debug
+      Rails.logger.debug("Response SOAP XML: #{output_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}") if debug
 
       raise_errors(type: :SOAP, body: output_xml, response: response)
-
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      error_type = "#{ex.class}"
       if !(tries -= 1).zero? && z_session
-        Rails.logger.debug {"Session Invalid"}
-        self.new_session
+        Rails.logger.debug("SOAP Call - Session Invalid")
+        self.new_session(auth_type: :basic)
         retry
       else
         if errors.include?(ex.class)
@@ -264,37 +179,23 @@ module ZuoraAPI
         end
       end
     rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition => ex
-      error_type = "#{ex.class}"
       if errors.include?(ex.class)
         raise ex
       else
         return output_xml, input_xml, response
       end
     rescue Net::OpenTimeout, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError => ex
-      error_type = "#{ex.class}"
       if !(tries -= 1).zero? && timeout_retry
-        Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
+        Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds")
         sleep(self.timeout_sleep)
         retry
       else
         raise ex
       end
     rescue => ex
-      error_type = "#{ex.class}"
       raise ex
     else
       return output_xml, input_xml, response
-    ensure
-      # Writing to telegraf
-      begin
-        end_time = Time.now
-        response_time = end_time - start_time
-        status_code = response.code if response
-        endpoint_name = url.present? ? URI(url).host : url
-        ::MetricsHelpers::MetricsHelpers.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "POST")
-      rescue => ex
-        Rails.logger.warn("Metric Failure: #{ex.class} - #{ex.message}")
-      end
     end
 
     def raise_errors(type: :SOAP, body: nil, response: nil)
@@ -344,7 +245,11 @@ module ZuoraAPI
               raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", body, response.code)
             end
           elsif error.class == Array
-            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)
+              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
           end
         end
 
@@ -357,6 +262,17 @@ module ZuoraAPI
           messages_array = (body["reasons"] || []).map {|error| error['message']}.compact
           codes_array = (body["reasons"] || []).map {|error| error['code']}.compact
 
+          if body['message'] == "No bearer token" && response.code == 400
+            raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new()
+          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
+
+          if body['error'] == 'Unauthorized' && body['status'] = 401
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", body, response.code)
+          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)
@@ -470,14 +386,10 @@ module ZuoraAPI
     def describe_call(object = nil)
       tries ||= 2
 
-      error_type = ""
-      start_time = Time.now
-
-      self.get_session
       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"}
-      response = HTTParty.get(url, :headers => headers , basic_auth: {:username => self.username, :password => self.password}, :timeout => 120)
+      response = HTTParty.get(url,  headers: {"Authorization" => self.get_session(prefix: true, auth_type: :basic)}.merge(headers), :timeout => 120)
 
       output_xml = Nokogiri::XML(response.body)
       des_hash = Hash.new
@@ -509,55 +421,48 @@ module ZuoraAPI
         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
-      error_type = "#{ex.class}"
       if !(tries -= 1).zero?
-        Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
+        Rails.logger.info("Describe - #{ex.class} Timed out will retry after 5 seconds")
         sleep(self.timeout_sleep)
         retry
       else
         raise ex
       end
     rescue => ex
-      error_type = "#{ex.class}"
       raise ex
     else
       return des_hash
-    ensure
-      # Writing to telegraf
-      begin
-        end_time = Time.now
-        response_time = end_time - start_time
-        status_code = response.code if response
-        endpoint_name = url.present? ? URI(url).host : url
-        ::MetricsHelpers::MetricsHelpers.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "GET")
-      rescue => ex
-        Rails.logger.warn("Metric Failure: #{ex.class} - #{ex.message}")
-      end
     end
 
-    def rest_call(method: :get, body: {},headers: {}, url: rest_endpoint("catalog/products?pageSize=4"), debug: true, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError, ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition], z_session: true, 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?
       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)
 
-      error_type = ""
-      start_time = Time.now
-      response = HTTParty::Request.new("Net::HTTP::#{method.to_s.capitalize}".constantize, url, body: body, headers: {'Content-Type' => "application/json; charset=utf-8"}.merge(z_session ? {"Authorization" => "ZSession #{self.get_session}"} : {}).merge(headers), timeout: timeout).perform
-
+      response = HTTParty::Request.new("Net::HTTP::#{method.to_s.capitalize}".constantize, url, body: body, headers: headers, timeout: timeout).perform
+      Rails.logger.debug("Response Code: #{response.code}") if debug
       begin
         output_json = JSON.parse(response.body)
       rescue JSON::ParserError => ex
         output_json = {}
       end
-      Rails.logger.debug('Connect') {"Response JSON: #{output_json}"} if debug && output_json.present?
+      Rails.logger.debug("Response JSON: #{output_json}") if debug && output_json.present?
 
       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)
+      else 
+        Rails.logger.debug("Rest Call - Session Bad Auth type")
+        raise ex
+      end
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      error_type = "#{ex.class}"
       if !(tries -= 1).zero? && z_session
-        Rails.logger.debug {"Session Invalid"}
-        self.new_session
+        Rails.logger.debug("Rest Call - Session Invalid")
+        self.new_session(auth_type: session_type)
         retry
       else
         if errors.include?(ex.class)
@@ -567,37 +472,25 @@ module ZuoraAPI
         end
       end
     rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition  => ex
-      error_type = "#{ex.class}"
       if errors.include?(ex.class)
         raise ex
       else
         return [output_json, response]
       end
+    rescue ZuoraAPI::Exceptions::BadEntityError => ex
+      raise ex
     rescue Net::OpenTimeout, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError => ex
-      error_type = "#{ex.class}"
       if !(tries -= 1).zero? && timeout_retry
-        Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
+        Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
         sleep(self.timeout_sleep)
         retry
       else
         raise ex
       end
     rescue => ex
-      error_type = "#{ex.class}"
       raise ex
     else
       return [output_json, response]
-    ensure
-      # Writing to telegraf
-      begin
-        end_time = Time.now
-        response_time = end_time - start_time
-        status_code = response.code if response
-        endpoint_name = url.present? ? URI(url).host : url
-        ::MetricsHelpers::MetricsHelpers.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "#{method.upcase}")
-      rescue => ex
-        Rails.logger.warn("Metric Failure: #{ex.class} - #{ex.message}")
-      end
     end
 
     def update_create_tenant
@@ -653,16 +546,13 @@ module ZuoraAPI
       require 'fileutils'
       FileUtils.mkdir_p(file_path) unless File.exists?(file_path)
 
-      error_type = ""
-      start_time = Time.now
-
       begin
         status_code = nil
         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'
-        headers = headers.merge({"Authorization" => "ZSession #{self.get_session}"}) if z_session
+        headers = headers.merge({"Authorization" => self.get_session(prefix: true)}) if z_session
 
         response_save = nil
         http.request_get(uri.path, headers) do |response|
@@ -753,40 +643,26 @@ module ZuoraAPI
             end
 
             file_handle.close
-            Rails.logger.info("Filepath: #{file_handle.path} Size: #{File.size(file_handle.path).to_f/1000000} mb")
+            Rails.logger.debug("Filepath: #{file_handle.path} Size: #{File.size(file_handle.path).to_f/1000000} mb")
 
             return file_handle
           end
         end
       rescue Exception => e
-        error_type = "#{e.class}"
-        Rails.logger.fatal('GetFile') {"Download Failed: #{response_save} - #{e.class} : #{e.message}"}
-        Rails.logger.fatal('GetFile') {"Download Failed: #{e.backtrace.join("\n")}"}
+        Rails.logger.fatal("Download Failed: #{response_save} - #{e.class} : #{e.message}")
+        Rails.logger.fatal("Download Failed: #{e.backtrace.join("\n")}")
         raise
-      ensure
-        # Writing to telegraf
-        begin
-          end_time = Time.now
-          response_time = end_time - start_time
-          status_code = response.code if response
-          endpoint_name = url.present? ? URI(url).host : url
-          ::MetricsHelpers::MetricsHelpers.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "GET")
-        rescue => ex
-          Rails.logger.warn("Metric Failure: #{ex.class} - #{ex.message}")
-        end
       end
     end
 
     def getDataSourceExport(query, extract: true, encrypted: false, zip: true)
-      error_type = ""
-      start_time = Time.now
-      Rails.logger.info('Export') {"Build export"}
-      Rails.logger.debug('Export query') {"#{query}"}
+      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
             xml['ns1'].SessionHeader do
-              xml['ns1'].session self.current_session
+              xml['ns1'].session self.get_session(prefix: false, auth_type: :basic)
             end
           end
           xml['SOAP-ENV'].Body do
@@ -803,24 +679,9 @@ module ZuoraAPI
         end
       end
 
-      begin
-        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)
-      rescue => e
-        error_type = "#{e.class}"
-      ensure
-        begin
-          end_time = Time.now
-          response_time = end_time - start_time
-          status_code = response.code if response
-          endpoint_name = url.present? ? URI(url).host : url
-          ::MetricsHelpers::MetricsHelpers.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "POST")
-        rescue => ex
-          Rails.logger.warn("Metric Failure: #{ex.class} - #{ex.message}")
-        end
-      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
 
@@ -828,7 +689,7 @@ module ZuoraAPI
         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
             xml['ns1'].SessionHeader do
-              xml['ns1'].session self.current_session
+              xml['ns1'].session self.get_session(prefix: false, auth_type: :basic)
             end
           end
           xml['SOAP-ENV'].Body do
@@ -840,39 +701,21 @@ module ZuoraAPI
       end
       result = 'Waiting'
 
-      start_time = Time.now
-      error_type = ""
-
       while result != "Completed"
         sleep 3
-        begin
-          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)
-        rescue => e
-          error_type = "#{e.class}"
-        end
+        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
         raise "Export Creation Unsuccessful : #{output_xml.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text}" if result.blank? || result == "Failed"
       end
 
-      begin
-        end_time = Time.now
-        response_time = end_time - start_time
-        status_code = response.code if response
-        endpoint_name = url.present? ? URI(url).host : url
-        ::MetricsHelpers::MetricsHelpers.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "POST")
-      rescue => ex
-        Rails.logger.warn("Metric Failure: #{ex.class} - #{ex.message}")
-      end
-
-
-
       file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
-      Rails.logger.info('Export') {'=====> Export finished'}
+      Rails.logger.debug('=====> Export finished')
       export_file = get_file(:url => self.fileURL(file_id))
       export_file_path = export_file.path
-      Rails.logger.info('Export') {"=====> Export path #{export_file.path}"}
+      Rails.logger.debug("=====> Export path #{export_file.path}")
 
       if extract && zip
         require "zip"
@@ -888,7 +731,7 @@ module ZuoraAPI
     end
 
     def query(query, parse = false)
-      Rails.logger.debug('query') {"Querying Zuora for #{query}"}
+      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
@@ -904,35 +747,17 @@ module ZuoraAPI
     end
 
     def createJournalRun(call)
-      error_type = ""
-      start_time = Time.now
-
       url = rest_endpoint("/journal-runs")
       uri = URI(url)
       req = Net::HTTP::Post.new(uri,initheader = {'Content-Type' =>'application/json'})
-      req.basic_auth self.username, self.password
+      req["Authorization"] = self.get_session(prefix: true)
       req.body = call
 
-      begin
-        response = Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
-          http.request req
-        end
-      rescue => e
-        error_type = "#{e.class}"
-      ensure
-        begin
-          end_time = Time.now
-          response_time = end_time - start_time
-          status_code = response.code if response
-          endpoint_name = url.present? ? URI(url).host : url
-          ::MetricsHelpers::MetricsHelpers.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "POST")
-        rescue => ex
-          Rails.logger.warn("Metric Failure: #{ex.class} - #{ex.message}")
-        end
+      response = Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
+        http.request req
       end
-
-      Rails.logger.debug('Journal Run') {"Response #{response.code} #{response.message}:
-        #{response.body}"}
+      
+      Rails.logger.debug("Response #{response.code} #{response.message}: #{response.body}")
 
       result = JSON.parse(response.body)
       if result["success"]
@@ -940,44 +765,24 @@ module ZuoraAPI
         return jrNumber
       else
         message = result["reasons"][0]["message"]
-        Rails.logger.debug('Journal Run') {"Journal Run failed with message #{message}"}
+        Rails.logger.error("Journal Run failed with message #{message}")
         return result
       end
 
     end
 
     def checkJRStatus(jrNumber)
-      error_type = ""
-
-      Rails.logger.info('Journal Run') {"Check for completion"}
-
-      start_time = Time.now
-
+      Rails.logger.info("Check for completion")
       url = rest_endpoint("/journal-runs/#{jrNumber}")
       uri = URI(url)
       req = Net::HTTP::Get.new(uri,initheader = {'Content-Type' =>'application/json'})
-      req.basic_auth self.username, self.password
+      req["Authorization"] = self.get_session(prefix: true)
 
-      begin
-        response = Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
-          http.request req
-        end
-      rescue => e
-        error_type = "#{e.class}"
-      ensure
-        begin
-          end_time = Time.now
-          response_time = end_time - start_time
-          status_code = response.code if response
-          endpoint_name = url.present? ? URI(url).host : url
-          ::MetricsHelpers::MetricsHelpers.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "GET")
-        rescue => ex
-          Rails.logger.warn("Metric Failure: #{ex.class} - #{ex.message}")
-        end
+      response = Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
+        http.request req
       end
 
       result = JSON.parse(response.body)
-
       if result["success"]
         if !(result["status"].eql? "Completed")
           sleep(20.seconds)
@@ -985,7 +790,7 @@ module ZuoraAPI
         return result["status"]
       else
         message = result["reasons"][0]["message"]
-        Rails.logger.info('Journal Run') {"Checking status of journal run failed with message #{message}"}
+        Rails.logger.info("Checking status of journal run failed with message #{message}")
       end
       return "failure"
     end

data/lib/zuora_api/logins/basic.rb

@@ -0,0 +1,103 @@
+module ZuoraAPI
+  class Basic < Login
+    attr_accessor :username, :password
+    def initialize(username: nil, password: nil, **keyword_args)
+      @username = username
+      @password = password
+      super
+    end
+
+    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
+      tries ||= 2
+      request = Nokogiri::XML::Builder.new do |xml|
+        xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' =>"http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:api' => "http://api.zuora.com/" ) do
+          xml['SOAP-ENV'].Header
+          xml['SOAP-ENV'].Body do
+            xml['api'].login do
+              xml['api'].username self.username
+              xml['api'].password self.password
+              xml['api'].entityId self.entity_id if !self.entity_id.blank?
+            end
+          end
+        end
+      end
+      
+      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
+      
+      @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   
+
+      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 self.current_error.include?('deactivated')
+            self.status = 'Deactivated'
+            self.current_error = 'Deactivated user login, please check with Zuora tenant administrator'
+            self.errors[:username] = self.current_error
+          elsif self.current_error.include?('inactive')
+            self.status = 'Inactive'
+            self.current_error = 'Inactive user login, please check with Zuora tenant administrator'
+            self.errors[:username] = self.current_error
+          elsif self.current_error.include?("invalid username or password") || self.current_error.include?("Invalid login. User name and password do not match.")
+            self.status = 'Invalid Login'
+            self.current_error = 'Invalid login, please check username and password or URL endpoint'
+            self.errors[:username] = self.current_error
+            self.errors[:password] = self.current_error
+          elsif self.current_error.include?('unsupported version')
+            self.status = 'Unsupported API Version'
+            self.current_error = 'Unsupported API version, please verify URL endpoint'
+            self.errors[:url] = self.current_error
+          elsif self.current_error.include?('invalid api version')
+            self.status = 'Invalid API Version'
+            self.current_error = 'Invalid API version, please verify URL endpoint'
+            self.errors[:url] = self.current_error
+          elsif self.current_error.include?('invalid session')
+            self.status = 'Invalid Session'
+            self.current_error = 'Session invalid, please update session and verify URL endpoint'
+            self.errors[:session] = self.current_error
+          elsif self.current_error.include?('Your IP address')
+            self.status = 'Restricted IP'
+            self.current_error = 'IP restricted, contact Zuora tenant administrator and remove IP restriction'
+            self.errors[:base] = self.current_error
+          elsif self.current_error.include?('This account has been locked')
+            self.status = 'Locked'
+            self.current_error = 'Locked user login, please wait or navigate to Zuora to unlock user'
+            self.errors[:username] = self.current_error
+          else
+            self.status = 'Unknown'
+            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.errors[:base] = self.current_error
+        end
+      else             
+        #Username & password combo
+        if (self.password.present? && self.username.present?)
+          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.current_session = retrieved_session
+        end    
+      end
+      return self.status
+    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
+      if !(tries -= 1).zero?
+        Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
+        sleep(self.timeout_sleep)
+        retry
+      else
+        self.current_error = "Request timed out. Try again"
+        self.status = 'Timeout'
+        return self.status
+      end
+    end
+  end
+end

data/lib/zuora_api/logins/oauth.rb

@@ -0,0 +1,106 @@
+module ZuoraAPI
+  class Oauth < Login
+    attr_accessor :oauth_client_id, :oauth_secret, :bearer_token, :oauth_session_expires_at
+    
+    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?
+      super
+    end
+
+    def new_session(auth_type: nil)
+      if auth_type ==  :bearer
+          get_bearer_token()
+      elsif auth_type == :basic
+          get_bearer_token() if self.oauth_expired?
+          get_z_session()
+      else
+          get_bearer_token()
+          get_z_session()
+      end
+      return self.status
+    end
+
+    def get_z_session(debug: false)
+      tries ||= 2
+      headers = self.entity_id.present? ? {:entityId => 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
+      if !(tries -= 1).zero?
+        Rails.logger.debug {"Session Invalid"}
+        self.new_session(auth_type: :bearer)
+        retry
+      else
+        if errors.include?(ex.class)
+          raise ex
+        else
+          return [output_json, response]
+        end
+      end
+    rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition  => ex
+      if errors.include?(ex.class)
+        raise ex
+      else
+        return [output_json, response]
+      end
+    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
+      if !(tries -= 1).zero?
+        Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
+        sleep(self.timeout_sleep)
+        retry
+      else
+        self.current_error = "Request timed out. Try again"
+        self.status = 'Timeout'
+        return self.status
+      end
+    end
+
+    def get_bearer_token
+      tries ||= 2
+      output_json, response = self.rest_call(:method => :post, 
+        :url => self.rest_endpoint.chomp('v1/').concat("oauth/token"), 
+        :z_session => false,
+        :session_type => :bearer,
+        :headers => {"content_type" => "application/x-www-form-urlencoded"},
+        :body => {"client_id"=> self.oauth_client_id, "client_secret"=>self.oauth_secret, "grant_type" =>"client_credentials"}
+      )
+
+      self.bearer_token = output_json["access_token"]
+      self.oauth_session_expires_at = Time.now.to_i + output_json["expires_in"].to_i
+      self.current_error = nil
+      self.status = 'Active'
+
+      return self.status
+    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
+      else
+        return [output_json, response]
+      end
+    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
+      if !(tries -= 1).zero?
+        Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
+        sleep(self.timeout_sleep)
+        retry
+      else
+        self.current_error = "Invalid login, please check client ID and Client Secret or URL endpoint"
+        self.status = 'Timeout'
+        return self.status
+      end
+    end
+
+    def oauth_expired?
+      return (self.oauth_session_expires_at.blank? || self.bearer_token.blank?) ? true : (self.oauth_session_expires_at.to_i < Time.now.to_i)
+    end
+  end
+end

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.5.2"
+  VERSION = "1.6.0"
 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.1")
+  spec.add_dependency("railties", ">= 4.1.0", "< 5.2")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-08-30 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.1'
+        version: '5.2'
   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.1'
+        version: '5.2'
 description: Gem that provides easy integration to Zuora
 email:
 - connect@zuora.com
@@ -163,7 +163,8 @@ files:
 - lib/zuora_api.rb
 - lib/zuora_api/exceptions.rb
 - lib/zuora_api/login.rb
-- lib/zuora_api/metrics_helper.rb
+- lib/zuora_api/logins/basic.rb
+- lib/zuora_api/logins/oauth.rb
 - lib/zuora_api/version.rb
 - zuora_api.gemspec
 homepage: https://connect.zuora.com

data/lib/zuora_api/metrics_helper.rb

@@ -1,12 +0,0 @@
-module MetricsHelpers
-
-  class MetricsHelpers
-    def self.write_to_telegraf(response_time: nil, status_code: nil, endpoint_name: nil, direction: nil, error_type: nil, function_name: nil, method_name: nil)
-      if Gem.loaded_specs.has_key?('zuora_connect') && defined?(::ZuoraConnect::AppInstance.write_to_telegraf)
-        Thread.current[:appinstance].present? ? app_instance = Thread.current[:appinstance].id : app_instance = 0
-        ZuoraConnect::AppInstanceBase.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "app_instance": app_instance, "function_name": function_name, "method_name": method_name)
-      end
-    end
-  end
-
-end