zuora_connect 2.0.58a → 2.0.60b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a03cd7450b81983c6d782fe911babc655153094bf6ff41fec0b3ed3a3a06888
-  data.tar.gz: 99eff46c23e53cd0d09b4c0fdafe199c239f800ca55dcaed255674d69729a2db
+  metadata.gz: 1f6d2a40d21ec315aaaac1859582bc689d24d6ef0ee3e42fabc640d171cb6944
+  data.tar.gz: 8793132888e45c9fa532ebb92c11205da312ac88df1e43dbd89f38faab9d8e49
 SHA512:
-  metadata.gz: 7cd29354de9ecb38d51ce8361029fc6a15a008f76d659723245fe12686068757fa34b768198a571ed4390bed750e49086b49fb1099702c2475b66b4506e49c57
-  data.tar.gz: beb5f965e6f8a88bbec73ecb507d595f82f468e419a958aec6dc33a8d4d17f17ccbf45fb90669dbf252d8e92799b9a7778323a833a618dd87a966dbf25fac51d
+  metadata.gz: cbd7542971dfedb9b2470094cde902c8b147c9f406cd864bb60e7beafa306b5f29b2c70aab457ea12b22b5dffd726a21a870c5bb238acaeeda64641b5cfd6ad9
+  data.tar.gz: a5adffbf1799fef7bf31db82eeba2fb648ea9c1ba3c34149c6c7f4b06ca7a02a6dd6c05a5e934e9aebbc974905737848ed40c8296e172226941d0fa1e7dc172c

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,11 +1,11 @@
 module ZuoraConnect
   class StaticController < ApplicationController
-    before_action :authenticate_connect_app_request, :except => [:metrics, :health, :initialize_app, :provision]
-    before_action :clear_connect_app_session,        :only =>   [:metrics, :health, :initialize_app, :provision]
-    after_action :persist_connect_app_session,       :except => [:metrics, :health, :initialize_app, :provision]
+    before_action :authenticate_connect_app_request, :except => [:metrics, :health, :initialize_app, :provision, :instance_user]
+    before_action :clear_connect_app_session,        :only =>   [:metrics, :health, :initialize_app, :provision, :instance_user]
+    after_action :persist_connect_app_session,       :except => [:metrics, :health, :initialize_app, :provision, :instance_user]
 
     skip_before_action :verify_authenticity_token, :only => [:initialize_app, :provision]
-    http_basic_authenticate_with name: ENV['PROVISION_USER'], password: ENV['PROVISION_SECRET'], :only => [:provision]
+    http_basic_authenticate_with name: ENV['PROVISION_USER'], password: ENV['PROVISION_SECRET'], :only => [:provision, :instance_user]
 
     def metrics
       type = params[:type].present? ? params[:type] : "versions"
@@ -14,11 +14,11 @@ module ZuoraConnect
 
     def health
       if params[:error].present?
-        begin 
+        begin
           raise ZuoraConnect::Exceptions::Error.new('This is an error')
         rescue => ex
           case params[:error]
-          when 'Log'  
+          when 'Log'
             Rails.logger.error("Error in Health", ex)
           when 'Exception'
             raise
@@ -77,6 +77,52 @@ module ZuoraConnect
       end
     end
 
+    def instance_user
+      ZuoraConnect::AppInstance.read_master_db do
+        ZuoraConnect.logger.with_fields = {} if ZuoraConnect.logger.is_a?(Ougai::Logger)
+        Rails.logger.with_fields = {} if Rails.logger.is_a?(Ougai::Logger)
+
+        if defined?(ElasticAPM) && ElasticAPM.running? && ElasticAPM.respond_to?(:set_label)
+          ElasticAPM.set_label(:trace_id, request.uuid)
+        end
+
+        unless params[:id].present?
+          render json: {
+            status: 400,
+            message: 'No app instance id provided'
+          }, status: :bad_request
+          return
+        end
+
+        @appinstance = ZuoraConnect::AppInstance.find(params[:id]).new_session
+      end
+
+      zuora_client = @appinstance.send(ZuoraConnect::AppInstance::LOGIN_TENANT_DESTINATION).client
+      client_describe, = zuora_client.rest_call(
+        url: zuora_client.rest_endpoint('genesis/user/info').gsub('v1/', ''),
+        session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic
+      )
+
+      render json: {
+        status: 200,
+        message: 'Success',
+        user_id: client_describe['coreUserId'],
+        username: client_describe['username'],
+        email: client_describe['workEmail']
+      }, status: 200
+    rescue ActiveRecord::RecordNotFound
+      render json: {
+        status: 400,
+        message: 'No app instance found'
+      }, status: :bad_request
+    rescue StandardError => e
+      Rails.logger.error('Error occurred getting user details', e)
+      render json: {
+        status: 500,
+        message: 'Failed to get user details'
+      }, status: 500
+    end
+
     private
 
     def clear_connect_app_session

data/config/routes.rb

@@ -5,6 +5,7 @@ ZuoraConnect::Engine.routes.draw do
 
   if ENV['PROVISION_USER'].present? && ENV['PROVISION_SECRET'].present?
     post '/provision' => 'static#provision'
+    get '/instance/:id/user' => 'static#instance_user'
   end
 
   namespace :api do

data/lib/resque/plugins/app_instance_job.rb

@@ -47,7 +47,7 @@ module Resque
             raise
           end
         rescue PG::ConnectionBad => exception
-          Rails.logger.info("Bad Connection Restart")
+          Rails.logger.warn("Bad Connection Restart", exception)
           Resque.enqueue_to(self.job.queue, self.job.payload['class'], args)
           return
         rescue ZuoraConnect::Exceptions::ConnectCommunicationError => exception

data/lib/zuora_connect/controllers/helpers.rb

@@ -346,7 +346,7 @@ module ZuoraConnect
               ##
               # If the ZSession was refreshed, but it's still the same user and they aren't launching from the side bar,
               # we don't need to continue
-              is_different_user = identity.slice("entityId", "tenantId", "userId", "userProfileId") == (session["ZuoraCurrentIdentity"] || {}).slice("entityId", "tenantId", "userId", "userProfileId")
+              is_different_user = identity.slice("entityId", "tenantId", "userId", "userProfileId") != (session["ZuoraCurrentIdentity"] || {}).slice("entityId", "tenantId", "userId", "userProfileId")
               zuora_details["identity"]["entityId"] = identity['entityId']
               session["ZuoraCurrentIdentity"] = identity
               session["ZuoraCurrentEntity"] = identity['entityId']
@@ -408,7 +408,7 @@ module ZuoraConnect
             end
 
             # One deployed instance with credentials
-            if defined?(@appinstance) && @appinstance['zuora_logins'].present?
+            if defined?(@appinstance) && !@appinstance['zuora_logins'].nil?
               #Add user/update
               begin
                 @zuora_user = ZuoraConnect::ZuoraUser.where(:zuora_user_id => zuora_user_id).first
@@ -632,12 +632,19 @@ module ZuoraConnect
           :id => id,
           :api_token => generate_token,
           :token => generate_token,
-          :zuora_logins => task_data,
           :oauth_expires_at => Time.now + 1000.years,
           :zuora_domain => rest_domain,
           :zuora_entity_ids => [zuora_entity_id]
         )
 
+        if task_data.nil?
+          # no encryption
+          app_instance['zuora_logins'] = task_data
+        else
+          # kms encrypt
+          app_instance.zuora_logins = task_data
+        end
+
         begin
           app_instance.save(:validate => false)
         rescue ActiveRecord::RecordNotUnique

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.58a"
+  VERSION = "2.0.60b"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.58a
+  version: 2.0.60b
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment