zuora_connect 2.0.60g → 2.0.60h

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2974bd187628d80f24c29c0ef6b65de76aa51ee967c86b4ee0e4332cab393290
-  data.tar.gz: e744cfbb1913eace9633537ac6fa3b386a058e0162090edb263a38629ea3f273
+  metadata.gz: f42f8d9aa43845b520355af09e97e78350733a04f0585aeb04fafc7f5ed6a1d6
+  data.tar.gz: 7dfd646a3fa29e7ddbc57ecc461c9d0789a44fecd9eca7a17bdde0e8e037396b
 SHA512:
-  metadata.gz: '019ba63942b1ea64b4ede161fac54b75d3198571b5854030dc6b2178c94dcbb29525fe1b4bc93fdb6c33968d4d9f7892f7127461179f4b57952b433d0ce36c89'
-  data.tar.gz: cac6c03ebc9890701bbe410d35d4af8cf663cc912b7e25573c22fdbde61a0ae17ea7b45d5de651f4d01d27895d13c640d17d7e8da4b416385a242724d7ec5066
+  metadata.gz: 504efdf52062062981373b857b4ff520473e065a4b9d59f1b4282e4c10de2f06285ba2a80790d810362ad62b011d5ffba7f0fb3235e40fc94b629ea59eff2119
+  data.tar.gz: 210ed53a545c3b86beaf0d7dfa08d567f53b88d0f2d711008bf73b15ebb14b38cdb2c310d4dd9cac891364877856c0b9e9b232bd39838fca5a786f896db6ccbb

data/lib/resque/dynamic_queues.rb

@@ -92,7 +92,7 @@ module Resque
         log_with_severity :error, "Error reserving job: #{ex.inspect}"
         log_with_severity :error, ex.backtrace.join("\n")
       end
-      raise e
+      raise ex
     end
 
     def create_job(queue, payload)

data/lib/zuora_connect/controllers/helpers.rb

@@ -124,10 +124,15 @@ module ZuoraConnect
             ElasticAPM.set_user(session["#{@appinstance.id}::user::email"])  if defined?(ElasticAPM) && ElasticAPM.running?
             PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail)
           end
+
+          locale = (session["#{@appinstance.id}::user::locale"] || "").gsub("_", "-") 
           begin
-            locale = session["#{@appinstance.id}::user::locale"]
             I18n.locale = locale.present? ? locale : @appinstance.locale
           rescue I18n::InvalidLocale => ex
+            if locale.include?("-")
+              locale = locale.split("-").first
+              retry
+            end
             ZuoraConnect.logger.error(ex) if !ZuoraConnect::AppInstance::IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
           end
           begin
@@ -435,7 +440,8 @@ module ZuoraConnect
               session["#{@appinstance.id}::user::localUserId"] = @zuora_user.id
               session["#{@appinstance.id}::user::email"] = session['ZuoraCurrentIdentity']["username"]
               session["#{@appinstance.id}::user::timezone"] = session['ZuoraCurrentIdentity']["timeZone"]
-              session["#{@appinstance.id}::user::locale"] = session['ZuoraCurrentIdentity']["language"]
+              session["#{@appinstance.id}::user::language"] = session['ZuoraCurrentIdentity']["language"]
+              session["#{@appinstance.id}::user::locale"] = session['ZuoraCurrentIdentity']["locale"]
               session["appInstance"] = @appinstance.id
 
             #We have multiple, user must pick

data/lib/zuora_connect/railtie.rb

@@ -81,6 +81,21 @@ module ZuoraConnect
             request_headers =
               event.payload[:headers].env.
                 reject { |key| key.to_s.include?('.') || REQUEST_HEADERS_TO_IGNORE.include?(key.to_s) }
+            begin
+              if request_headers["HTTP_AUTHORIZATION"].present?
+                if request_headers["HTTP_AUTHORIZATION"].include?("Basic")
+                  user_password = request_headers["HTTP_AUTHORIZATION"].split("Basic").last.strip
+                  user, password = Base64.decode64(user_password).split(":")
+                  request_headers["HTTP_AUTHORIZATION"] = "Basic #{user}:ValueFiltered"
+                elsif 
+                  request_headers["HTTP_AUTHORIZATION"] = "ValueFiltered"
+                end
+              end
+              request_headers["HTTP_API_TOKEN"] = "ValueFiltered" if request_headers["HTTP_API_TOKEN"].present?
+            rescue
+              request_headers.delete("HTTP_API_TOKEN")
+              request_headers.delete("HTTP_AUTHORIZATION")
+            end
             items.merge!({ headers: request_headers.to_s })
           end
 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.60g"
+  VERSION = "2.0.60h"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.60g
+  version: 2.0.60h
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment