zuora_connect 2.0.5zz → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89eb67971713f7c5d1f482041a612b88baad3447b060f8bad6158e7716b1fd78
-  data.tar.gz: 05e431bddf12100125276f9f26863ed858fcad0df15433dfd34b52884668135e
+  metadata.gz: 5143516252b30663cce6eff40b07c9364cdcbe566b5a17fea4b55a6d86d23dbd
+  data.tar.gz: e967de5bf2ec2a7ba2c6160472e7ca222ca5102827257c69abc96638f15a40f5
 SHA512:
-  metadata.gz: 74ddb5fdb50aa38ea8e7a217993898347be48270660760f5e9a963f124ffcaafbe5fa1732dd236e67c57866bb98bc250906ee2d13b6569fb93a6f0009f3d774f
-  data.tar.gz: 655ecce962805517669a68eb6f1e4517fe0296be77694676c9440d5cedf4d87118fd785ecb4ae8af9bb770fd7012c29fa7f94e57ca2b751ba3b1684dfd0c1f4e
+  metadata.gz: bab2c1ec88ec22ab427921e538aeb1133fef59016fa8b019970a421e0909c94ede7ed51888915e0856a276b4113cfdac703e1062c379a621f07d919695d66628
+  data.tar.gz: 1334c2fbe71031f57d182f5a2e5364491189f9ce475c4b271be364f78be78c2bb47b098ec95b6ab57292b6d2557bbdcfcc89053711be77976afe0725a6f8cd33

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,11 +1,25 @@
 module ZuoraConnect
   class StaticController < ApplicationController
-    before_action :authenticate_connect_app_request, :except => [:metrics, :health, :initialize_app]
-    before_action :clear_connect_app_session,        :only =>   [:metrics, :health, :initialize_app]
-    after_action :persist_connect_app_session,       :except => [:metrics, :health, :initialize_app]
+    before_action :authenticate_connect_app_request, :except => [:metrics, :health, :session_error, :invalid_app_instance_error, :initialize_app]
+    before_action :clear_connect_app_session,        :only =>   [:metrics, :health, :session_error, :invalid_app_instance_error, :initialize_app]
+    after_action :persist_connect_app_session,       :except => [:metrics, :health, :session_error, :invalid_app_instance_error, :initialize_app]
     
     skip_before_action :verify_authenticity_token, :only => [:initialize_app]
 
+    def session_error
+      respond_to do |format|
+        format.html
+        format.json { render json: { message: "Session Error", status: 500 }, status: 500 }
+      end
+    end
+
+    def invalid_app_instance_error
+      respond_to do |format|
+        format.html
+        format.json {render json: { message: "Invalid App Instance", status: 500 }, status: 500 }
+      end
+    end
+
     def metrics
       type = params[:type].present? ? params[:type] : "versions"
       render json: ZuoraConnect::AppInstance.get_metrics(type).to_json, status: 200
@@ -34,7 +48,6 @@ module ZuoraConnect
     def initialize_app
       begin
         authenticate_connect_app_request
-        @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
         render json: {
           message: "Success",
           status: 200

data/app/helpers/zuora_connect/application_helper.rb

@@ -1,15 +1,5 @@
 module ZuoraConnect
   module ApplicationHelper
-    def is_app_admin?
-      return @appinstance.blank? ? false : session["#{@appinstance.id}::admin"]
-    end
 
-    def zuora_user
-      return @zuora_user
-    end
-
-    def connect_meta_tags
-      "<meta name=\"z-hallway-prefix\" content=\"#{ Thread.current[:isHallway] }\">".html_safe
-    end
   end
 end

data/app/models/zuora_connect/app_instance_base.rb

@@ -16,7 +16,7 @@ module ZuoraConnect
     BLANK_OBJECT_ID_LOOKUP = 'BlankValueSupplied'
     HOLDING_PATTERN_SLEEP = 5.seconds
     CONNECT_COMMUNICATION_SLEEP= 5.seconds
-    IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh', 'de']
+    IGNORED_LOCALS = ['fr', 'ja', 'sp']
     INTERNAL_HOSTS = []
     LOGIN_TENANT_DESTINATION = 'target_login'
 
@@ -89,11 +89,7 @@ module ZuoraConnect
       Thread.current[:appinstance] = self
     end
 
-    def default_ougai_items
-      return {app_instance_id: self.id}
-    end
-
-    def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token, holding_pattern: false, **args)
+    def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token, holding_pattern: false, log_level: Logger::DEBUG)
       self.api_version = "v2"
       self.username = username
       self.password = password
@@ -127,26 +123,26 @@ module ZuoraConnect
 
         if session.empty?
           self.new_session_message = "REFRESHING - Session Empty"
-          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
+          ZuoraConnect.logger.add(log_level, self.new_session_message)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
         elsif (self.id != session["appInstance"].to_i)
           self.new_session_message = "REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})"
-          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
+          ZuoraConnect.logger.add(log_level, self.new_session_message)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
         elsif session["#{self.id}::task_data"].blank?
           self.new_session_message = "REFRESHING - Task Data Blank"
-          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
+          ZuoraConnect.logger.add(log_level, self.new_session_message)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
         elsif session["#{self.id}::last_refresh"].blank?
           self.new_session_message = "REFRESHING - No Time on Cookie"
           recoverable_session = true
-          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
+          ZuoraConnect.logger.add(log_level, self.new_session_message)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
@@ -154,7 +150,7 @@ module ZuoraConnect
         elsif (session["#{self.id}::last_refresh"].to_i < INSTANCE_REFRESH_WINDOW.ago.to_i) && self.mark_for_refresh
           self.new_session_message = "REFRESHING - Session Old by #{time_expire.abs} second"
           recoverable_session = true
-          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
+          ZuoraConnect.logger.add(log_level, self.new_session_message)
           self.refresh(session: session)
 
         else
@@ -163,14 +159,14 @@ module ZuoraConnect
           else
             self.new_session_message = "REBUILDING - Expires in #{time_expire} seconds"
           end
-          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
+          ZuoraConnect.logger.add(log_level, self.new_session_message)
           self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         end
       end
       return self
     rescue ZuoraConnect::Exceptions::HoldingPattern => ex
       while self.marked_for_refresh?
-        ZuoraConnect.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'", self.default_ougai_items)
+        ZuoraConnect.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'")
         sleep(HOLDING_PATTERN_SLEEP)
       end
       self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
@@ -178,7 +174,7 @@ module ZuoraConnect
       retry
     rescue => ex
       if recoverable_session
-        ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache", self.default_ougai_items)
+        ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache")
         self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         return self
       else
@@ -200,10 +196,10 @@ module ZuoraConnect
       self.logitem(item: {tenant_ids: tenants, organization: organizations})
       params = {
         :name => self.task_data.dig('name'), 
-        :zuora_entity_ids => (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).map{|e| e['id']},
-        :zuora_tenant_ids => self.task_data.fetch('tenant_ids', []).map(&:to_s),
+        :zuora_domain => self.target_login.client.rest_domain,
+        :zuora_entity_ids => self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities').map{|e| e['id']},
+        :zuora_tenant_ids => self.task_data['tenant_ids'],
       } 
-      params.merge!({:zuora_domain => self.send(LOGIN_TENANT_DESTINATION).client.rest_domain })
       params = params.reject{|k,v| !self.attributes.keys.member?(k.to_s) || self[k] == v}
       self.update_columns(params) if params.present?
     end
@@ -211,12 +207,12 @@ module ZuoraConnect
     def refresh(session: {}, session_fallback: false)
       refresh_count ||= 0
       #Check how app was deployed
-      if !self['zuora_logins'].present?
+      if !self.zuora_logins.present?
         start = Time.now
         response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
         response_time = Time.now - start
 
-        ZuoraConnect.logger.debug("REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}", self.default_ougai_items)
+        ZuoraConnect.logger.debug("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
         if response.code == 200
           self.build_task(task_data: JSON.parse(response.body), session: session)
           self.last_refresh = Time.now.to_i
@@ -226,68 +222,35 @@ module ZuoraConnect
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
       else
-        self.build_task(task_data: self.zuora_logins, session: session)
+        self.build_task(task_data: JSON.parse(self.zuora_logins), session: session)
         self.last_refresh = Time.now.to_i
         self.cache_app_instance
         self.reset_mark_for_refresh
       end
     rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
       if (refresh_count += 1) < 3
-        sleep(30)
-        ZuoraConnect.logger.info("REFRESH TASK - #{ex.class} Retrying(#{refresh_count})", self.default_ougai_items)
+        ZuoraConnect.logger.info("[#{self.id}] REFRESH TASK - #{ex.class} Retrying(#{refresh_count})")
         retry
       else
-        ZuoraConnect.logger.fatal("REFRESH TASK - #{ex.class} Failed #{refresh_count}x", self.default_ougai_items)
+        ZuoraConnect.logger.fatal("[#{self.id}] REFRESH TASK - #{ex.class} Failed #{refresh_count}x")
         raise
       end
     rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
       if (refresh_count += 1) < 3
         if ex.code == 401
-          ZuoraConnect.logger.info("REFRESH TASK - Failed #{ex.code} - Retrying(#{refresh_count})", self.default_ougai_items)
+          ZuoraConnect.logger.info("[#{self.id}] REFRESH TASK - Failed #{ex.code} - Retrying(#{refresh_count})")
           self.refresh_oauth
         else
-          ZuoraConnect.logger.warn("REFRESH TASK - Failed #{ex.code} - Retrying(#{refresh_count})", self.default_ougai_items)
+          ZuoraConnect.logger.warn("[#{self.id}] REFRESH TASK - Failed #{ex.code} - Retrying(#{refresh_count})")
         end
         retry
       else
-        ZuoraConnect.logger.fatal("REFRESH TASK - Failed #{ex.code} - #{refresh_count}x", self.default_ougai_items)
+        ZuoraConnect.logger.fatal("[#{self.id}] REFRESH TASK - Failed #{ex.code} - #{refresh_count}x")
         raise
       end
     end
 
-    #### START KMS ENCRYPTION Methods ####
-      def zuora_logins=(val)
-        write_attribute(:zuora_logins, kms_encrypt(val.to_json))
-      end
-
-      def zuora_logins
-        return JSON.parse(kms_decrypt(super))
-      end
-
-      def kms_decrypt(value)
-        kms_client = Aws::KMS::Client.new({region: Rails.application.secrets.aws['AWS_REGION'], credentials: self.aws_auth_client}.delete_if { |k, v| v.blank? })
-        resp = kms_client.decrypt({ciphertext_blob: [value].pack("H*") })
-        return resp.plaintext
-      end
-
-      def kms_encrypt(value)
-        kms_client = Aws::KMS::Client.new({region: Rails.application.secrets.aws['AWS_REGION'], credentials: self.aws_auth_client}.delete_if {|k,v| v.blank? })
-        kms_key = ENV['AWS_KMS_ARN'] || Rails.application.secrets.aws['AWS_KMS_ARN'] 
-
-        resp = kms_client.encrypt({key_id: kms_key, plaintext: value})
-        return resp.ciphertext_blob.unpack('H*').first
-      end
-
-      def aws_auth_client
-        if Rails.env.to_s == 'development'
-         return Aws::Credentials.new(Rails.application.secrets.aws['AWS_ACCESS_KEY_ID'], Rails.application.secrets.aws['AWS_SECRET_ACCESS_KEY'])
-        else
-          return nil
-        end
-      end
-    #### END KMS ENCRYPTION Methods ####
-
-    #### START Metrics Methods ####
+    #### START Metrics Mathods ####
       def logitem(item: {}, reset: false)
         self.logitems = {} if self.logitems.class != Hash
         if item.class == Hash
@@ -371,9 +334,9 @@ module ZuoraConnect
         end
         return @data
       end
-    #### END Task Methods ####
+    #### END Task Mathods ####
 
-    #### START Task Methods ####
+    #### START Task Mathods ####
       def build_task(task_data: {}, session: {})
         session = {} if session.blank?
         self.task_data = task_data
@@ -482,13 +445,13 @@ module ZuoraConnect
           raise
         end
       end
-    #### END Task Methods ####
+    #### END Task Mathods ####
 
-    #### START Connect OAUTH Methods ####
+    #### START Connect OAUTH methods ####
       def check_oauth_state(method)
         #Refresh token if already expired
         if self.oauth_expired?
-          ZuoraConnect.logger.debug("Before '#{method}' method, Oauth expired", self.default_ougai_items)
+          ZuoraConnect.logger.debug("[#{self.id}] Before '#{method}' method, Oauth expired")
           self.refresh_oauth
         end
       end
@@ -507,7 +470,7 @@ module ZuoraConnect
                 }
         response = HTTParty.post("#{ZuoraConnect.configuration.url}/oauth/token",:body => params)
         response_time = Time.now - start
-        ZuoraConnect.logger.debug("REFRESH OAUTH - In #{response_time.round(2).to_s}", self.default_ougai_items)
+        ZuoraConnect.logger.debug("[#{self.id}] REFRESH OAUTH - In #{response_time.round(2).to_s}")
 
         if response.code == 200
           response_body = JSON.parse(response.body)
@@ -521,10 +484,10 @@ module ZuoraConnect
         end
       rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.info("REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})", self.default_ougai_items)
+          ZuoraConnect.logger.info("[#{self.id}] REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})")
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH OAUTH - #{ex.class} Failed #{refresh_oauth_count}x", self.default_ougai_items)
+          ZuoraConnect.logger.fatal("[#{self.id}] REFRESH OAUTH - #{ex.class} Failed #{refresh_oauth_count}x")
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
@@ -535,14 +498,14 @@ module ZuoraConnect
         return if !self.oauth_expired?
 
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.info("REFRESH OAUTH - Failed #{ex.code} - Retrying(#{refresh_oauth_count})", self.default_ougai_items)
+          ZuoraConnect.logger.info("[#{self.id}] REFRESH OAUTH - Failed #{ex.code} - Retrying(#{refresh_oauth_count})")
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH OAUTH - Failed #{ex.code} - #{refresh_oauth_count}x", self.default_ougai_items)
+          ZuoraConnect.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed #{ex.code} - #{refresh_oauth_count}x")
           raise
         end
       end
-    #### END Connect OAUTH Methods ####
+    #### END Connect OAUTH methods ####
 
     #### START AppInstance Temporary Persistance Methods ####
       def marked_for_refresh?
@@ -588,10 +551,10 @@ module ZuoraConnect
             end
           end
           if cached_instance.blank?
-            ZuoraConnect.logger.debug("Cached AppInstance Missing", self.default_ougai_items)
+            ZuoraConnect.logger.debug("[#{self.id}] Cached AppInstance Missing")
             return session
           else
-            ZuoraConnect.logger.debug("Cached AppInstance Found", self.default_ougai_items)
+            ZuoraConnect.logger.debug("[#{self.id}] Cached AppInstance Found")
             return decrypt_data(data: cached_instance, rescue_return: session).merge(session)
           end
         else
@@ -603,7 +566,7 @@ module ZuoraConnect
         if defined?(Redis.current)
           #Task data must be present and the last refresh cannot be old. We dont want to overwite new cache data with old
           if self.task_data.present? &&  (self.last_refresh.to_i > INSTANCE_REFRESH_WINDOW.ago.to_i)
-            ZuoraConnect.logger.debug("Caching AppInstance", self.default_ougai_items)
+            ZuoraConnect.logger.debug("[#{self.id}] Caching AppInstance")
             Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, self.encrypt_data(data: self.save_data))
           end
         end
@@ -664,7 +627,7 @@ module ZuoraConnect
           begin
             return JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
           rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
-            ZuoraConnect.logger.error("Error Decrypting", self.default_ougai_items) if log_fatal
+            ZuoraConnect.logger.add(Logger::ERROR, "Error Decrypting for #{self.id}") if log_fatal
             return rescue_return
           rescue JSON::ParserError => ex
             return encryptor.decrypt_and_verify(CGI::unescape(data))
@@ -1033,7 +996,9 @@ module ZuoraConnect
 
     def method_missing(method_sym, *arguments, &block)
       if method_sym.to_s.include?("login")
-        ZuoraConnect.logger.fatal("Method Missing #{method_sym}. Instance Data: #{self.task_data} Instance Logins: #{self.logins}", self.default_ougai_items)
+        ZuoraConnect.logger.fatal("Method Missing #{method_sym}")
+        ZuoraConnect.logger.fatal("Instance Data: #{self.task_data}")
+        ZuoraConnect.logger.fatal("Instance Logins: #{self.logins}")
       end
       super
     end

data/app/models/zuora_connect/zuora_user.rb

@@ -1,7 +1,6 @@
 module ZuoraConnect
   class ZuoraUser < ActiveRecord::Base
     self.table_name = "zuora_users"
-    attr_accessor :session
 
   end
 end

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

@@ -0,0 +1,65 @@
+<html><head>
+  <title>We're sorry, but something went wrong</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <div>
+      <h1>We're sorry, but this request could not be verified.</h1>
+    </div>
+    <p>Please try relaunching this application at connect.zuora.com</p>
+  </div>
+
+
+</body></html>

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

@@ -0,0 +1,81 @@
+<html><head>
+  <title>We're sorry, but something went wrong</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  div#main{
+    background: white;
+  }
+  </style>
+</head>
+
+<body >
+  <div style='background: white;'>
+    <!-- This file lives in public/500.html -->
+    <% if defined?(exception) %>
+      <div class="dialog" style='max-width: 74em;'>
+        <div>
+          <h1><%= exception.class %> - '<%= exception.message %>'</h1>
+        </div>
+        <p style='text-align: left;'>
+        <% exception.backtrace.each do |line| %>
+          <%= line %><br>
+        <% end %>
+      </p>
+      </div>
+    <% else %>
+      <div class="dialog">
+        <div>
+          <h1>The launch url was invalid.</h1>
+        </div>
+        <p>Please try relaunching this application</p>
+      </div>
+    <% end %>
+  </div>
+</body></html>