zuora_connect 1.7.12 → 1.7.13
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: 57c64ea79f4b3a6ba77116c1676bb251646a437b
|
4
|
+
data.tar.gz: 0cd25ac6227fe07ddb2c65c20a0be9a9a624e58a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d2cf687aa779cd9b95a6c941b9e6801b9d078ee1f1e72bfe4dcb5a598c940551df2da7ea384764c89eb3f59e36adedc2df6f025c2d0266abca276750f437d1dd
|
7
|
+
data.tar.gz: 7df46ffe2704050c65f1373e24c2bd61eee127dd4aa90144b2b81ac2f11b7325f60c8e1a78f3dbad3b81a1e4f2f888d90120bd323db10555dc0b8668e0eaa45b
|
@@ -122,7 +122,7 @@ module ZuoraConnect
|
|
122
122
|
Rails.logger.add(log_level, self.new_session_message)
|
123
123
|
end
|
124
124
|
|
125
|
-
def refresh(session =
|
125
|
+
def refresh(session = {})
|
126
126
|
refresh_count ||= 0
|
127
127
|
start = Time.now
|
128
128
|
response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
|
@@ -205,6 +205,7 @@ module ZuoraConnect
|
|
205
205
|
|
206
206
|
#### START Task Mathods ####
|
207
207
|
def build_task(task_data: {}, session: {})
|
208
|
+
session = {} if session.blank?
|
208
209
|
self.task_data = task_data
|
209
210
|
self.mode = self.task_data["mode"]
|
210
211
|
self.task_data.each do |k,v|
|
@@ -236,8 +237,8 @@ module ZuoraConnect
|
|
236
237
|
end
|
237
238
|
end
|
238
239
|
rescue => ex
|
239
|
-
Rails.logger.error("Task Data: #{task_data}")
|
240
|
-
Rails.logger.error("Task Session: #{session.
|
240
|
+
Rails.logger.error("Task Data: #{task_data}") if task_data.present?
|
241
|
+
Rails.logger.error("Task Session: #{session.to_h}") if session.present?
|
241
242
|
raise
|
242
243
|
end
|
243
244
|
|
@@ -291,7 +292,7 @@ module ZuoraConnect
|
|
291
292
|
end
|
292
293
|
|
293
294
|
def oauth_expired?
|
294
|
-
return self.oauth_expires_at.present? ? (self.oauth_expires_at < Time.now) : true
|
295
|
+
return self.oauth_expires_at.present? ? (self.oauth_expires_at < Time.now.utc) : true
|
295
296
|
end
|
296
297
|
|
297
298
|
def refresh_oauth
|
@@ -383,7 +384,7 @@ module ZuoraConnect
|
|
383
384
|
#Task data must be present and the last refresh cannot be old. We dont want to overwite new cache data with old
|
384
385
|
if self.task_data.present? && (self.last_refresh.to_i > INSTANCE_REFRESH_WINDOW.ago.to_i)
|
385
386
|
Rails.logger.debug("[#{self.id}] Caching AppInstance")
|
386
|
-
Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, encrypt_data(data: self.save_data))
|
387
|
+
Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, self.encrypt_data(data: self.save_data))
|
387
388
|
end
|
388
389
|
Redis.current.del("Deleted:#{self.id}")
|
389
390
|
end
|
@@ -426,7 +427,7 @@ module ZuoraConnect
|
|
426
427
|
key_iter_num, key_size, salt, signed_salt = [1000, 64, "encrypted cookie", "signed encrypted cookie"]
|
427
428
|
raise ZuoraConnect::Exceptions::Error.new("'secret_key_base' is not set for rails environment '#{Rails.env}'. Please set in secrets file.") if Rails.application.secrets.secret_key_base.blank?
|
428
429
|
key_generator = ActiveSupport::KeyGenerator.new(Rails.application.secrets.secret_key_base, iterations: key_iter_num)
|
429
|
-
secret, sign_secret = [key_generator.generate_key(salt), key_generator.generate_key(signed_salt)]
|
430
|
+
secret, sign_secret = [key_generator.generate_key(salt, 32), key_generator.generate_key(signed_salt)]
|
430
431
|
return ActiveSupport::MessageEncryptor.new(secret, sign_secret)
|
431
432
|
end
|
432
433
|
|
@@ -437,7 +438,7 @@ module ZuoraConnect
|
|
437
438
|
return JSON.parse(data)
|
438
439
|
else
|
439
440
|
begin
|
440
|
-
return JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
|
441
|
+
return JSON.parse(self.encryptor.decrypt_and_verify(CGI::unescape(data)))
|
441
442
|
rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
|
442
443
|
Rails.logger.fatal('Error Decrypting')
|
443
444
|
return rescue_return
|
@@ -8,7 +8,7 @@ module ZuoraConnect
|
|
8
8
|
login_type = fields.dig("authentication_type").blank? ? 'Basic' : fields.dig("authentication_type").capitalize
|
9
9
|
|
10
10
|
@clients["Default"] = "::ZuoraAPI::#{login_type}".constantize.new(login_fields)
|
11
|
-
@default_entity = fields["entities"][0]["id"] if fields
|
11
|
+
@default_entity = fields["entities"][0]["id"] if (fields.dig("entities") || []).size == 1
|
12
12
|
if fields["entities"] && fields["entities"].size > 0
|
13
13
|
fields["entities"].each do |entity|
|
14
14
|
params = {:entity_id => entity["id"]}.merge(login_fields)
|
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.7.
|
4
|
+
version: 1.7.13
|
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-10-
|
11
|
+
date: 2018-10-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: apartment
|