zuora_connect 2.0.1 → 2.0.3a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f0a05ee8e03bf92f69dfa82546fb5a917d9bdd3cc9350b7ddc688462789a7a5
-  data.tar.gz: a5a85a0db4bb49697aaeb408337e5dca8c860ba9f3f45153a98d8ad545e96a5d
+  metadata.gz: 1ea099d366f787567f8dd94e3023be8b615600ecd9d235c2f1ceb272a6edb934
+  data.tar.gz: d37e876aff4a42024af04b671b1c2ff8ca1b6916e3668e920e926e007bc08e12
 SHA512:
-  metadata.gz: 66f02578165cd4da25089c786090ec3c63a8d312c127c943a8cd939abc74fbdb7c696490a9f5955d41818e43852720bb93da449e0a217076b22ac7899204d594
-  data.tar.gz: f9899bd76b9111abd1ff2d3256f94b87e3660f12c8412382b758adaec6b480a74cbaf817108a4da95e6dce5e39735c04440194101ff768295503d723c13bc261
+  metadata.gz: 4735b01928f85f14c2e59d5d6e5a64d93329303555db4718f63d8974d69859186976a3fc359215b2e7eb082a100a002347992efd599e3d10bfe7b6916201bea3
+  data.tar.gz: e72e3c06379e3cba15828da615fc5116d1e44d1234852c490463815e71385a104134a2997ed2ac7feda2821057fd312a2af0873fad19b91a9df52d969a1515a3

data/app/models/zuora_connect/app_instance_base.rb

@@ -17,6 +17,8 @@ module ZuoraConnect
     HOLDING_PATTERN_SLEEP = 5.seconds
     CONNECT_COMMUNICATION_SLEEP= 5.seconds
     IGNORED_LOCALS = ['fr', 'ja', 'sp']
+    INTERNAL_HOSTS = []
+    LOGIN_TENANT_DESTINATION = 'target_login'
 
     def init
       self.connect_user = 'Nobody'
@@ -192,7 +194,14 @@ module ZuoraConnect
         ElasticAPM.set_tag(:organization, organizations.first) 
       end
       self.logitem(item: {tenant_ids: tenants, organization: organizations})
-      self.update_column(:name, self.task_data.dig('name')) if ZuoraConnect::AppInstance.column_names.include?('name') && self.task_data.dig('name') != self.name
+      params = {
+        :name => self.task_data.dig('name'), 
+        :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 = params.reject{|k,v| !self.attributes.keys.member?(k.to_s) }
+      self.update_columns(params) if params.present?
     end
 
     def refresh(session: {}, session_fallback: false)

data/lib/zuora_connect/controllers/helpers.rb

@@ -15,14 +15,45 @@ module ZuoraConnect
           @appinstance = ZuoraConnect::AppInstance.where(:api_token => request.headers["API-Token"]).first
           ZuoraConnect.logger.debug("[#{@appinstance.id}] API REQUEST - API token") if @appinstance.present?
           check_instance
-        else
+        elsif ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(request.headers.fetch("HOST", nil))
+          zuora_host, zuora_entity_id, zuora_instance_id = [request.headers['zuora-host'], request.headers['zuora-entity-ids'].gsub('-',''), request.headers['zuora-instance-id']]
+
+          #Validate host present
+          if zuora_host.blank?
+            render json: {"status": 401, "message": "zuora-host header was not supplied."}, status: :unauthorized
+            return
+          end
+          #Validate entity-ids present
+          if zuora_entity_id.blank?
+            render json: {"status": 401, "message": "zuora-entity-ids header was not supplied."}, status: :unauthorized
+            return
+          end
+          #Select with instance id if present. Used where mulitple deployments are done.
+          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_host, id: zuora_instance_id)
+          else
+            appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_host)
+          end
+
+          if appinstances.size == 0
+            render json: {"status": 401, "message": "Missing mapping or no deployment for '#{zuora_host}-#{zuora_entity_id}' ."}, status: :unauthorized
+          elsif appinstances.size > 1
+            render json: {"status": 401, "message": "More than one app instance binded to host and entity ids. Please indicate correct instance via 'zuora-instance-id' header"}, status: :unauthorized
+          else
+            @appinstance = appinstances.first
+          end
+
+        elsif request.headers.fetch("Authorization", "").include?("Basic ")
           authenticate_or_request_with_http_basic do |username, password|
             @appinstance = ZuoraConnect::AppInstance.where(:token => password).first
             @appinstance ||= ZuoraConnect::AppInstance.where(:api_token => password).first
             ZuoraConnect.logger.debug("[#{@appinstance.id}] API REQUEST - Basic Auth") if @appinstance.present?
             check_instance
           end
+        else
+          check_instance
         end
+        
         if @appinstance.present?
           ZuoraConnect.logger.debug("[#{@appinstance.id}] Authenticate App API Request Completed In - #{(Time.now - start_time).round(2)}s")
         end
@@ -243,7 +274,7 @@ module ZuoraConnect
 
       #API ONLY
       def check_instance
-        if @appinstance.present?
+        if defined?(@appinstance) && @appinstance.present?
           if @appinstance.new_session_for_api_requests(:params => params)
             @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
           end
@@ -252,7 +283,9 @@ module ZuoraConnect
           ElasticAPM.set_user("API User")  if defined?(ElasticAPM) && ElasticAPM.running?
           return true
         else
-          render plain: "Access Denied", status: :unauthorized
+          response.set_header('WWW-Authenticate', "Basic realm=\"Application\"")
+          #render json: {"status": 401, "message": "Access Denied"}, status: :unauthorized
+          render text: "HTTP Basic: Access denied.\n", status: :unauthorized
         end
       end
     end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.1"
+  VERSION = "2.0.3a"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3a
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.21
+        version: 1.6.37
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.21
+        version: 1.6.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.21
+        version: 1.6.37
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.21
+        version: 1.6.37
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -407,9 +407,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: