zuora_connect 1.4.53 → 1.4.54
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 54a27c75613c565ef35563af8842d558c4cbe7a3
|
4
|
+
data.tar.gz: c0575978522cf1a5a7244288da6971231e479831
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ac68d28481a7b55acc6292fd517cb4155d0643d81df7443395041254cdd298f4d131606029c5ad188ba3b664bce8fcdd6ea53adc655d779877680a9d90498ebb
|
7
|
+
data.tar.gz: 65063d17ab3edcad4452927c56471826effb0f62813137a5269c39473a9facc326eb7214c690c06acc3d3a451cc54c1100f4627d408f49da8923197d2d0c486a
|
@@ -26,10 +26,10 @@ module ZuoraConnect
|
|
26
26
|
if defined?(Redis.current)
|
27
27
|
cached_instance = Redis.current.get("AppInstance:#{self.id}")
|
28
28
|
if cached_instance.blank?
|
29
|
-
Rails.logger.
|
29
|
+
Rails.logger.info('Cached AppInstance Missing')
|
30
30
|
return {}
|
31
31
|
else
|
32
|
-
Rails.logger.
|
32
|
+
Rails.logger.info('Cached AppInstance Found')
|
33
33
|
return decrypt_data(data: cached_instance, rescue_return: {})
|
34
34
|
end
|
35
35
|
else
|
@@ -239,9 +239,8 @@ module ZuoraConnect
|
|
239
239
|
|
240
240
|
def get_catalog(page_size: 5, zuora_login: self.login_lookup(type: "Zuora").first, entity_id: nil)
|
241
241
|
entity_reference = entity_id.blank? ? 'Default' : entity_id
|
242
|
-
Rails.logger.
|
243
|
-
Rails.logger.
|
244
|
-
Rails.logger.debug("Fetch Catalog")
|
242
|
+
Rails.logger.info("Fetch Catalog")
|
243
|
+
Rails.logger.info("Zuora Entity: #{entity_id.blank? ? 'default' : entity_id}")
|
245
244
|
|
246
245
|
login = zuora_login.client(entity_reference)
|
247
246
|
|
@@ -255,9 +254,9 @@ module ZuoraConnect
|
|
255
254
|
Rails.logger.debug("Fetch Catalog URL #{url}")
|
256
255
|
output_json, response = login.rest_call(:debug => false, :url => url, :errors => [ZuoraAPI::Exceptions::ZuoraAPISessionError], :timeout_retry => true)
|
257
256
|
Rails.logger.debug("Fetch Catalog Response Code #{response.code}")
|
258
|
-
Rails.logger.debug("Fetch Catalog DATA #{output_json.to_json}")
|
259
257
|
|
260
258
|
if !output_json['success'] =~ (/(true|t|yes|y|1)$/i) || output_json['success'].class != TrueClass
|
259
|
+
Rails.logger.error("Fetch Catalog DATA #{output_json.to_json}")
|
261
260
|
raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error Getting Catalog: #{output_json}")
|
262
261
|
end
|
263
262
|
|
@@ -319,18 +318,22 @@ module ZuoraConnect
|
|
319
318
|
self.mode = ZuoraConnect.configuration.dev_mode_mode
|
320
319
|
else
|
321
320
|
if session.nil? || (!session.nil? && self.id != session["appInstance"].to_i) || session["#{self.id}::task_data"].blank? || ( session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
|
322
|
-
Rails.logger.
|
323
|
-
Rails.logger.
|
324
|
-
Rails.logger.
|
325
|
-
Rails.logger.
|
326
|
-
Rails.logger.
|
321
|
+
Rails.logger.info("[#{self.id}] REFRESHING - Session Nil") if session.nil?
|
322
|
+
Rails.logger.info("[#{self.id}] REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})") if (!session.nil? && self.id != session["appInstance"].to_i)
|
323
|
+
Rails.logger.info("[#{self.id}] REFRESHING - Task Data Blank") if session["#{self.id}::task_data"].blank?
|
324
|
+
Rails.logger.info("[#{self.id}] REFRESHING - No Time on Cookie") if session["#{self.id}::last_refresh"].blank?
|
325
|
+
Rails.logger.info("[#{self.id}] REFRESHING - Session Old") if (session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
|
327
326
|
self.refresh(session)
|
328
327
|
else
|
329
|
-
Rails.logger.
|
328
|
+
Rails.logger.info("[#{self.id}] REBUILDING")
|
330
329
|
build_task(session["#{self.id}::task_data"], session)
|
331
330
|
end
|
332
331
|
end
|
333
|
-
|
332
|
+
begin
|
333
|
+
I18n.locale = self.locale
|
334
|
+
rescue I18n::InvalidLocale => ex
|
335
|
+
Rails.logger.error("Invalid Locale: #{ex.message}")
|
336
|
+
end
|
334
337
|
Time.zone = self.timezone
|
335
338
|
@valid = true
|
336
339
|
return self
|
@@ -399,7 +402,7 @@ module ZuoraConnect
|
|
399
402
|
end
|
400
403
|
response_time = Time.now - start
|
401
404
|
|
402
|
-
Rails.logger.
|
405
|
+
Rails.logger.info("[#{self.id}] REFRESHING - Connect Request Time #{response_time.round(2).to_s}")
|
403
406
|
if response.code == 200
|
404
407
|
@last_refresh = Time.now.to_i
|
405
408
|
build_task(JSON.parse(response.body), session)
|
@@ -475,7 +478,7 @@ module ZuoraConnect
|
|
475
478
|
def refresh_oauth
|
476
479
|
count ||= 0
|
477
480
|
start = Time.now
|
478
|
-
Rails.logger.
|
481
|
+
Rails.logger.info("[#{self.id}] REFRESHING - OAuth")
|
479
482
|
params = {
|
480
483
|
:grant_type => "refresh_token",
|
481
484
|
:redirect_uri => ZuoraConnect.configuration.oauth_client_redirect_uri,
|
@@ -483,7 +486,7 @@ module ZuoraConnect
|
|
483
486
|
}
|
484
487
|
response = HTTParty.post("#{ZuoraConnect.configuration.url}/oauth/token",:body => params)
|
485
488
|
response_time = Time.now - start
|
486
|
-
Rails.logger.
|
489
|
+
Rails.logger.info("[#{self.id}] REFRESHING - OAuth in #{response_time.round(2).to_s}")
|
487
490
|
|
488
491
|
response_body = JSON.parse(response.body)
|
489
492
|
|
@@ -493,12 +496,12 @@ module ZuoraConnect
|
|
493
496
|
self.oauth_expires_at = Time.at(response_body["created_at"].to_i) + response_body["expires_in"].seconds
|
494
497
|
self.save
|
495
498
|
else
|
496
|
-
Rails.logger.
|
499
|
+
Rails.logger.fatal("REFRESHING - OAuth Failed - Code #{response.code}")
|
497
500
|
raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Refreshing Access Token", response.body, response.code)
|
498
501
|
end
|
499
502
|
rescue
|
500
503
|
if count < 3
|
501
|
-
Rails.logger.
|
504
|
+
Rails.logger.info("REFRESHING - OAuth Failed - Retrying(#{count})")
|
502
505
|
self.reload
|
503
506
|
sleep(5)
|
504
507
|
count += 1
|
@@ -18,7 +18,7 @@ module ZuoraConnect
|
|
18
18
|
check_instance
|
19
19
|
end
|
20
20
|
end
|
21
|
-
Rails.logger.
|
21
|
+
Rails.logger.info("[#{@appinstance.blank? ? "N/A" : @appinstance.id}] Authenticate App API Request Completed In - #{(Time.now - start_time).round(2)}s")
|
22
22
|
end
|
23
23
|
|
24
24
|
def authenticate_connect_app_request
|
@@ -36,9 +36,13 @@ module ZuoraConnect
|
|
36
36
|
#so data lookup provides a model method that can be overriden per app.
|
37
37
|
@appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
|
38
38
|
PaperTrail.whodunnit = session["#{@appinstance.id}::user::email"] if defined?(PaperTrail) && session["#{@appinstance.id}::user::email"].present?
|
39
|
-
|
39
|
+
begin
|
40
|
+
I18n.locale = session["#{@appinstance.id}::user::locale"] ? session["#{@appinstance.id}::user::locale"] : @appinstance.locale
|
41
|
+
rescue I18n::InvalidLocale => ex
|
42
|
+
Rails.logger.error("Invalid Locale: #{ex.message}")
|
43
|
+
end
|
40
44
|
Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
|
41
|
-
Rails.logger.
|
45
|
+
Rails.logger.info("[#{@appinstance.blank? ? "N/A" : @appinstance.id}] Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
|
42
46
|
end
|
43
47
|
|
44
48
|
def persist_connect_app_session
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: zuora_connect
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.4.
|
4
|
+
version: 1.4.54
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Connect Team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-10-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activerecord-session_store
|