zuora_connect 2.0.58a → 2.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a03cd7450b81983c6d782fe911babc655153094bf6ff41fec0b3ed3a3a06888
-  data.tar.gz: 99eff46c23e53cd0d09b4c0fdafe199c239f800ca55dcaed255674d69729a2db
+  metadata.gz: 1b0443ea374a1f1f82e212960a7df80fb9aa953fb4bf0fcb123949e73dfc622d
+  data.tar.gz: a356f5120206bf8febbdca0db439c5792dca19156776356f09f5a39da50cf7b1
 SHA512:
-  metadata.gz: 7cd29354de9ecb38d51ce8361029fc6a15a008f76d659723245fe12686068757fa34b768198a571ed4390bed750e49086b49fb1099702c2475b66b4506e49c57
-  data.tar.gz: beb5f965e6f8a88bbec73ecb507d595f82f468e419a958aec6dc33a8d4d17f17ccbf45fb90669dbf252d8e92799b9a7778323a833a618dd87a966dbf25fac51d
+  metadata.gz: 34e40410cfcd4752b174d584d2cf883084630b56e7e4d897733da177fa66ece76c9ec3b2556e0ea3778b05eed949c6dba9e4c37f635d178fb9d77f776ec5221f
+  data.tar.gz: '08dde90f26d809089f79928c0cfa6d7c43d551b61448b7ce040b0ba05aa64552599ff3e3c49f46feb54340d846565faa75f891730501e2ad1ffe6a8c554856e5'

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,11 +1,10 @@
 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]
-
-    skip_before_action :verify_authenticity_token, :only => [:initialize_app, :provision]
-    http_basic_authenticate_with name: ENV['PROVISION_USER'], password: ENV['PROVISION_SECRET'], :only => [:provision]
+    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]
 
     def metrics
       type = params[:type].present? ? params[:type] : "versions"
@@ -35,13 +34,11 @@ module ZuoraConnect
     def initialize_app
       begin
         authenticate_connect_app_request
-        unless performed?
-          @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
-          render json: {
-            message: 'Success',
-            status: 200
-          }, status: 200
-        end
+        @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
+        render json: {
+          message: "Success",
+          status: 200
+        }, status: 200
       rescue => ex
         Rails.logger.error("Failed to Initialize application", ex)
         if performed?
@@ -55,28 +52,6 @@ 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,10 +3,6 @@ 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/zuora_connect/controllers/helpers.rb

@@ -219,80 +219,6 @@ 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']
@@ -300,7 +226,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'] || request.headers['Zuora-Host'] || 'apisandbox.zuora.com'
+          zuora_host = request.headers["HTTP_X_FORWARDED_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 = {}
@@ -402,13 +328,11 @@ 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'].present?
               #Add user/update
               begin
                 @zuora_user = ZuoraConnect::ZuoraUser.where(:zuora_user_id => zuora_user_id).first
@@ -456,85 +380,79 @@ module ZuoraConnect
                 return
               end
               Apartment::Tenant.switch!("public")
-              retry_count = 3
-              task_data = {}
-              begin
-                ActiveRecord::Base.transaction do
-                  ActiveRecord::Base.connection.execute('LOCK public.zuora_users IN ACCESS EXCLUSIVE MODE')
+              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)
 
-                  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)
-
-                    if appinstances.size > 0
-                      redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
-                      return
-                    end
-                  end
+                if appinstances.size > 0
+                  redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
+                  return
+                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
+                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
+                )
 
-                    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
+                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
 
-                  if defined?(@appinstance)
-                    @appinstance.zuora_logins = task_data
-                    @appinstance.save(:validate => false)
+                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
                   else
-                    @appinstance = new_instance(
-                      next_id,
-                      zuora_entity_id,
-                      zuora_client.rest_domain,
-                      task_data: task_data,
-                      retry_count: retry_count
-                    )
+                    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
                 end
-              rescue ActiveRecord::RecordNotUnique
-                retry if (retry_count -= 1).positive?
-                return
               end
 
               Apartment::Tenant.switch!("public")
@@ -622,43 +540,6 @@ 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,
-          :zuora_logins => task_data,
-          :oauth_expires_at => Time.now + 1000.years,
-          :zuora_domain => rest_domain,
-          :zuora_entity_ids => [zuora_entity_id]
-        )
-
-        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.58a"
+  VERSION = "2.0.58"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.58a
+  version: 2.0.58
 platform: ruby
 authors:
 - Connect Team
@@ -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: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: