zuora_api 1.6.38 → 1.6.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db27825f234df0bf22824cd3100d5b4ed5f6565fc46cbbbab742dd62f2b02261
-  data.tar.gz: 298711ae7f8362f91c67c8f66fa3b685e7f8beb44eb3dbc9233225b5e5e6e1e4
+  metadata.gz: 327020361fd779fff57aad1eae6b019cb0d89117e5e6a2f43bcb6b73577287ab
+  data.tar.gz: 14b99e36c696d2b8627fce73ad56ae24e6e49e3805a480f532d9a42837638405
 SHA512:
-  metadata.gz: cf541c7e898feec11cc498a81fa1f3eacb9920d8315eee5feca4001ea656de14c71b14fcca73ada4065c80950aa25b490d054b61c59432588d60e8a7fae22eeb
-  data.tar.gz: 2d4f8d1c8c141e3646eb25deefac6acd288ff2e996d73736ce96c8f8d9a3844079bfff08b08f2af2f07cc205fbd870b8896af61bb77b72e97aac68e859627c36
+  metadata.gz: 1cbb02c248d3cf410fdb16b4dfaabe11b7cb5328c8c0ed665aa7bc878221a23b1db8cd1733f8c0f71a171deee979452c36885c783262e9c9c07fca3bc8e831ce
+  data.tar.gz: 13262076080a1aadfaa9bc40921c8287cf6c921e7dcd93d481b57d83d1878cc6b639f19f985f8814dbd90d113c8212cbe5b4519114e0c725dfad28224ae98545

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zuora_api (1.6.38)
+    zuora_api (1.6.39)
       httparty
       nokogiri
       railties (>= 4.1.0, < 5.2)

data/lib/zuora_api/login.rb

@@ -13,18 +13,24 @@ module ZuoraAPI
     CONNECTION_READ_EXCEPTIONS = [Net::ReadTimeout, Errno::ECONNRESET, Errno::EPIPE]
     ZUORA_API_ERRORS = [ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition, ZuoraAPI::Exceptions::ZuoraAPITemporaryError, ZuoraAPI::Exceptions::ZuoraDataIntegrity]
     
-    attr_accessor :region, :url, :wsdl_number, :current_session, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :timeout_sleep, :hostname, :zconnect_provider
+    attr_accessor :region, :url, :wsdl_number, :current_session, :bearer_token, :oauth_session_expires_at, :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)
+    def initialize(url: nil, entity_id: nil, session: nil, status: nil, bearer_token: nil, oauth_session_expires_at: nil, **keyword_args)
       raise "URL is nil or empty, but URL is required" if url.nil? || url.empty?
       # raise "URL is improper. URL must contain zuora.com, zuora.eu, or zuora.na" if /zuora.com|zuora.eu|zuora.na/ === url
-      @url = url.gsub(/(\d{2}\.\d)$/, MIN_Endpoint) if MIN_Endpoint.to_f > url.scan(/(\d{2}\.\d)$/).dig(0,0).to_f 
-      @hostname = /(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url)[0] if !/(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url).nil?
-      @entity_id = get_entity_id(entity_id: entity_id)
-      @errors = Hash.new
-      @current_session = session
-      @status = status.blank? ? "Active" : status
-      @user_info = Hash.new
+      self.hostname = /(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url)[0] if !/(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url).nil?
+      if !/apps\/services\/a\/\d{2}\.\d$/.match(url.strip)
+        self.url = "https://#{hostname}/apps/services/#{MIN_Endpoint}"
+      elsif MIN_Endpoint.to_f > url.scan(/(\d{2}\.\d)$/).dig(0,0).to_f 
+        self.url = url.gsub(/(\d{2}\.\d)$/, MIN_Endpoint)
+      end
+      self.entity_id = get_entity_id(entity_id: entity_id)
+      self.errors = Hash.new
+      self.current_session = session
+      self.bearer_token = bearer_token
+      self.oauth_session_expires_at = oauth_session_expires_at
+      self.status = status.blank? ? "Active" : status
+      self.user_info = Hash.new
       self.update_region
       self.update_environment
       self.update_zconnect_provider
@@ -634,7 +640,7 @@ module ZuoraAPI
         end
 
         #All other errors
-        if response.code != 200
+        if ![200,201].include?(response.code)
           if response.code == 429
             raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
           else
@@ -768,7 +774,7 @@ module ZuoraAPI
       raise_errors(type: :JSON, body: output_json, response: response)
     rescue ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError => ex
       if self.class.to_s == 'ZuoraAPI::Oauth'
-        self.rest_call(method: method.to_sym, url: url, debug: debug, errors: errors, z_session: z_session, session_type: :bearer, timeout_retry: timeout_retry, timeout: timeout)
+        self.rest_call(method: method.to_sym, url: url, body: body, debug: debug, errors: errors, z_session: z_session, session_type: :bearer, timeout_retry: timeout_retry, timeout: timeout)
       else
         Rails.logger.debug("Rest Call - Session Bad Auth type")
         raise ex

data/lib/zuora_api/logins/basic.rb

@@ -2,8 +2,8 @@ module ZuoraAPI
   class Basic < Login
     attr_accessor :username, :password
     def initialize(username: nil, password: nil, **keyword_args)
-      @username = username
-      @password = password
+      self.username = username
+      self.password = password
       super
     end
 

data/lib/zuora_api/logins/oauth.rb

@@ -5,9 +5,9 @@ module ZuoraAPI
     def initialize(oauth_client_id: nil, oauth_secret: nil, bearer_token: nil, oauth_session_expires_at: nil, **keyword_args)
       self.oauth_client_id = oauth_client_id
       self.oauth_secret = oauth_secret
-      self.bearer_token = bearer_token if !bearer_token.blank?
-      self.oauth_session_expires_at = oauth_session_expires_at if !oauth_session_expires_at.blank?
-      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Request Oauth Login but either 'Oauth Client Id' or 'Oauth Secret' were not passed") if @oauth_client_id.blank? || @oauth_secret.blank?
+      self.bearer_token = bearer_token
+      self.oauth_session_expires_at = oauth_session_expires_at
+      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Request Oauth Login but either 'Oauth Client Id' or 'Oauth Secret' were not passed") if self.bearer_token.blank? && (self.oauth_client_id.blank? || self.oauth_secret.blank?)
       super
     end
 
@@ -66,6 +66,8 @@ module ZuoraAPI
 
     def get_bearer_token
       tries ||= 2
+      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Request Oauth Login but either 'Oauth Client Id' or 'Oauth Secret' were not passed") if self.oauth_client_id.blank? || self.oauth_secret.blank?
+
       output_json, response = self.rest_call(:method => :post, 
         :url => self.rest_endpoint.chomp('v1/').concat("oauth/token"), 
         :z_session => false,

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.6.38"
+  VERSION = "1.6.39"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.6.38
+  version: 1.6.39
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-26 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler