zuora_connect 3.1.0.pre.d → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a5ca7980f0c3e5418bbd8b34d277421c00bbe709870ca1f17088c16e65a7454
-  data.tar.gz: 5465170884c82258888725799568a8d43e70ddceb968652c284335397023875f
+  metadata.gz: 689c9d74cda46ebd41a5d98dba982700dd365fa3746378276ceb0da4f5d0c493
+  data.tar.gz: 719e7beb03b156986160f8fa881960a7b7231b706c9a6bcd50af1788d622a125
 SHA512:
-  metadata.gz: 623b63683caba7ac18d08da2fba2b9d5db96eb24b9d0e0b833b85d4d707a2f2c34f1dc687248b9e034271cae4a4f402e0a78ce227cecfbbf9e467de07189771f
-  data.tar.gz: 2f27d2fe72ad6abe199a49b8872c6ed1e581257d62a62576452331e215f46f48ec17a88c13d75491573c27a71d151d3c1b0bb2f9258d3e1cd458213ed3f5b1b4
+  metadata.gz: 4f905b5518a0b7e556d3cf4a45e73e86b149a4b95d111a315e46a2f91e9a07b43b2e9b77f0bd1c34e6fbf5848d321b64615ec612fc907b7f3fb9fd2f56944be3
+  data.tar.gz: a61a9c662b80a4d8af8a98f6eeef2be56b79cc9bc0853ae36a57ce22a59dde8bae5a7ab1b175aedec703743b6ccae8e81f2e565b028a23cdda9b7dce7544eb1a

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,7 +352,7 @@ module ZuoraConnect
       self.id >= 25000000
     end
 
-    def fetch_connect_data
+    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})
 
@@ -377,7 +378,7 @@ module ZuoraConnect
       begin
         #Check how app was deployed
         if !self.auto_deployed? && (!skip_connect || self['zuora_logins'].blank?)
-          self.fetch_connect_data
+          self.fetch_connect_data(session: session)
         else
           self.build_task(task_data: self.zuora_logins, session: session)
         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-d"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.1.0.pre.d
+  version: 3.1.0
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -452,9 +452,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: