zuora_connect 2.1.1 → 3.0.0.pre.e

data/lib/resque/dynamic_queues.rb

@@ -92,7 +92,7 @@ module Resque
         log_with_severity :error, "Error reserving job: #{ex.inspect}"
         log_with_severity :error, ex.backtrace.join("\n")
       end
-      raise e
+      raise ex
     end
 
     def create_job(queue, payload)

data/lib/resque/plugins/app_instance_job.rb

@@ -12,14 +12,14 @@ module Resque
         when "Hash"
           data = args.merge({:worker_class => self.to_s})
         end
-        if Rails.logger.is_a?(Ougai::Logger)
+        if Rails.logger.is_a?(Ougai::Logger) 
           Rails.logger.with_fields = {job: data, trace_id: SecureRandom.uuid, name: "RailsWorker"}
         end
 
         begin
-          connection_count ||= 0
+          connection_count ||= 0 
           @appinstance = ZuoraConnect::AppInstance.find(args['app_instance_id'].to_i)
-          job_start_log(args)
+          Rails.logger.info('Starting job') 
 
           @appinstance.new_session(holding_pattern: true)
         rescue ActiveRecord::RecordNotFound => exception
@@ -52,12 +52,12 @@ module Resque
           return
         rescue ZuoraConnect::Exceptions::ConnectCommunicationError => exception
           Rails.logger.warn("Enqueue Job Again ~ 2 mins", exception)
-          @appinstance.queue_pause(time: 2.minutes.to_i)
+          @appinstance.queue_pause(time: 2.minutes.to_i) 
           Resque.enqueue_to(self.job.queue, self.job.payload['class'], args)
           return
         rescue Net::ReadTimeout, Net::OpenTimeout, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => exception
           Rails.logger.warn("Enqueue Job Again ~ 2 mins", exception)
-          @appinstance.queue_pause(time: 2.minutes.to_i)
+          @appinstance.queue_pause(time: 2.minutes.to_i) 
           Resque.enqueue_to(self.job.queue, self.job.payload['class'], args)
           return
         end
@@ -68,10 +68,6 @@ module Resque
         @appinstance.cache_app_instance if defined?(@appinstance)
         Rails.logger.flush if Rails.logger.methods.include?(:flush)
       end
-
-      def job_start_log(args)
-       Rails.logger.info("Starting job")
-      end
     end
   end
-end
+end

data/lib/zuora_connect.rb

@@ -9,10 +9,12 @@ require 'resque/silence_done'
 require 'resque/self_lookup'
 require 'resque/plugins/custom_logger'
 require 'resque/plugins/app_instance_job'
-require 'logging/connect_formatter'
-require 'metrics/influx/point_value'
 require 'metrics/net'
 require 'mono_logger'
+require 'zuora_connect/zuora_audit'
+require 'active_record'
+require 'zuora_observability'
+::ActiveRecord::Base.send :include, ZuoraConnect::ZuoraAudit
 
 module ZuoraConnect
   class << self
@@ -26,68 +28,9 @@ module ZuoraConnect
        when 'test'
         Rails.logger
       else
-        @logger ||= custom_logger(name: "Connect", level: Rails.logger.level)
+        @logger ||= ZuoraObservability::Logger.custom_logger(name: "Connect", level: Rails.logger.level)
       end
     end
-
-    def custom_logger(name: "", level: Rails.logger.present? ? Rails.logger.level : MonoLogger::INFO, type: :ougai)
-      #puts name + ' - ' + {Logger::WARN => 'Logger::WARN', Logger::ERROR => 'Logger::ERROR', Logger::DEBUG => 'Logger::DEBUG', Logger::INFO => 'Logger::INFO' }[level] + ' - '
-      if type == :ougai
-        require 'ougai'
-        require "ougai/formatters/customizable"
-        #logger = Ougai::Logger.new(MonoLogger.new(STDOUT))
-        logger = Ougai::Logger.new(STDOUT)
-        logger.level = level
-        if ZuoraConnect.configuration.json_logging
-          logger.formatter = Ougai::Formatters::ConnectFormatter.new(name)
-          logger.before_log = lambda do |data|
-            data[:trace_id] = ZuoraConnect::RequestIdMiddleware.request_id if ZuoraConnect::RequestIdMiddleware.request_id.present?
-            data[:zuora_trace_id] = ZuoraConnect::RequestIdMiddleware.zuora_request_id if ZuoraConnect::RequestIdMiddleware.zuora_request_id.present?
-            #data[:traces] = {amazon_id: data[:trace_id], zuora_id: data[:zuora_trace_id]}
-          end
-        else
-          logger.formatter = Ougai::Formatters::Customizable.new(
-            format_err: proc do |data|
-              next nil unless data.key?(:err)
-              err = data.delete(:err)
-              "  #{err[:name]} (#{err[:message]})\n #{err[:stack]}"
-            end,
-            format_data: proc do |data|
-              data.delete(:app_instance_id); data.delete(:tenant_ids); data.delete(:organization); data.delete(:environment)
-              format('%s %s: %s', 'DATA'.ljust(6), Time.now.strftime('%FT%T.%6NZ'), "#{data.to_json}") if data.present?
-            end,
-            format_msg: proc do |severity, datetime, _progname, data|
-              msg = data.delete(:msg)
-              format('%s %s: %s', severity.ljust(6), datetime, msg)
-            end
-          )
-          logger.formatter.datetime_format = '%FT%T.%6NZ'
-        end
-      else
-        logger = MonoLogger.new(STDOUT)
-        logger.level = level
-        logger.formatter =  proc do |serverity, datetime, progname, msg|
-          begin
-            msg = JSON.parse(msg)
-          rescue JSON::ParserError => ex
-          end
-          if ZuoraConnect.configuration.json_logging
-            require 'json'
-            store = {
-              name: name,
-              level: serverity,
-              timestamp: datetime.strftime('%FT%T.%6NZ'),
-              pid: Process.pid,
-              message: name == "ActionMailer" ? msg.strip : msg
-            }
-            JSON.dump(store) + "\n"
-          else
-            format('%s %s: %s', serverity.ljust(6), datetime, msg) + "\n"
-          end
-        end
-      end
-      return logger
-    end
   end
 
   module Controllers
@@ -144,7 +87,7 @@ module ZuoraConnect
       verify_server_cert: false,
       log_level: Logger::INFO,
       service_name: ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : Rails.application.class.parent_name,
-      logger: ZuoraConnect.custom_logger(name: "ElasticAPM", level: MonoLogger::WARN)
+      logger: ZuoraObservability::Logger.custom_logger(name: "ElasticAPM", level: MonoLogger::WARN)
     })
     defaults.merge!({disable_send: true}) if defined?(Rails::Console)
 

data/lib/zuora_connect/controllers/helpers.rb

@@ -124,16 +124,22 @@ module ZuoraConnect
             ElasticAPM.set_user(session["#{@appinstance.id}::user::email"])  if defined?(ElasticAPM) && ElasticAPM.running?
             PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail)
           end
+
+          locale = (session["#{@appinstance.id}::user::locale"] || "").gsub("_", "-") 
           begin
-            locale = session["#{@appinstance.id}::user::locale"]
             I18n.locale = locale.present? ? locale : @appinstance.locale
           rescue I18n::InvalidLocale => ex
+            if locale.include?("-")
+              locale = locale.split("-").first
+              retry
+            elsif locale != session["#{@appinstance.id}::user::language"]
+              locale = session["#{@appinstance.id}::user::language"]
+              retry
+            end
             ZuoraConnect.logger.error(ex) if !ZuoraConnect::AppInstance::IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
           end
-          begin
-            Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
-          rescue
-            ZuoraConnect.logger.error(ex)
+          if @appinstance.user_timezone.blank?
+            @appinstance.set_timezone(timezone: session["#{@appinstance.id}::user::timezone"], type: :default)
           end
         end
       rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex
@@ -219,6 +225,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 +306,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,13 +408,16 @@ 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
+                ZuoraConnect::ZuoraUser.reset_table_name
                 @zuora_user = ZuoraConnect::ZuoraUser.where(:zuora_user_id => zuora_user_id).first
               rescue ActiveRecord::StatementInvalid => ex
                 if ex.message.include?("PG::UndefinedTable") && ex.message.include?("zuora_users")
@@ -355,10 +438,12 @@ module ZuoraConnect
                 @zuora_user = ZuoraConnect::ZuoraUser.create!(:zuora_user_id => zuora_user_id, :zuora_identity_response => {zuora_entity_id => session["ZuoraCurrentIdentity"]})
               end
               @zuora_user.session = session
+              ZuoraConnect::ZuoraUser.current_user_id = zuora_user_id
               session["#{@appinstance.id}::user::localUserId"] = @zuora_user.id
               session["#{@appinstance.id}::user::email"] = session['ZuoraCurrentIdentity']["username"]
               session["#{@appinstance.id}::user::timezone"] = session['ZuoraCurrentIdentity']["timeZone"]
-              session["#{@appinstance.id}::user::locale"] = session['ZuoraCurrentIdentity']["language"]
+              session["#{@appinstance.id}::user::language"] = session['ZuoraCurrentIdentity']["language"]
+              session["#{@appinstance.id}::user::locale"] = session['ZuoraCurrentIdentity']["locale"]
               session["appInstance"] = @appinstance.id
 
             #We have multiple, user must pick
@@ -380,79 +465,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")
@@ -483,8 +574,8 @@ module ZuoraConnect
 
           rescue ZuoraAPI::Exceptions::ZuoraAPIError, Exception => ex
             if ex.message.include?("Referenced User resource(s) not found") && ex.class == ZuoraAPI::Exceptions::ZuoraAPIError
-              locals = {title: "Provisioning Error", message: "New tenats need to be provisioned by API Gateway('#{ex.message}'). Please contact support."}
-              render "zuora_connect/static/error_handled", locals: locals, status: 400, layout: false
+              locals = {title: "Provisioning Error", message: "New tenants need to be provisioned by API Gateway('#{ex.message}'). Please contact support."}
+              render "zuora_connect/static/error_handled", locals: locals, status: 200, layout: false
             else
               session.clear
               if defined?(ex.response) && ex.response.present? && defined?(ex.response.body)
@@ -540,28 +631,77 @@ 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
-        key = ZuoraConnect.configuration.dev_mode_pass
-        values = {:user => user , :key => key, :appinstance => session["appInstance"]}
-        @appinstance = ZuoraConnect::AppInstance.find_by(:id => values[:appinstance].to_i)
+        session["#{ZuoraConnect.configuration.dev_mode_appinstance}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
+ 
+        values = {
+          id: ZuoraConnect.configuration.dev_mode_appinstance,
+          name: "Developer Instance",
+          access_token: ZuoraConnect.configuration.dev_mode_user, 
+          refresh_token: ZuoraConnect.configuration.dev_mode_pass, 
+          token: ZuoraConnect.configuration.dev_mode_pass+ZuoraConnect.configuration.dev_mode_pass, 
+          api_token: ZuoraConnect.configuration.dev_mode_pass+ZuoraConnect.configuration.dev_mode_pass
+        }
+        
+        @appinstance = ZuoraConnect::AppInstance.find_by(:id => ZuoraConnect.configuration.dev_mode_appinstance.to_i)
+        ZuoraConnect::ZuoraUser.current_user_id = 0
         if @appinstance.blank?
           Apartment::Tenant.switch!("public")
           begin
-            Apartment::Tenant.create(values[:appinstance].to_s)
+            Apartment::Tenant.create(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
           rescue Apartment::TenantExists => ex
-            Apartment::Tenant.drop(values[:appinstance].to_s)
+            Apartment::Tenant.drop(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
             retry
           end
-
-          @appinstance = ZuoraConnect::AppInstance.new(:id => values[:appinstance].to_i, :access_token => values[:user], :refresh_token => values[:key], :token => "#{values[:key]}#{values[:key]}", :api_token => "#{values[:key]}#{values[:key]}")
-          @appinstance.save(:validate => false)
-        end
-        if @appinstance.access_token.blank? || @appinstance.refresh_token.blank? || @appinstance.token.blank? || @appinstance.api_token.blank?
-          @appinstance.update_attributes!(:access_token =>  values["user"], :refresh_token =>  values["key"], :token => "#{values[:key]}#{values[:key]}", :api_token => "#{values[:key]}#{values[:key]}")
+          @appinstance = ZuoraConnect::AppInstance.new()
         end
-        session["#{@appinstance.id}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
+        @appinstance.assign_attributes(values)
+        @appinstance.save(:validate => false)
       end
     end
   end