zuora_api_oauth_alpha 2 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 697c4df3ca9920d3096ca7346cc65d78c04add6999c39b34c365fa6963b2495d
-  data.tar.gz: 329058a2fe9d56f9b2c621bb7c5fe4fa7c846246f73f2c681a7a67c242fe6311
+  metadata.gz: 23681ed767d2a4792cfbdc8dcd90e7d321a2da72fc1ed0a0b70afde2b9a28a0a
+  data.tar.gz: 67e56da78688019331fada20da226aa067a749282b849ef989d78c23cd298d9a
 SHA512:
-  metadata.gz: 543f66de8b66a9a349351cfe4611a807e61dfa9071ae3254300e32e60e2a2c03612a85760ecf90dad22e10ec225ccf15a55e12afcd7126ba19308b2d26bd80f2
-  data.tar.gz: 24e3dfce9db371969124cdc1ea410dbc29968ab9e56cffd29c002399fcc93eee626a3c1eda7a564f3f6f12a59c9d322fc39a9ae651d2b826622bb49167376427
+  metadata.gz: 051ad8ae8af0e74a761d1b5e20d57c913403d6826f23e1c52b3c9e5b161eb7ca9d71c111ee8ef6dc539adba56b6224f1311bb708be01aa853e13c8b342b42995
+  data.tar.gz: 02239767a1f473ea139a131efa932e102626597d74396725fec172f25d22c5cbf8b87431d404c6b0fe6c35c5e3d026a6122c9949beb5780ffe99de6cb951a2cf

data/lib/zuora_api_oauth_alpha/exceptions.rb

@@ -6,8 +6,10 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil)
+      def initialize(message = nil,response=nil, code =nil)
+        @code = code
         @message = message
+        @response = response
         @default_message = "Error with Zuora Session."
       end
 

data/lib/zuora_api_oauth_alpha/login.rb

@@ -97,8 +97,11 @@ module ZuoraAPI
     end
 
     def get_session(prefix = false, auth_type = :basic)
-      Rails.logger.debug("Create new session")
-      self.current_session = self.new_session(auth_type) if self.check_session(auth_type)
+      Rails.logger.debug("Checking for a cached session")
+      if self.check_session(auth_type) || self.current_session.nil?
+        self.current_session = self.new_session(auth_type) 
+      end
+      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new(self.current_error) if self.status == 'AuthenticationError'
       raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if self.status != 'Active'
       return self.authentication_prefix(auth_type) + self.current_session.to_s if prefix
       return self.current_session.to_s
@@ -180,74 +183,95 @@ module ZuoraAPI
         error   = body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
         message = body.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text
 
+        if error.blank? || message.blank?
+          error   = body.xpath('//faultcode').text
+          message = body.xpath('//faultstring').text
+        end
+        
         if error.blank? || message.blank?
           error   = body.xpath('//ns1:Code', 'ns1' =>'http://api.zuora.com/').text
           message = body.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text
         end
-        if error.blank? || message.blank?
-          error   = body.xpath('//faultcode').text
-          message = body.xpath('//faultstring').text
+
+        #Update/Create/Delete Calls with multiple requests and responses
+        if body.xpath('//ns1:result', 'ns1' =>'http://api.zuora.com/').size > 0 && body.xpath('//ns1:Errors', 'ns1' =>'http://api.zuora.com/').size > 0
+          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'
+              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
+              success.push(call.xpath('./ns1:Id', 'ns1' =>'http://api.zuora.com/').text)
+            end
+          end
         end
 
+        #By default response if not passed in for SOAP as all SOAP is 200
         if error.present?
-          if error == "INVALID_SESSION"
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{error}::#{message}")
-          end
-          if error == "REQUEST_EXCEEDED_LIMIT"
-            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{error}::#{message}")
-          end
-          if error == "LOCK_COMPETITION"
-            raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}")
-          end
-          if error.present?
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}")
+          if error.class == String
+            if error == "INVALID_SESSION"
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{error}::#{message}", body, response.present? ? response.code : nil )
+            end
+            if error == "REQUEST_EXCEEDED_LIMIT"
+              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{error}::#{message}", body, response.present? ? response.code : nil)
+            end
+            if error == "LOCK_COMPETITION"
+              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", body, response.present? ? response.code : nil)
+            end
+            if error.present?
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", body, response.present? ? response.code : nil)
+            end
+          elsif error.class == Array
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new(error.group_by {|v| v}.map {|k,v| "(#{v.size}x) - #{k}"}.join(', '), body, response.present? ? response.code : nil, error, success)
           end
         end
-
-      when :JSON
+ 
+      when :JSON        
         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
 
           #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(', ')}")
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", body, response.code)
           end
 
           #Zuora REST Create Amendment error #Authentication failed
           if body["faultcode"].present? && body["faultcode"] == "fns:INVALID_SESSION"
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body['faultstring']}")
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body['faultstring']}", body, response.code)
           end
 
           #Request exceeded limit
           if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(70)
-            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{messages_array.join(', ')}")
+            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{messages_array.join(', ')}", body, response.code)
           end
 
           #Locking contention
           if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(50)
-            raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{messages_array.join(', ')}")
+            raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{messages_array.join(', ')}", body, response.code)
           end
 
           #All Errors catch
-          if codes_array.size > 0
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{messages_array.join(', ')}")
+          if codes_array.size > 0 
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{messages_array.join(', ')}", body, response.code)
           end
 
           #Zuora REST Query Errors
           if body["faultcode"].present?
             case body["faultcode"]
             when "fns:MALFORMED_QUERY"
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}")
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
             when "fns:REQUEST_EXCEEDED_LIMIT"
-              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{body["faultcode"]}::#{body["faultstring"]}")
+              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
             when "fns:LOCK_COMPETITION"
-              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{body["faultcode"]}::#{body["faultstring"]}")
+              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
             when "INVALID_SESSION"
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body["faultcode"]}::#{body["faultstring"]}")
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
             else
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}")
-            end
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
+            end 
           end
 
           if body["Errors"].present? || body["errors"].present?
@@ -255,24 +279,24 @@ module ZuoraAPI
             (body["Errors"] || []).select { |obj| errors.push(obj["Message"]) }.compact
             (body["errors"] || []).select { |obj| errors.push(obj["Message"]) }.compact
             if errors.size > 0
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{errors.join(", ")}", nil, nil, errors)
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{errors.join(", ")}", body, response.code, errors)
             end
           end
         end
-
+ 
         #Zuora REST Actions error (Create, Update, Delete)
         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_errors.size > 0
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{all_errors.flatten.group_by {|error| error['Message']}.keys.uniq.join(' ')}", nil, nil, all_errors, all_success  )
+          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
         end
 
         #All other errors
         if response.code != 200
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{response.message}")
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{response.message}", body, response.code)
         end
       end
     end
@@ -381,10 +405,13 @@ module ZuoraAPI
       Rails.logger.debug('Connect') {"Response JSON: #{output_json}"} if debug && output_json.present?
 
       raise_errors(type: :JSON, body: output_json, response: response)
+    rescue ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError => ex
+      Rails.logger.debug {"Session Bad Auth type"}
+      raise ex
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
       if !(tries -= 1).zero? && z_session
         Rails.logger.debug {"Session Invalid"}
-        self.new_session
+        self.new_session(oauth_only ? :bearer : nil)
         retry
       else
         if errors.include?(ex.class)
@@ -567,7 +594,7 @@ module ZuoraAPI
           end
         end
       rescue Exception => e
-        Rails.logger.fatal('GetFile') {"Download Failed: #{response_save} - #{e.message}"}
+        Rails.logger.fatal('GetFile') {"Download Failed: #{response_save} - #{e.class} : #{e.message}"}
         Rails.logger.fatal('GetFile') {"Download Failed: #{e.backtrace.join("\n")}"}
         raise
       end
@@ -596,9 +623,10 @@ module ZuoraAPI
           end
         end
       end
+
+
       response_query = HTTParty.post(self.url, body: request.to_xml, 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
 

data/lib/zuora_api_oauth_alpha/logins/basic.rb

@@ -15,15 +15,21 @@ module ZuoraAPI
     end
 
     def authentication_prefix(auth_type = :basic)
+      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Basic Login, does not support Authentication of Type: #{auth_type}") if auth_type != :basic
       return "ZSession "
-      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Basic Login, does not support Authentication of Type: #{auth_type}")
     end
 
     def check_session(auth_type = :basic)
+      if auth_type != :basic
+        self.current_error = "Basic Login, does not support Authentication of Type: #{auth_type}"
+        self.status = 'AuthenticationError'
+        return false 
+      end
       return @z_session_token.blank?
     end
 
     def new_session(auth_type = :basic)
+      Rails.logger.debug("Create new session")
       raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Basic Login, does not support Authentication of Type: #{auth_type}") if auth_type != :basic
       begin 
         tries ||= 2

data/lib/zuora_api_oauth_alpha/logins/oauth.rb

@@ -44,7 +44,11 @@ module ZuoraAPI
     end
 
     def check_session(auth_type = :basic)
-      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Oauth Login, does not support Authentication of Type: #{auth_type}") if !@supported_authentication_types.include?(auth_type)
+      if !@supported_authentication_types.include?(auth_type)
+        self.current_error = "Oauth Login, does not support Authentication of Type: #{auth_type}"
+        self.status = 'AuthenticationError'
+        return false 
+      end
       return true if (auth_type != @stored_session_type || @stored_session_type.nil?)
       return false
     end
@@ -69,7 +73,7 @@ module ZuoraAPI
           response = HTTParty.get(self.rest_endpoint("connections"),  headers: {:Authorization => "Bearer " + @bearer_token}) 
         end
         if JSON.parse(response.body)["success"] ##.to_bool
-          @z_session_token = response.headers.to_h['set-cookie'][0].split(';')[0].split('=',2)[1]
+          self.z_session_token = response.headers.to_h['set-cookie'][0].split(';')[0].split('=',2)[1]
           @stored_session_type = :basic
           self.current_error     = nil
           self.status            = 'Active'
@@ -77,7 +81,6 @@ module ZuoraAPI
           self.current_error = JSON.parse(response.body)["reasons"][0]["message"]
           self.status = "Invalid"
         end
-
         return @z_session_token
       rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
         if !(tries -= 1).zero? && z_session
@@ -121,7 +124,7 @@ module ZuoraAPI
           url = URI.parse(encoded_url)
           response = HTTParty.post(url,:headers => {:content_type => "application/x-www-form-urlencoded"}, :body => {:client_id=>@oauth_client_id, :client_secret=>@oauth_secret, :grant_type=>"client_credentials"})
           if JSON.parse(response.body)["error"].nil?
-            @bearer_token = JSON.parse(response.body)["access_token"]
+            self.bearer_token = JSON.parse(response.body)["access_token"]
             @oauth_session_expires_at = Time.now.to_i + JSON.parse(response.body)["expires_in"].to_i
             @stored_session_type = :bearer
             self.current_error = nil

data/lib/zuora_api_oauth_alpha/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "2"
+  VERSION = "2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api_oauth_alpha
 version: !ruby/object:Gem::Version
-  version: '2'
+  version: '2.1'
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement