zuora_connect 1.5.20 → 1.5.21
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/zuora_connect/app_instance_base.rb +21 -8
- data/lib/zuora_connect/version.rb +1 -1
- metadata +29 -29
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1efbacf2ae54f697174a0bd663dd95a4a26322bf
|
4
|
+
data.tar.gz: 91e542803cf1d55ccf74f1e06c3afe09c8150cc8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 61f13ab9fa62ba8ce4215da13e67bbe3172216b12a6128a2e94e5036bf8682c5555c14d92238c2dce5d38768a394b701843e0ef763c4c10f40381d4a8d8913ae
|
7
|
+
data.tar.gz: 64fdee29a57403098e052397a6804bf7aaf8f6aefeb5126389f2adc7ed054feb4083bdb3303ff1e94804704fa487f4308a28039bafe9548b1ba3d4ca66322744
|
@@ -27,7 +27,7 @@ module ZuoraConnect
|
|
27
27
|
cached_instance = Redis.current.get("AppInstance:#{self.id}")
|
28
28
|
if cached_instance.blank?
|
29
29
|
Rails.logger.info('Cached AppInstance Missing')
|
30
|
-
return
|
30
|
+
return session
|
31
31
|
else
|
32
32
|
Rails.logger.info('Cached AppInstance Found')
|
33
33
|
return decrypt_data(data: cached_instance, rescue_return: {})
|
@@ -355,13 +355,26 @@ module ZuoraConnect
|
|
355
355
|
|
356
356
|
build_task(mock_task_data, session)
|
357
357
|
else
|
358
|
-
if session.
|
359
|
-
Rails.logger.info("[#{self.id}] REFRESHING - Session
|
360
|
-
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)
|
361
|
-
Rails.logger.info("[#{self.id}] REFRESHING - Task Data Blank") if session["#{self.id}::task_data"].blank?
|
362
|
-
Rails.logger.info("[#{self.id}] REFRESHING - No Time on Cookie") if session["#{self.id}::last_refresh"].blank?
|
363
|
-
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 )
|
358
|
+
if session.empty?
|
359
|
+
Rails.logger.info("[#{self.id}] REFRESHING - Session Empty")
|
364
360
|
self.refresh(session)
|
361
|
+
|
362
|
+
elsif (self.id != session["appInstance"].to_i)
|
363
|
+
Rails.logger.info("[#{self.id}] REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})")
|
364
|
+
self.refresh(session)
|
365
|
+
|
366
|
+
elsif session["#{self.id}::task_data"].blank?
|
367
|
+
Rails.logger.info("[#{self.id}] REFRESHING - Task Data Blank")
|
368
|
+
self.refresh(session)
|
369
|
+
|
370
|
+
elsif session["#{self.id}::last_refresh"].blank?
|
371
|
+
Rails.logger.info("[#{self.id}] REFRESHING - No Time on Cookie")
|
372
|
+
self.refresh(session)
|
373
|
+
|
374
|
+
elsif session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i
|
375
|
+
Rails.logger.info("[#{self.id}] REFRESHING - Session Old")
|
376
|
+
self.refresh(session)
|
377
|
+
|
365
378
|
else
|
366
379
|
Rails.logger.info("[#{self.id}] REBUILDING")
|
367
380
|
build_task(session["#{self.id}::task_data"], session)
|
@@ -534,7 +547,7 @@ module ZuoraConnect
|
|
534
547
|
def refresh_oauth
|
535
548
|
count ||= 0
|
536
549
|
start = Time.now
|
537
|
-
Rails.logger.
|
550
|
+
Rails.logger.debug("[#{self.id}] REFRESHING - OAuth")
|
538
551
|
params = {
|
539
552
|
:grant_type => "refresh_token",
|
540
553
|
:redirect_uri => ZuoraConnect.configuration.oauth_client_redirect_uri,
|
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.5.
|
4
|
+
version: 1.5.21
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Connect Team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-02-
|
11
|
+
date: 2018-02-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: apartment
|
@@ -301,44 +301,44 @@ signing_key:
|
|
301
301
|
specification_version: 4
|
302
302
|
summary: Summary of Connect.
|
303
303
|
test_files:
|
304
|
+
- test/models/zuora_connect/app_instance_test.rb
|
305
|
+
- test/test_helper.rb
|
304
306
|
- test/zuora_connect_test.rb
|
307
|
+
- test/lib/generators/zuora_connect/datatable_generator_test.rb
|
308
|
+
- test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
|
305
309
|
- test/dummy/public/500.html
|
306
|
-
- test/dummy/public/404.html
|
307
310
|
- test/dummy/public/favicon.ico
|
311
|
+
- test/dummy/public/404.html
|
308
312
|
- test/dummy/public/422.html
|
309
|
-
- test/dummy/Rakefile
|
310
|
-
- test/dummy/README.rdoc
|
311
|
-
- test/dummy/app/views/layouts/application.html.erb
|
312
|
-
- test/dummy/app/helpers/application_helper.rb
|
313
|
-
- test/dummy/app/assets/stylesheets/application.css
|
314
|
-
- test/dummy/app/assets/javascripts/application.js
|
315
|
-
- test/dummy/app/controllers/application_controller.rb
|
316
|
-
- test/dummy/bin/rake
|
317
|
-
- test/dummy/bin/bundle
|
318
|
-
- test/dummy/bin/rails
|
319
|
-
- test/dummy/bin/setup
|
320
|
-
- test/dummy/config.ru
|
321
|
-
- test/dummy/config/environment.rb
|
322
313
|
- test/dummy/config/secrets.yml
|
323
314
|
- test/dummy/config/application.rb
|
324
|
-
- test/dummy/config/
|
315
|
+
- test/dummy/config/environments/test.rb
|
325
316
|
- test/dummy/config/environments/production.rb
|
326
317
|
- test/dummy/config/environments/development.rb
|
327
|
-
- test/dummy/config/
|
328
|
-
- test/dummy/config/
|
318
|
+
- test/dummy/config/boot.rb
|
319
|
+
- test/dummy/config/initializers/cookies_serializer.rb
|
320
|
+
- test/dummy/config/initializers/wrap_parameters.rb
|
329
321
|
- test/dummy/config/initializers/mime_types.rb
|
330
|
-
- test/dummy/config/initializers/filter_parameter_logging.rb
|
331
|
-
- test/dummy/config/initializers/backtrace_silencers.rb
|
332
322
|
- test/dummy/config/initializers/session_store.rb
|
333
|
-
- test/dummy/config/initializers/cookies_serializer.rb
|
334
323
|
- test/dummy/config/initializers/inflections.rb
|
335
|
-
- test/dummy/config/initializers/
|
324
|
+
- test/dummy/config/initializers/backtrace_silencers.rb
|
325
|
+
- test/dummy/config/initializers/filter_parameter_logging.rb
|
336
326
|
- test/dummy/config/initializers/assets.rb
|
337
|
-
- test/dummy/config/
|
327
|
+
- test/dummy/config/locales/en.yml
|
328
|
+
- test/dummy/config/environment.rb
|
338
329
|
- test/dummy/config/routes.rb
|
339
|
-
- test/
|
340
|
-
- test/
|
341
|
-
- test/
|
342
|
-
- test/
|
330
|
+
- test/dummy/config/database.yml
|
331
|
+
- test/dummy/README.rdoc
|
332
|
+
- test/dummy/app/views/layouts/application.html.erb
|
333
|
+
- test/dummy/app/assets/stylesheets/application.css
|
334
|
+
- test/dummy/app/assets/javascripts/application.js
|
335
|
+
- test/dummy/app/controllers/application_controller.rb
|
336
|
+
- test/dummy/app/helpers/application_helper.rb
|
337
|
+
- test/dummy/Rakefile
|
338
|
+
- test/dummy/config.ru
|
339
|
+
- test/dummy/bin/bundle
|
340
|
+
- test/dummy/bin/setup
|
341
|
+
- test/dummy/bin/rails
|
342
|
+
- test/dummy/bin/rake
|
343
343
|
- test/fixtures/zuora_connect/app_instances.yml
|
344
|
-
- test/
|
344
|
+
- test/integration/navigation_test.rb
|