zuora_connect 3.1.0.pre.c → 3.1.0.pre.g

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97665e840ec7fc2825cecb5a32829f13f6424e7d69aabffefce2826f8107ce4d
-  data.tar.gz: 9667455c3c021995b8037b3dbccffb988fb70c0f4dfebfae852313f0b9a6fdaf
+  metadata.gz: f4e2a1cd708b1c3c361604650519282a485b16b9995bc9b4f202025483241686
+  data.tar.gz: 9c74913350e9fecc2c09221145bb3a17d99406fc869c7dfbd6d905f681f4dff3
 SHA512:
-  metadata.gz: 3eec1dd133e3274fd09f0817d1aea463a3fbf0a266b51a320273a8fc5628fda91c4fd365647909691e32b062f389522db63400ebc56e73c4aaa4e0d9a7bb2f2b
-  data.tar.gz: 52ddcd7e7cbcb39adebe2f718306d7acb75ca3269221e4bff80524a15d9ab58a03ec4a51cccaec5e659d7672a2e39829353f9a31c120323b4b5bc4abba4576e9
+  metadata.gz: cb9acf273feece3615c01183118fc8c3848d0e75019dfcf02da9d94e0d5d51fbd27bebde5832c86ff0fb3fcb77394b57189ea19003f1d122baf76749f577ad57
+  data.tar.gz: e4a24d248536c517797499550bc107f07c7bee479dd7621fc0d051b97f7ba10de40bd8d6490d08b66b9a1743a86c5cb415b4337257cbc26e6b9bcc309bcf29b2

data/app/controllers/zuora_connect/api/v1/app_instance_controller.rb

@@ -43,7 +43,12 @@ module ZuoraConnect
 
     def cache_bust
       if defined?(Redis.current)
+        @appinstance.fetch_connect_data   #Fetch data and set in database if kms key is used
+        @appinstance.cache_app_instance(force_cache: true)  #Update cache in redis
         Redis.current.del("AppInstance:#{@appinstance.id}")
+        @appinstance.cache_app_instance(force_cache: true)  #Update cache in redis
+        #TODO: Could be a chance another thread cache back to old value, but will eventually cache will get consitent, move to nolonger needing redis cache
+
         respond_to do |format|
           format.json {render json: {}, status: :ok}
         end

data/app/controllers/zuora_connect/application_controller.rb

@@ -12,7 +12,9 @@ module ZuoraConnect
 
       begin
         if ZuoraConnect::LDAP::Adapter.valid_credentials?(username, password)
-          session['ldapAdmin'] = true
+          id = ZuoraConnect::AppInstance.first.id
+          session["appInstance"] = ZuoraConnect::AppInstance.first.id
+          session["#{id}::admin"] = true
           respond_to do |format|
             format.html { redirect_to '/admin/app_instances' }
           end
@@ -20,13 +22,13 @@ module ZuoraConnect
           render 'zuora_connect/application/ldap_login', locals: {
             title: 'LDAP Authentication Failed',
             message: 'Invalid username or password'
-          }
+          }, :layout => false
         end
       rescue Net::LDAP::Error
         render 'zuora_connect/application/ldap_login', locals: {
           title: 'LDAP Authentication Net Error',
           message: 'Failed to connect to server while authenticating the LDAP credentials. Please retry later.'
-        }
+        }, :layout => false
       end
     end
   end

data/app/models/zuora_connect/app_instance_base.rb

@@ -264,6 +264,7 @@ module ZuoraConnect
           end
         end
 
+        tenants = (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).select {|entity| !entity['skip'].to_bool}.map{|e| e['entityId']}.uniq if tenants.blank?
         params = {
           name: self.task_data.dig('name'),
           zuora_entity_ids: (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).select {|entity| !entity['skip'].to_bool}.map{|e| e['id']}.uniq,
@@ -351,28 +352,33 @@ module ZuoraConnect
       self.id >= 25000000
     end
 
+    def fetch_connect_data(session: {})
+      self.check_oauth_state
+      response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
+
+      if response.code == 200
+        begin
+          parsed_json = JSON.parse(response.body)
+        rescue JSON::ParserError => ex
+          raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("JSON parse error", response.body, response.code)
+        end
+
+        self.build_task(task_data: parsed_json, session: session)
+        self.set_backup_creds
+        self.save(validate: false) if self.changed?
+      else
+        raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
+      end
+    end
+
+
     def refresh(session: {})
       refresh_count ||= 0
       skip_connect ||= ZuoraConnect.configuration.skip_connect
       begin
         #Check how app was deployed
-        if !self.auto_deployed? && !skip_connect
-          self.check_oauth_state
-          response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
-
-          if response.code == 200
-            begin
-              parsed_json = JSON.parse(response.body)
-            rescue JSON::ParserError => ex
-              raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("JSON parse error", response.body, response.code)
-            end
-
-            self.build_task(task_data: parsed_json, session: session)
-            self.set_backup_creds
-            self.save(validate: false) if self.changed?
-          else
-            raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
-          end
+        if !self.auto_deployed? && (!skip_connect || self['zuora_logins'].blank?)
+          self.fetch_connect_data(session: session)
         else
           self.build_task(task_data: self.zuora_logins, session: session)
         end
@@ -775,10 +781,10 @@ module ZuoraConnect
         Redis.current.del("AppInstance:#{self.id}")
       end
 
-      def cache_app_instance
+      def cache_app_instance(force_cache: false)
         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)
+          if self.task_data.present? &&  ((self.last_refresh.to_i > INSTANCE_REFRESH_WINDOW.ago.to_i ) || force_cache)
             ZuoraConnect.logger.debug("Caching AppInstance", self.default_ougai_items)
             Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, self.encrypt_data(data: self.save_data))
           end

data/app/views/zuora_connect/application/ldap_login.html.erb

@@ -147,8 +147,9 @@
         }
 
         .error{
-            color: #D8000C;
-            background-color: #FFBABA;
+            color: white;
+            margin: 20px;
+            margin-top: 130px;
         }
     </style>
   </head>

data/lib/zuora_connect/controllers/helpers.rb

@@ -305,7 +305,7 @@ module ZuoraConnect
     private
       def setup_instance_via_prod_mode
         zuora_entity_id = request.headers['ZuoraCurrentEntity'] || cookies['ZuoraCurrentEntity']
-        ZuoraConnect::ZuoraUser.current_user_id = nil
+        ZuoraConnect::ZuoraUser.current_user_id = '3'
 
         if zuora_entity_id.present?
           zuora_tenant_id = cookies['Zuora-Tenant-Id']
@@ -320,11 +320,6 @@ module ZuoraConnect
           elsif cookies['ZSession'].present?
             zuora_client = ZuoraAPI::Basic.new(url: "https://#{zuora_host}", session: cookies['ZSession'], entity_id: zuora_entity_id)
             auth_headers.merge!({'Authorization' => "ZSession-a3N2w #{zuora_client.get_session(prefix: false, auth_type: :basic)}"})
-          elsif session["ldapAdmin"]
-            ZuoraConnect::logger.debug("Admin session found")
-          elsif ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(request.headers.fetch("HOST", nil))
-            render "zuora_connect/application/ldap_login"
-            return
           else
             render "zuora_connect/static/error_handled", :locals => {
               :title => "Missing Authorization Token",
@@ -341,7 +336,7 @@ module ZuoraConnect
             missmatched_entity = session["ZuoraCurrentEntity"] != zuora_entity_id
             missing_identity = session["ZuoraCurrentIdentity"].blank?
 
-            if (missing_identity || missmatched_entity || different_zsession) && (!session["ldapAdmin"])
+            if (missing_identity || missmatched_entity || different_zsession)
               zuora_details.merge!({'identity' => {'different_zsession' => different_zsession, 'missing_identity' => missing_identity, 'missmatched_entity' => missmatched_entity}})
               identity, response = zuora_client.rest_call(
                 url: zuora_client.rest_endpoint("identity"),
@@ -382,10 +377,7 @@ module ZuoraConnect
               end
             end
 
-            if session["ldapAdmin"]
-              appinstances = ZuoraConnect::AppInstance.pluck(:id, :name)
-            #Find matching app instances.
-            elsif zuora_instance_id.present?
+            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.to_i).pluck(:id, :name)
             else
               #if app_instance_ids is present then permissions still controlled by connect
@@ -423,23 +415,11 @@ module ZuoraConnect
               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
 
-            if session["ldapAdmin"]
-              zuora_user_id = "3"
-            else
-              zuora_user_id = cookies['Zuora-User-Id'] || session["ZuoraCurrentIdentity"]['userId'] || request.headers["Zuora-User-Id"]
-            end
+            zuora_user_id = cookies['Zuora-User-Id'] || session["ZuoraCurrentIdentity"]['userId'] || request.headers["Zuora-User-Id"]
 
             if appinstances.size == 1
               ZuoraConnect.logger.debug("Instance is #{appinstances.to_h.keys.first}")
               @appinstance = ZuoraConnect::AppInstance.find(appinstances.to_h.keys.first)
-              session["appInstance"] = @appinstance.id
-              ZuoraConnect::ZuoraUser.current_user_id = zuora_user_id
-            end
-
-            if session["ldapAdmin"]
-              # Maybe error. Should we return because of condition?
-              session["#{@appinstance.id}::admin"] = true
-              return
             end
 
             # One deployed instance with credentials
@@ -643,7 +623,12 @@ module ZuoraConnect
           if session["appInstance"].present?
             @appinstance = ZuoraConnect::AppInstance.find_by(:id => session["appInstance"])
           else
-            raise ZuoraConnect::Exceptions::AccessDenied.new("No application state or session found.")
+            if ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(request.headers.fetch("HOST", nil)) 
+              render "zuora_connect/application/ldap_login", :layout => false
+              return
+            else
+              raise ZuoraConnect::Exceptions::AccessDenied.new("No application state or session found.")
+            end
           end
         end
       end

data/lib/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = "3.1.0-c"
+  VERSION = "3.1.0-g"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.1.0.pre.c
+  version: 3.1.0.pre.g
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment