zuora_connect 1.7.36 → 1.7.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c736cf460e83c579ef776b08395d434d33d1364
-  data.tar.gz: f4156b13087cdebfd88153c2e4c30e54efb84e5b
+  metadata.gz: e165cc15e9124725a8531bbb37fdedbffc2b0041
+  data.tar.gz: b30757389dd1b67751c462178d2d7aa519c9b9f7
 SHA512:
-  metadata.gz: b289cd1e1b03bbfaa4db04a4e148bfbd07d4e9240822df546fa40be6ae753a7d04af1fc6dbdea44fdd590f4b297a6528d629922c4d6bbe72e0aad4dea630ed5c
-  data.tar.gz: bf1e4a04215286ecac0013272f9d74d9b883e97ba68b72a15cf92bada1bf6be1385f393c8fb7b9a27241070b7136cc83cb5c13f7895561d497a31b6a24b10b3a
+  metadata.gz: 9a635b7ebd76c29e45a76cbfa55b92ae87949ae2bc2438621672487a6857636e6095c3183f6c124e2497128aa3eaa282bd5d95c11ae7a9a5ac63855f8033b1e4
+  data.tar.gz: bddf8ea1da0213428f64752286a6355880cc076e45c882455778ee66de1af803dd38d3a77da6dd65a66d49faed218343c5525f66a4ad23d00cbf4aaaf4432f51

data/app/views/zuora_connect/static/launch.html.erb

@@ -64,7 +64,8 @@
   <div class="dialog">
     <div>
       <h1>Please select the instance you would like to launch.</h1>
-    
+      <input type="hidden" id="name_hash" value="<%= @names.to_s %>" />
+      <input type="hidden" id="app_instance_list" value="<%= @app_instance_ids.to_s %>" />
 
       <% @app_instance_ids.each do |id| %>
         <div class="button">

data/lib/resque/dynamic_queues.rb

@@ -49,12 +49,12 @@ module Resque
       false
     end
 
-    def get_grouped_queues(queues)
+    def get_grouped_queues
       queues.sort.group_by{|u| /(\d{1,20})_.*/.match(u) ? /(\d{1,20})_.*/.match(u).captures.first : nil}
     end
 
     def reserve_with_round_robin
-      grouped_queues = queues.sort.group_by{|u| /(\d{1,20})_.*/.match(u) ? /(\d{1,20})_.*/.match(u).captures.first : nil}
+      grouped_queues = get_grouped_queues
 
       #Instance queue grouping
       if !grouped_queues.keys.include?(nil) && grouped_queues.keys.size > 0

data/lib/zuora_connect/controllers/helpers.rb

@@ -68,6 +68,7 @@ module ZuoraConnect
       end
 
       def authenticate_connect_app_request
+        Thread.current[:appinstance] = nil
         if params[:app_instance_ids].present? && !params[:app_instance_id].present?
           begin
             app_instance_ids = JSON.parse(Base64.urlsafe_decode64(params[:app_instance_ids]))
@@ -79,6 +80,7 @@ module ZuoraConnect
                 @appinstance.new_session(session: {})
                 @appinstance.cache_app_instance
               else
+                Rails.logger.fatal("Launch Error: Param Instance didnt match session data")
                 render "zuora_connect/static/invalid_launch_request"
                 return
               end
@@ -86,7 +88,8 @@ module ZuoraConnect
               select_instance
               return
             end
-          rescue
+          rescue => ex
+            Rails.logger.fatal("Launch Error: #{ex.message}")
             render "zuora_connect/static/invalid_launch_request"
             return
           end
@@ -95,7 +98,7 @@ module ZuoraConnect
           begin
             instances = JSON.parse(Base64.urlsafe_decode64(CGI.parse(URI.parse(session[params[:app_instance_ids]]["url"]).query)["app_instance_ids"][0]))
             if instances.include?(params[:app_instance_id].to_i)
-              @appinstance = ZuoraConnect::AppInstance.find(params[app_instance_id].to_i)
+              @appinstance = ZuoraConnect::AppInstance.find(params[:app_instance_id].to_i)
               @appinstance.new_session(session: {})
               @appinstance.cache_app_instance
             else
@@ -103,11 +106,11 @@ module ZuoraConnect
               return
             end
           rescue => ex
+            Rails.logger.fatal("Launch Error: #{ex.message}")
             render "zuora_connect/static/invalid_launch_request"
             return
           end
         end
-        Thread.current[:appinstance] = nil
         start_time = Time.now
         if ZuoraConnect.configuration.mode == "Production"
           if request["data"] && /^([A-Za-z0-9+\/\-\_]{4})*([A-Za-z0-9+\/]{4}|[A-Za-z0-9+\/]{3}=|[A-Za-z0-9+\/]{2}==)$/.match(request["data"].to_s)

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.36"
+  VERSION = "1.7.37"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.36
+  version: 1.7.37
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment