zuora_connect 2.0.5i → 2.0.5j

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6e24ecbe0cc46c18ae4e15f4435d97da771f745e715d4a1b6aa367074dae636
-  data.tar.gz: 99cac202292bac967e210ded0c1cc208a32eed070adbc5d61f65daad79b6b304
+  metadata.gz: fbafede62919e3f622f20c13bb1e0802ac393309711bf00378ecf321be914905
+  data.tar.gz: 7646b9dcc1fb9092eaaa2c558e9b671120660c87b3d8325e67c3397701f30837
 SHA512:
-  metadata.gz: ce2054e8627a6532d52c4292b832f2068483d034ec8326609641a1ea9006de4245f49104d0492933e917a3a20adafcbad3aa30cbb9806a4384179a49b8abed4c
-  data.tar.gz: 10521535501919658c69dd7a2184dc6db7b44a4de43be4157a861be7f50d91f069fc08178c563f36897ae6e29016367cf304ebec74ad0184df3f864729dfcf36
+  metadata.gz: 8de9408bf5c4d847eec783ef81f94dc683fa48e9d2ce648381969c4197a8e168a370a19b161a929fb5413047fb761ad9a4d593cd8e7f1d10797389b9a1fbc730
+  data.tar.gz: 2dfcccbe85c7237145d78ca8b94d40f59ae7e66e228a552e948291e105fced61989cd852041990a6e6a68f9493198ce79808f5206b7467b4d58d54916974e07c

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

@@ -65,7 +65,7 @@
     <% elsif defined?(message) && defined?(title) %>
       <div class="dialog">
         <div><h1><%= title %></h1></div>
-        <p><%= message %></p>
+        <p><%= message.html_safe %></p>
       </div>
     <% else %>
       <div class="dialog">

data/lib/zuora_connect/controllers/helpers.rb

@@ -105,11 +105,12 @@ module ZuoraConnect
             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)
+            if (session["ZuoraCurrentIdentity"].blank? || (session["ZuoraCurrentEntity"] != zuora_entity_id) || (session["ZSession"] != cookies['ZSession']))
               begin
                 identity, response = zuora_client.rest_call(url: zuora_client.rest_endpoint("identity"))
                 session["ZuoraCurrentIdentity"] = identity
                 session["ZuoraCurrentEntity"] = identity['entityId']
+                session["ZSession"] = cookies['ZSession']
 
                 begin 
                   client_describe, response = zuora_client.rest_call(url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''), session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic, headers: zuora_client.class == ZuoraAPI::Oauth ? {} : {'Authorization' => "ZSession-a3N2w #{zuora_client.get_session(prefix: false, auth_type: :basic)}"})
@@ -169,6 +170,8 @@ module ZuoraConnect
                   @zuora_user.zuora_identity_response[zuora_entity_id] = session["ZuoraCurrentIdentity"]
                   @zuora_user.save!
                 end
+
+                session["#{@appinstance.id}::user::email"] = session["username"]
               else
                 ZuoraConnect.logger.debug("New zuora user object for #{zuora_user_id}")
                 @zuora_user = ZuoraConnect::ZuoraUser.create!(:zuora_user_id => zuora_user_id, :zuora_identity_response => {zuora_entity_id => session["ZuoraCurrentIdentity"]})
@@ -318,6 +321,10 @@ module ZuoraConnect
         return @zuora_user
       end
 
+      def hallway_integration?
+        return (request.headers['ZuoraCurrentEntity'].present? || cookies['ZuoraCurrentEntity'].present?)
+      end
+
     private
       def setup_instance_via_data
         session.clear

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.5i"
+  VERSION = "2.0.5j"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.5i
+  version: 2.0.5j
 platform: ruby
 authors:
 - Connect Team