zuora_connect 2.0.41 → 2.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc48433f373e6b4ca92cfed049f2fe2a4292db788c360eff9e7a67752fd5e576
-  data.tar.gz: 2258e1fd905e9c5ceacd83eed7a87ce4832fa69cf1466a4f82a84c296f0b62c6
+  metadata.gz: 7a9e773f6114368213a5c0d414998c8cdd9b02a8e666b6f2895952e99960dbd0
+  data.tar.gz: d400a44cb72fdce90550a4406aabc5a60890f1b5326a8f5aa9dbfa478c9578e3
 SHA512:
-  metadata.gz: 60659892ae4e2199b66f4efa7e7ea8d882849d2104f5be16621f89cf1c31d410c0261300daf21c134f19bcf46a423cbc358a37676bd864d7fbee740cb58eb734
-  data.tar.gz: 8a2ddb96860a86ccf6b667b62cde4663222c54855bd8f3737db1da0333e455a0025dcca94f9b9f2d78d04bcd3a4da4ca3bf0bbb7e88ba57c9538800ab475336f
+  metadata.gz: c9139ea5852684e0ecbd7e5aa4e60f2cd1995fbf3977f06839c5ee68746c3d1f64d0f35625e0f202d1284d9723c44a5c0a3d69a67b0a885cf057e78f5eefa758
+  data.tar.gz: 1f6864370b8d59caf0691c929349aaac0317a7c2332a9842a15442d0ab141d441d24d984abd44afd0e39cfe9c560b3a246150aceced9969f45db7cbfa3dab110

data/app/models/zuora_connect/app_instance_base.rb

@@ -19,6 +19,7 @@ module ZuoraConnect
     API_LIMIT_TIMEOUT = 2.minutes             #Used to set the default for expiring timeout when api rate limiting is in effect
     BLANK_OBJECT_ID_LOOKUP = 'BlankValueSupplied'
     HOLDING_PATTERN_SLEEP = 5.seconds
+    CONNECT_APPLICATION_ID = 0
     CONNECT_COMMUNICATION_SLEEP= 5.seconds
     IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh', 'de']
     INTERNAL_HOSTS = []
@@ -562,6 +563,45 @@ module ZuoraConnect
         end
       end
 
+      def fetch_org_details(debug: false)
+        details_count ||= 0
+        self.new_session if !defined?(self.target_login)
+
+        response = HTTParty.get("#{ZuoraConnect.configuration.url}/api/#{self.api_version}/tenants/search?hostname=#{self.target_login.client.hostname}&node_id=#{self.zuora_entity_ids.first}")
+       
+        if response.success?
+          parsed_json =  JSON.parse(response.body)
+          
+          #Set Org
+          if self.id >= 25000000 && parsed_json['organization'].blank?
+            self.zuora_logins = self.zuora_logins.merge({'organization' => [parsed_json['organization']]})
+          end
+          if defined?(ZuoraConnect::AppInstance::CONNECT_APPLICATION_ID)
+            downloads = parsed_json.fetch('downloads',[]).select{|a| a['applicationId'] == ZuoraConnect::AppInstance::CONNECT_APPLICATION_ID }.map { |h| h.slice('Name', 'provisionState') }
+            Rails.logger.info("Instance Downloads: #{downloads.to_s}") if debug
+            if downloads.size > 1
+              self.provision_status = 'MultipleProvisioningRecords'
+              self.provisioned_app = downloads.map {|d| d['Name']}.to_s
+            elsif downloads.size == 1
+              self.provision_status = downloads.first['provisionState']
+              self.provisioned_app = downloads.first['Name']
+            else
+              self.provision_status = 'NoProvisioningRecords'
+              self.provisioned_app = nil
+            end
+          end
+          self.save(:validate => false)
+         
+          return parsed_json
+        end
+      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+        if (details_count += 1) < 3
+          retry
+        else
+          raise
+        end
+      end
+
       def update_task(options)
         update_task_count ||= 0
         response = HTTParty.post(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}/update_task",:body => {:access_token => self.username}.merge(options))

data/db/migrate/20190520232223_add_provisioning_fields.rb

@@ -0,0 +1,6 @@
+class AddProvisioningFields < ActiveRecord::Migration[5.0]
+  def change
+    add_column :zuora_connect_app_instances, :provision_status, :text, default: "NoProvisioningRecords" unless column_exists? :zuora_connect_app_instances, :provision_status
+    add_column :zuora_connect_app_instances, :provisioned_app, :text, default: nil unless column_exists? :zuora_connect_app_instances, :provisioned_app
+  end
+end

data/lib/zuora_connect/controllers/helpers.rb

@@ -261,13 +261,6 @@ module ZuoraConnect
               zuora_instance_id = nil
               zuora_details["identity"]["entityId"] = identity['entityId']
 
-              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: auth_headers
-              )
-              session["ZuoraCurrentUserInfo"] = client_describe
-            
               if zuora_entity_id != identity['entityId']
                 if zuora_tenant_id.to_s == "10548"
                   render "zuora_connect/static/error_handled", :locals => {
@@ -279,6 +272,13 @@ module ZuoraConnect
                   raise ZuoraConnect::Exceptions::Error.new("Header entity id does not match identity call entity id.") 
                 end
               end
+
+              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: auth_headers
+              )
+              session["ZuoraCurrentUserInfo"] = client_describe
             end
 
             #Find matching app instances.

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.41"
+  VERSION = "2.0.42"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.41
+  version: 2.0.42
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -337,6 +337,7 @@ files:
 - db/migrate/20181206162339_add_fields_to_instance.rb
 - db/migrate/20190520232221_add_zuora_user_table_and_alter_app_instance_id_table.rb
 - db/migrate/20190520232222_add_unique_index.rb
+- db/migrate/20190520232223_add_provisioning_fields.rb
 - lib/logging/connect_formatter.rb
 - lib/metrics/influx/point_value.rb
 - lib/metrics/net.rb