zuora_connect 2.0.59 → 2.0.60a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98cdc050053f90626d6df8e259de4ff0089091d968f94da492b30dadd1e60afb
-  data.tar.gz: f0517e432e3554c4d751419889c01899fcaf4c6b04febd093b29a7eb02089344
+  metadata.gz: b422585e16ec26ecaf39bf40095d9067c162bf23e8d4d5ce12889e653d8da5f1
+  data.tar.gz: bb96e31845214e4a77274ec8afbd6d5c0a95e11701e842d74616f95ba6fcdf3d
 SHA512:
-  metadata.gz: 5f3f2ead635cb47c3d42aa1415b30d1405553553b9bc3a3b387061974309c7525f1755ae4546084d4406174cd0e4c051c3b596e101f5d3134360f55d328147c5
-  data.tar.gz: 3a579ea74120c205588cc62af5d8eef28266a0ddf85e4a8ead2b07bbcd4b4ee1ec9c8b39079a58b48473d2f107d72389eea017cbb667aef22e6db9f647087354
+  metadata.gz: '078c3ab13f7bb7ad02fa09ebee0b52608e8e40c361b0ca112a3f69cdb06a12e5e834aff0b618c990fe839dda4df8b305324cd6750f9a5a3ae9138c54fee63953'
+  data.tar.gz: 92a9e8797ec7d3fa5e6da94309bacfa412cb20cab9a5f6be751f2ccdea5578155492a72e7aa47c58e8b92284a620f52d7fa92f4d6f5f6522cf72b0c4de0f67ea

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,10 +1,11 @@
 module ZuoraConnect
   class StaticController < ApplicationController
-    before_action :authenticate_connect_app_request, :except => [:metrics, :health, :initialize_app]
-    before_action :clear_connect_app_session,        :only =>   [:metrics, :health, :initialize_app]
-    after_action :persist_connect_app_session,       :except => [:metrics, :health, :initialize_app]
-    
-    skip_before_action :verify_authenticity_token, :only => [:initialize_app]
+    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]
+
+    skip_before_action :verify_authenticity_token, :only => [:initialize_app, :provision]
+    http_basic_authenticate_with name: ENV['PROVISION_USER'], password: ENV['PROVISION_SECRET'], :only => [:provision]
 
     def metrics
       type = params[:type].present? ? params[:type] : "versions"
@@ -34,11 +35,13 @@ module ZuoraConnect
     def initialize_app
       begin
         authenticate_connect_app_request
-        @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
-        render json: {
-          message: "Success",
-          status: 200
-        }, status: 200
+        unless performed?
+          @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
+          render json: {
+            message: 'Success',
+            status: 200
+          }, status: 200
+        end
       rescue => ex
         Rails.logger.error("Failed to Initialize application", ex)
         if performed?
@@ -52,6 +55,28 @@ module ZuoraConnect
       end
     end
 
+    def provision
+      create_new_instance
+      unless performed?
+        render json: {
+          status: 200,
+          message: 'Success',
+          app_instance_id: @appinstance.id
+        }, status: 200
+      end
+    rescue StandardError => e
+      message = 'Failed to provision new instance'
+      if performed?
+        Rails.logger.error("#{message}: #{performed?}", e)
+      else
+        Rails.logger.error(message, e)
+        render json: {
+          status: 500,
+          message: message
+        }, status: 500
+      end
+    end
+
     private
 
     def clear_connect_app_session

data/config/routes.rb

@@ -3,6 +3,10 @@ ZuoraConnect::Engine.routes.draw do
   get '/internal/data' => 'static#metrics'
   post '/initialize_app' => 'static#initialize_app'
 
+  if ENV['PROVISION_USER'].present? && ENV['PROVISION_SECRET'].present?
+    post '/provision' => 'static#provision'
+  end
+
   namespace :api do
     namespace :v1 do
       resources :app_instance, :only => [:index], defaults: {format: :json} 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

@@ -219,6 +219,80 @@ module ZuoraConnect
         return (request.headers['ZuoraCurrentEntity'].present? || cookies['ZuoraCurrentEntity'].present?)
       end
 
+      def create_new_instance
+        ZuoraConnect::AppInstance.read_master_db do
+          Thread.current[:appinstance] = nil
+          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
+
+          zuora_host = request.headers['zuora-host']
+          zuora_entity_id = (request.headers['zuora-entity-ids'] || '').gsub(
+            '-',
+            ''
+          ).split(',').first
+
+          # 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
+
+          rest_domain = ZuoraAPI::Login.new(url: "https://#{zuora_host}").rest_domain
+          app_instance_id = ZuoraConnect::AppInstance.where(
+            'zuora_entity_ids ?& array[:entities] AND zuora_domain = :host',
+            entities: [zuora_entity_id],
+            host: rest_domain
+          ).pluck(:id).first
+
+          if app_instance_id.present?
+            render json: {
+              status: 409,
+              message: 'Instance already exists.',
+              app_instance_id: app_instance_id
+            }, status: 409
+          else
+            Apartment::Tenant.switch!("public")
+            retry_count = 3
+            begin
+              @appinstance = new_instance(
+                next_instance_id,
+                zuora_entity_id,
+                rest_domain,
+                retry_count: retry_count
+              )
+            rescue ActiveRecord::RecordNotUnique
+              retry if (retry_count -= 1).positive?
+              return
+            end
+
+            app_instance_id = @appinstance.id
+          end
+
+          begin
+            Apartment::Tenant.switch!('public')
+            Apartment::Tenant.create(app_instance_id.to_s)
+          rescue Apartment::TenantExists
+            ZuoraConnect.logger.debug('Tenant Already Exists')
+          end
+        end
+      end
+
     private
       def setup_instance_via_prod_mode
         zuora_entity_id = request.headers['ZuoraCurrentEntity'] || cookies['ZuoraCurrentEntity']
@@ -226,7 +300,7 @@ module ZuoraConnect
         if zuora_entity_id.present?
           zuora_tenant_id = cookies['Zuora-Tenant-Id']
           zuora_user_id = cookies['Zuora-User-Id']
-          zuora_host = request.headers["HTTP_X_FORWARDED_HOST"] || "apisandbox.zuora.com"
+          zuora_host = request.headers['HTTP_X_FORWARDED_HOST'] || request.headers['Zuora-Host'] || 'apisandbox.zuora.com'
 
           zuora_details = {'host' => zuora_host, 'user_id' => zuora_user_id, 'tenant_id' => zuora_tenant_id, 'entity_id' => zuora_entity_id}
           auth_headers = {}
@@ -328,11 +402,13 @@ module ZuoraConnect
 
             zuora_user_id = cookies['Zuora-User-Id'] || session["ZuoraCurrentIdentity"]['userId']
 
-            #One deployed instance
             if appinstances.size == 1
               ZuoraConnect.logger.debug("Instance is #{appinstances.to_h.keys.first}")
               @appinstance = ZuoraConnect::AppInstance.find(appinstances.to_h.keys.first)
+            end
 
+            # One deployed instance with credentials
+            if defined?(@appinstance) && !@appinstance['zuora_logins'].nil?
               #Add user/update
               begin
                 @zuora_user = ZuoraConnect::ZuoraUser.where(:zuora_user_id => zuora_user_id).first
@@ -380,79 +456,85 @@ module ZuoraConnect
                 return
               end
               Apartment::Tenant.switch!("public")
-              ActiveRecord::Base.transaction do
-                ActiveRecord::Base.connection.execute('LOCK public.zuora_users IN ACCESS EXCLUSIVE MODE')
-                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)
+              retry_count = 3
+              task_data = {}
+              begin
+                ActiveRecord::Base.transaction do
+                  ActiveRecord::Base.connection.execute('LOCK public.zuora_users IN ACCESS EXCLUSIVE MODE')
 
-                if appinstances.size > 0
-                  redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
-                  return
-                end
+                  unless defined?(@appinstance)
+                    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)
 
-                next_id = (ZuoraConnect::AppInstance.all.where('id > 24999999').order(id: :desc).limit(1).pluck(:id).first || 24999999) + 1
-                user = (ENV['DEIS_APP'] || "Application").split('-').map(&:capitalize).join(' ')
-                body = {
-                  'userId' => zuora_user_id,
-                  'entityIds' => [zuora_entity_id.unpack("a8a4a4a4a12").join('-')],
-                  'customAuthorities' => [],
-                  'additionalInformation' => {
-                    'description' => "This user is for #{user} application.",
-                    'name' => "#{user} API User #{next_id}"
-                  }
-                }
-
-                oauth_response, response = zuora_client.rest_call(
-                  method: :post,
-                  body: body.to_json,
-                  url: zuora_client.rest_endpoint("genesis/clients").gsub('v1/', ''),
-                  session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic,
-                  headers: auth_headers
-                )
+                    if appinstances.size > 0
+                      redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
+                      return
+                    end
+                  end
 
-                new_zuora_client = ZuoraAPI::Oauth.new(url: "https://#{zuora_host}", oauth_client_id: oauth_response["clientId"], oauth_secret: oauth_response["clientSecret"] )
-                if session["ZuoraCurrentUserInfo"].blank?
-                  client_describe, response = new_zuora_client.rest_call(url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''), session_type: :bearer)
-                else
-                  client_describe = session["ZuoraCurrentUserInfo"]
-                end
+                  next_id = defined?(@appinstance) ? @appinstance.id : next_instance_id
+                  if task_data.blank?
+                    user = (ENV['DEIS_APP'] || "Application").split('-').map(&:capitalize).join(' ')
+                    body = {
+                      'userId' => zuora_user_id,
+                      'entityIds' => [zuora_entity_id.unpack("a8a4a4a4a12").join('-')],
+                      'customAuthorities' => [],
+                      'additionalInformation' => {
+                        'description' => "This user is for #{user} application.",
+                        'name' => "#{user} API User #{next_id}"
+                      }
+                    }
+
+                    oauth_response, response = zuora_client.rest_call(
+                      method: :post,
+                      body: body.to_json,
+                      url: zuora_client.rest_endpoint("genesis/clients").gsub('v1/', ''),
+                      session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic,
+                      headers: auth_headers
+                    )
+
+                    new_zuora_client = ZuoraAPI::Oauth.new(url: "https://#{zuora_host}", oauth_client_id: oauth_response["clientId"], oauth_secret: oauth_response["clientSecret"] )
+                    if session["ZuoraCurrentUserInfo"].blank?
+                      client_describe, response = new_zuora_client.rest_call(url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''), session_type: :bearer)
+                    else
+                      client_describe = session["ZuoraCurrentUserInfo"]
+                    end
 
-                available_entities = client_describe["accessibleEntities"].select {|entity| entity['id'] == zuora_entity_id}
-                task_data = {
-                  "id": next_id,
-                  "name": client_describe["tenantName"],
-                  "mode": "Collections",
-                  "status": "Running",
-                  ZuoraConnect::AppInstance::LOGIN_TENANT_DESTINATION => {
-                    "tenant_type": "Zuora",
-                    "username": session["ZuoraCurrentIdentity"]["username"],
-                    "url": new_zuora_client.url,
-                    "status": "Active",
-                    "oauth_client_id": oauth_response['clientId'],
-                    "oauth_secret": oauth_response['clientSecret'],
-                    "authentication_type": "OAUTH",
-                    "entities": available_entities.map {|e| e.merge({'displayName' => client_describe["tenantName"]})}
-                  },
-                  "tenant_ids": available_entities.map{|e| e['entityId']}.uniq,
-                }
-                mapped_values = {:id => next_id, :api_token => rand(36**64).to_s(36), :token => rand(36**64).to_s(36), :zuora_logins => task_data, :oauth_expires_at => Time.now + 1000.years, :zuora_domain => zuora_client.rest_domain, :zuora_entity_ids => [zuora_entity_id]}
-                @appinstance = ZuoraConnect::AppInstance.new(mapped_values)
-                retry_count = 0
-                begin
-                  @appinstance.save(:validate => false)
-                rescue ActiveRecord::RecordNotUnique => ex
-                  if (retry_count += 1) < 3
-                    @appinstance.assign_attributes({:api_token => rand(36**64).to_s(36), :token => rand(36**64).to_s(36)})
-                    retry
+                    available_entities = client_describe["accessibleEntities"].select {|entity| entity['id'] == zuora_entity_id}
+                    task_data = {
+                      "id": next_id,
+                      "name": client_describe["tenantName"],
+                      "mode": "Collections",
+                      "status": "Running",
+                      ZuoraConnect::AppInstance::LOGIN_TENANT_DESTINATION => {
+                        "tenant_type": "Zuora",
+                        "username": session["ZuoraCurrentIdentity"]["username"],
+                        "url": new_zuora_client.url,
+                        "status": "Active",
+                        "oauth_client_id": oauth_response['clientId'],
+                        "oauth_secret": oauth_response['clientSecret'],
+                        "authentication_type": "OAUTH",
+                        "entities": available_entities.map {|e| e.merge({'displayName' => client_describe["tenantName"]})}
+                      },
+                      "tenant_ids": available_entities.map{|e| e['entityId']}.uniq,
+                    }
+                  end
+
+                  if defined?(@appinstance)
+                    @appinstance.zuora_logins = task_data
+                    @appinstance.save(:validate => false)
                   else
-                    Thread.current[:appinstance] = nil
-                    session["appInstance"] = nil
-                    render "zuora_connect/static/error_handled", :locals => {
-                      :title => "Application could not create unique tokens.",
-                      :message => "Please contact support or retry launching application."
-                    }, :layout => false
-                    return
+                    @appinstance = new_instance(
+                      next_id,
+                      zuora_entity_id,
+                      zuora_client.rest_domain,
+                      task_data: task_data,
+                      retry_count: retry_count
+                    )
                   end
                 end
+              rescue ActiveRecord::RecordNotUnique
+                retry if (retry_count -= 1).positive?
+                return
               end
 
               Apartment::Tenant.switch!("public")
@@ -540,6 +622,50 @@ module ZuoraConnect
         end
       end
 
+      def next_instance_id
+        min_instance_id = 24_999_999
+        (ZuoraConnect::AppInstance.all.where("id > #{min_instance_id}").order(id: :desc).limit(1).pluck(:id).first || min_instance_id) + 1
+      end
+
+      def new_instance(id, zuora_entity_id, rest_domain, task_data: nil, retry_count: 0)
+        app_instance = ZuoraConnect::AppInstance.new(
+          :id => id,
+          :api_token => generate_token,
+          :token => generate_token,
+          :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
+          raise if retry_count > 1
+
+          Thread.current[:appinstance] = nil
+          session['appInstance'] = nil
+          render 'zuora_connect/static/error_handled', :locals => {
+            :title => 'Application could not create unique tokens.',
+            :message => 'Please contact support or retry launching application.'
+          }, :layout => false
+          return
+        end
+
+        app_instance
+      end
+
+      def generate_token
+        rand(36**64).to_s(36)
+      end
+
       def setup_instance_via_dev_mode
         session["appInstance"] = ZuoraConnect.configuration.dev_mode_appinstance
         user = ZuoraConnect.configuration.dev_mode_user

data/lib/zuora_connect/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.59
+  version: 2.0.60a
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -429,9 +429,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: