zuora_connect 2.0.3d → 2.0.3e

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfd7b54383b6874940e04ea6b555727f24de82fa9e5879e4ebd146cd79b1406c
-  data.tar.gz: ee6840dabf3ebeb17928f2f1ba17d9537dae7ad5d4a0ae61e4c32db41fdc9097
+  metadata.gz: b4ef5785c65d1716ad492175066157cca6cc97f04237469f7e985e2d8c56f127
+  data.tar.gz: 4bddd005e38fdb052f14e5719f36082a0bf586ddd53facfa8d5c4fe65764f969
 SHA512:
-  metadata.gz: ad40f42fb9adf65ee02d14df4cb61e1de48a720c82c776e2a63de0f891a28873d25e25998629e8aeacbbf1db6f70259bea726f87348cb4a7a0f81c17775575ae
-  data.tar.gz: 549374f0f04473e9346417b4943b7482baf8ef2998c19dec6c9b9198f2e0dba15d9c5bf7e149c3e375dbb2260afdafa5cbda3150b6ba398698c388e4d2884e9a
+  metadata.gz: 44d4393dc0e0af6a1164ea7e82bd77a98ffb3dad1be8f10b813d9c912a7724e05f7879cd87604d857bbe6bd1f26e4cb8343873f8a64abed17eb9908931e4e205
+  data.tar.gz: 97b8cfc082d665224dd2063438ee3ba785473dc735449fb8a93378ae64a1694e5c3d46cc95774a9c0e1564063fa2d86e6a710ceea4374b875625cbee45529417

data/app/models/zuora_connect/app_instance_base.rb

@@ -200,7 +200,7 @@ module ZuoraConnect
         :zuora_entity_ids => self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities').map{|e| e['id']},
         :zuora_tenant_ids => self.task_data['tenant_ids'],
       } 
-      params = params.reject{|k,v| !self.attributes.keys.member?(k.to_s) }
+      params = params.reject{|k,v| !self.attributes.keys.member?(k.to_s) || self[k] == v}
       self.update_columns(params) if params.present?
     end
 

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

@@ -67,10 +67,10 @@
       <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| %>
+      <% @names.each do |id, name| %>
         <div class="button">
-          <% label = @names[id].present? ? "#{id} - #{@names[id]}" : id %>
-          <%= link_to label, root_path(app_instance_ids: params[:app_instance_ids], app_instance_id: id) %>
+          <% label = name.present? ? "#{id} - #{name}" : id %>
+          <%= link_to label, root_path(app_instance_id: id) %>
         </div>
       <% end %>
     </div>

data/lib/zuora_connect/controllers/helpers.rb

@@ -106,68 +106,106 @@ module ZuoraConnect
         ElasticAPM.set_tag(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
         Thread.current[:appinstance] = nil
 
-        #Id identity is blank or identity need to be refreshed. 
-        if (session["Identity"].blank? || session["ZuoraCurrentEntity"] != request.headers['ZuoraCurrentEntity']) && request.headers['Zuora-Auth-Token'].present?
-          puts cookies['ZSession']
-          puts cookies['ZuoraCurrentEntity']
-          puts request.headers['ZuoraCurrentEntity']
-          puts "--------\n\n\n\n\n\n\n\n\n\n\n\n"
-          puts request.headers['Zuora-Auth-Token']
-          begin
-            zuora_client = ZuoraAPI::Login.new(url: "https://#{request.headers["HTTP_X_FORWARDED_HOST"]}", session: cookies['ZSession'])
-            identity = zuora_client.rest_call(url: zuora_client.rest_endpoint("identity"))
-            session["Identity"] = identity
-            session["ZuoraCurrentEntity"] = cookies['ZuoraCurrentEntity']
-          rescue => ex
-            
+        if request.headers['Zuora-Auth-Token'].present? && request.headers["NEWZUORA"].present?
+
+          #Debug
+          headers = request.headers.env.select do |k, _| 
+            k.downcase.start_with?('http') ||
+            k.in?(ActionDispatch::Http::Headers::CGI_VARIABLES)
+          end
+          puts headers
+        
+          #Do we need to refresh session identity
+          zuora_host = request.headers["HTTP_X_FORWARDED_HOST"] || "apisandbox.zuora.com"
+          zuora_client = ZuoraAPI::Login.new(url: "https://#{zuora_host}", session: cookies['ZSession'])
+          zuora_entity_id = request.headers['ZuoraCurrentEntity']
+          zuora_instance_id = params[:sidebar_launch].to_bool ? nil : (params[:app_instance_id] || session["appInstance"])
+
+          #Identity blank or current entity different
+          if (session["ZuoraCurrentIdentity"].blank? || session["ZuoraCurrentEntity"] != zuora_entity_id)
+            begin
+              identity, response = zuora_client.rest_call(url: zuora_client.rest_endpoint("identity"))
+              session["ZuoraCurrentIdentity"] = identity
+              session["ZuoraCurrentEntity"] = identity['entityId']
+
+              raise "Header entity id does not match identity call entity id" if zuora_entity_id != identity['entityId']
+            rescue => ex
+              ZuoraConnect.logger.error(ex)
+              render "zuora_connect/static/invalid_launch_request"
+              return
+            end
+          end
+
+          #Find matching app instances.
+          if zuora_instance_id.present?
+            appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host AND id = :id", entities: [zuora_entity_id], host: zuora_client.rest_domain, id: zuora_instance_id).pluck(:id, :name)
+          else
+            appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
+          end
+
+          #One deployed instance
+          if appinstances.size == 1
+            ZuoraConnect.logger.debug("Instance is #{appinstances.to_h.keys.first}")
+            session["appInstance"] = appinstances.to_h.keys.first
+
+          #We have multiple, user must pick
+          elsif appinstances.size > 1
+            ZuoraConnect.logger.debug("User must select instance. #{@names}")
+            @names = appinstances.to_h
+            render "zuora_connect/static/launch"
             return
+          else 
+            #Create new app instance
+            raise "Do not support new instance creation right now."
           end
         end
 
-        if params[:app_instance_ids].present? && !params[:app_instance_id].present?
-          begin
-            app_instance_ids = JSON.parse(Base64.urlsafe_decode64(params[:app_instance_ids]))
-            if app_instance_ids.length == 1
-              verify_with_navbar
+        if params[:app_instance_ids].present? 
+          if !params[:app_instance_id].present?
+            begin
+              app_instance_ids = JSON.parse(Base64.urlsafe_decode64(params[:app_instance_ids]))
+              if app_instance_ids.length == 1
+                verify_with_navbar
+                instances = JSON.parse(Base64.urlsafe_decode64(CGI.parse(URI.parse(session[params[:app_instance_ids]]["url"]).query)["app_instance_ids"][0]))
+                if instances.include?(app_instance_ids[0])
+                  @appinstance = ZuoraConnect::AppInstance.find(app_instance_ids[0])
+                  @appinstance.new_session(session: {})
+                  @appinstance.cache_app_instance
+                  session["appInstance"] = app_instance_ids[0]
+                else
+                  ZuoraConnect.logger.error("Launch Error: Param Instance didnt match session data")
+                  render "zuora_connect/static/invalid_launch_request"
+                  return
+                end
+              else
+                select_instance
+                return
+              end
+            rescue => ex
+              ZuoraConnect.logger.error(ex)
+              render "zuora_connect/static/invalid_launch_request"
+              return
+            end     
+          elsif params[:app_instance_id].present?
+            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?(app_instance_ids[0])
-                @appinstance = ZuoraConnect::AppInstance.find(app_instance_ids[0])
+              if instances.include?(params[:app_instance_id].to_i)
+                @appinstance = ZuoraConnect::AppInstance.find(params[:app_instance_id].to_i)
                 @appinstance.new_session(session: {})
                 @appinstance.cache_app_instance
-                session["appInstance"] = app_instance_ids[0]
+                session["appInstance"] = params[:app_instance_id].to_i
               else
-                ZuoraConnect.logger.error("Launch Error: Param Instance didnt match session data")
                 render "zuora_connect/static/invalid_launch_request"
                 return
               end
-            else
-              select_instance
-              return
-            end
-          rescue => ex
-            ZuoraConnect.logger.error(ex)
-            render "zuora_connect/static/invalid_launch_request"
-            return
-          end
-          
-        elsif params[:app_instance_ids].present? && params[:app_instance_id].present?
-          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.new_session(session: {})
-              @appinstance.cache_app_instance
-              session["appInstance"] = params[:app_instance_id].to_i
-            else
+            rescue => ex
+              ZuoraConnect.logger.error(ex)
               render "zuora_connect/static/invalid_launch_request"
               return
             end
-          rescue => ex
-            ZuoraConnect.logger.error(ex)
-            render "zuora_connect/static/invalid_launch_request"
-            return
           end
         end
+
         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 = "2.0.3d"
+  VERSION = "2.0.3e"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.3d
+  version: 2.0.3e
 platform: ruby
 authors:
 - Connect Team