leap_salesforce 0.1.18 → 0.2.0

data/ChangeLog

@@ -1,3 +1,7 @@
+Version 0.2.0
+* Enhancements
+  * Ability to use `sfdx` to authenticate allowing authentication against sandboxes
+
 Version 0.1.18
 * Enhancements
   * `LeapSalesforce.logger` can be used to configure logger

data/Rakefile

@@ -33,4 +33,4 @@ YARD::Doctest::RakeTask.new do |task|
   # task.pattern = 'lib/**/*.rb'
   # TODO: Get all examples working in this way
   task.pattern = 'lib/leap_salesforce/ext/string.rb'
-end
+end

data/config/general.rb

@@ -4,3 +4,5 @@
 module LeapSalesforce
   Users.add User.new :admin, 'samuel.garratt@brave-otter-ttxype.com'
 end
+
+ENV['SF_USERNAME'] = 'samuel.garratt@brave-otter-ttxype.com'

data/config/project-scratch-def.json

@@ -0,0 +1,12 @@
+{
+    "orgName": "Dreamhouse",
+    "edition": "Developer",
+    "hasSampleData": "false",
+    "settings": {
+      "orgPreferenceSettings": {
+        "s1DesktopEnabled": true,
+        "selfSetPasswordInApi": true,
+        "s1EncryptedStoragePref2": false
+      }
+    }
+}

data/exe/leap_salesforce

@@ -16,6 +16,7 @@ module LeapSalesforce
     include LeapSalesforce::ExeHelpers
 
     OAUTH_WIKI = 'https://gitlab.com/leap-dojo/leap_salesforce/wikis/SetUpOAuthApp'
+    SFDX_WIKI = 'https://gitlab.com/leap-dojo/leap_salesforce/wikis/UsingSfdxAuth'
 
     desc 'init', 'Create new leap salesforce repository'
     option :setup_done, default: false, type: :boolean, banner: 'Whether setup is done'
@@ -25,14 +26,16 @@ module LeapSalesforce
     option :user_key, banner: 'Key to identify user by'
     option :password, banner: 'User password'
     option :environment, banner: 'Environment to set automation code up for'
+    option :sfdx, banner: 'Whether to use sfdx for authentication', default: false, type: :boolean
     def init
-      # Ask user to create OAuth application by following
+      LeapSalesforce.sfdx = options[:sfdx]
+      wiki = LeapSalesforce.sfdx ? SFDX_WIKI : OAUTH_WIKI
       unless options[:setup_done]
-        oauth_setup = input_for "Have you set up OAuth application by following #{OAUTH_WIKI} (y/n)?", :red
+        # Ask user to create OAuth application by following doc
+        oauth_setup = input_for "Have you set up OAuth application by following #{wiki} (y/n)?", :red
         exit if oauth_setup.downcase == 'n'
       end
-
-      query_for_parameters
+      query_for_parameters # TODO: for sfdx
       generate_files binding, ['Gemfile', 'Rakefile', '.leap_salesforce.yml', '.rspec', '.gitignore',
                                { config: ['general.rb', { credentials: 'salesforce_oauth2.yml' }] },
                                { spec: %w[spec_helper.rb limit_spec.rb crud_eg_spec.rb picklists_spec.rb] }]

data/lib/leap_salesforce/auth.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+require_relative 'error'
+
+module LeapSalesforce
+  # Code related to authorising in LeapSalesforce
+  # Specific authorisation parameters are stored here. More general settings
+  # are stored at the layer above this
+  module Auth
+    @access_token = nil
+    @instance_url = nil
+    # @return [String] Setup JWT trail head
+    SETUP_JWT_LINK = 'https://trailhead.salesforce.com/content/learn/projects/automate-cicd-with-gitlab/https://trailhead.salesforce.com/content/learn/projects/automate-cicd-with-gitlab/integrate-with-gitlab'
+    class << self
+      # @return [String] Access token taken from sfdx
+      attr_writer :access_token
+      # Instance Url taken from sfdx
+      attr_writer :instance_url
+      # @return [String] Output from SFDX command
+      attr_accessor :sfdx_display_output
+
+      # @return [String] Access token taken from sfdx. Value is extracted if
+      #   not cached. If not using sfdx this will not be stored here but
+      #   within Soaspec which caches the OAuth result
+      def access_token
+        return @access_token if @access_token
+
+        extract_sfdx_variables
+        @access_token
+      end
+
+      # @return [String] Instance URL taken from sfdx. Value is extracted if
+      #   not cached
+      def instance_url
+        return @instance_url if @instance_url
+
+        extract_sfdx_variables
+        @instance_url
+      end
+
+      # @return [Boolean] Whether Sfdx authentication variables are set
+      def sfdx_variables?
+        !(access_token && instance_url).nil?
+      end
+
+      # @return [TrueClass] Whether JWT file exists Exception is raised if it
+      #   is not
+      def jwt_file?
+        ENV['JWT_FOLDER'] ||= Dir.exist?('JWT') ? 'JWT' : 'assets'
+        unless File.exist?(File.join(ENV['JWT_FOLDER'], 'server.key'))
+          raise LeapSalesforce::SetupError 'Please create JWT file in ' \
+        " '#{ENV['JWT_FOLDER']}/server.key' following #{SETUP_JWT_LINK}"
+        end
+
+        true
+      end
+
+      # Extract sfdx variables and store them
+      # Set ENV['SCRATCH_ORG'] to true to authenticate and run against sandbox
+      def extract_sfdx_variables
+        script_name = if ENV['SCRATCH_ORG'] && !ENV['SCRATCH_ORG'].empty?
+                        puts "Using sandbox #{ENV['SCRATCH_ORG_ALIAS']}"
+                        'get_scratch_auth'
+                      else
+                        'get_prod_auth'
+                      end
+        self.sfdx_display_output = `sh #{__dir__}/#{script_name}.sh`
+        self.access_token = from_output 'Access Token'
+        url_obtained = from_output 'Instance Url'
+        self.instance_url = url_obtained[-1] == '/' ? url_obtained[0..-2] : url_obtained
+        LeapSalesforce.client_id = ENV['SF_CONSUMER_KEY']
+        LeapSalesforce.password = :not_needed
+        LeapSalesforce.client_secret = :not_needed
+      end
+
+      private
+
+      def from_output(variable)
+        var_line = sfdx_display_output.lines.find do |line|
+          line.start_with? variable
+        end
+        raise LeapSalesforce::SetupError, "Error retrieving from #{sfdx_display_output}" unless var_line
+
+        var_line.split[-1]
+      end
+    end
+  end
+end

data/lib/leap_salesforce/generator/exe_helpers.rb

@@ -21,28 +21,26 @@ module LeapSalesforce
 
     # Retrieve environment and ensure that environment can be connected to
     def verify_environment
-      LeapSalesforce.environment = options[:environment] || input_for('Enter the environment you want to set things up for ' \
-'(This will be parameterised so can be changed later). For production used "prod". Otherwise preference is to use the' \
-' part of the URL that is unique for the environment')
-      # Verify connection to environment
-      RestClient.get(LeapSalesforce.general_url)
-    rescue SocketError
-      message = "Unable to connect to #{LeapSalesforce.general_url}. Potentially problem with" \
-      ' internet or proxy settings'.colorize :red
-      raise LeapSalesforce::SetupError, message
-    else
+      unless LeapSalesforce.sfdx
+        LeapSalesforce.environment = options[:environment] || input_for('Enter the environment you want to set things up for ' \
+  '(This will be parameterised so can be changed later). For production used "prod". Otherwise preference is to use the' \
+  ' part of the URL that is unique for the environment')
+      end
+      LeapSalesforce.salesforce_reachable?
       puts "\u2713 Connection to #{LeapSalesforce.general_url} successful".colorize :green
     end
 
     # Retrieve OAuth credentials and verify that they're correct
     def verify_oauth
-      LeapSalesforce.client_id = options[:client_id] || input_for('Client id (Customer Id)')
-      LeapSalesforce.client_secret = options[:client_secret] || STDIN.getpass('Client secret (Consumer Secret)')
-      LeapSalesforce.api_user = ERB.new(options[:username] || input_for('Salesforce username. It is ideal to start with a System admin' \
-' so that any necessary metadata can be read. More users can be added later. You can use ERB to make name' \
-' vary according to environment (e.g., test.user@<%= LeapSalesforce.environment %>.my.company.com)')).result(binding)
-      LeapSalesforce.password = options[:password] || STDIN.getpass('Password (Recommendation is that 1 password' \
-' be shared across all test users to be easier to manage):')
+      unless LeapSalesforce.sfdx
+        LeapSalesforce.client_id = options[:client_id] || input_for('Client id (Customer Id)')
+        LeapSalesforce.client_secret = options[:client_secret] || STDIN.getpass('Client secret (Consumer Secret)')
+        LeapSalesforce.api_user = ERB.new(options[:username] || input_for('Salesforce username. It is ideal to start with a System admin' \
+  ' so that any necessary metadata can be read. More users can be added later. You can use ERB to make name' \
+  ' vary according to environment (e.g., test.user@<%= LeapSalesforce.environment %>.my.company.com)')).result(binding)
+        LeapSalesforce.password = options[:password] || STDIN.getpass('Password (Recommendation is that 1 password' \
+  ' be shared across all test users to be easier to manage):')
+      end
       LeapSalesforce.oauth_working?
     end
 

data/lib/leap_salesforce/generator/generator.rb

@@ -32,7 +32,7 @@ module LeapSalesforce
 
     # @example Create a spec_helper file and test file in spec folder
     #   generate_files [ { spec: [ 'spec_helper.rb', 'limit_spec.rb' ] } ]
-    # @param [Hash] list_of_files Hash of files to generate for
+    # @param [Hash, Array] list_of_files Hash of files to generate for
     def generate_files(binding, list_of_files, folder: nil)
       return create_inner_file(folder, list_of_files, binding) unless list_of_files.respond_to? :each
 

data/lib/leap_salesforce/generator/templates/.gitignore.erb

@@ -1,2 +1,6 @@
-logs/
-config/credentials/ # Confidential files stored here
+logs/               # API logs stored here
+config/credentials/ # Confidential files stored
+
+# sfdx
+/JWT/
+/scripts/setup_env.sh

data/lib/leap_salesforce/generator/templates/.leap_salesforce.yml.erb

@@ -1,5 +1,6 @@
 environment: <%= LeapSalesforce.environment %>
 # lib_folder: lib/leap_salesforce # Default folder where assets will be stored
+sfdx: <%= LeapSalesforce.sfdx %>
 soql_objects:
   - Case
   - Contact

data/lib/leap_salesforce/generator/templates/config/credentials/salesforce_oauth2.yml.erb

@@ -1,3 +1,5 @@
 client_id: '<%= LeapSalesforce.client_id %>'
+<% unless LeapSalesforce.sfdx %>
 client_secret: '<%= LeapSalesforce.client_secret %>'
-password: '<%= LeapSalesforce.password %>'
+password: '<%= LeapSalesforce.password %>'
+<% end %>

data/lib/leap_salesforce/generator/templates/config/general.rb.erb

@@ -4,3 +4,9 @@
 module LeapSalesforce
   Users.add User.new <%= ":#{@user_key}" %>, '<%= LeapSalesforce.api_user %>'
 end
+
+<%=
+if LeapSalesforce.sfdx
+  "ENV['SF_USERNAME'] = '#{ENV['SF_USERNAME']}'"
+end
+%>

data/lib/leap_salesforce/get_prod_auth.sh

@@ -0,0 +1,2 @@
+sfdx force:auth:jwt:grant --clientid "$SF_CONSUMER_KEY" --jwtkeyfile "$JWT_FOLDER"/server.key --username "$SF_USERNAME" --setdefaultdevhubusername --setalias HubOrg
+sfdx force:org:display --targetusername "$SF_USERNAME"

data/lib/leap_salesforce/get_scratch_auth.sh

@@ -0,0 +1,2 @@
+sfdx force:auth:jwt:grant --clientid "$SF_CONSUMER_KEY" --jwtkeyfile "$JWT_FOLDER"/server.key --username "$SF_USERNAME" --setdefaultdevhubusername --setalias HubOrg
+sfdx force:org:display --targetusername "$SCRATCH_ORG_ALIAS"

data/lib/leap_salesforce/loader.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module LeapSalesforce
+  # For loading dependent code based on configuration
+  module Loader
+    # @return [String] Location of leap_salesforce YAML file
+    LEAP_CONFIG_FILE = '.leap_salesforce.yml'
+    class << self
+      def load_config_file
+        if File.exist? LEAP_CONFIG_FILE
+          leap_config = YAML.load_file LEAP_CONFIG_FILE
+          LeapSalesforce.soql_objects = leap_config.delete('soql_objects')
+          leap_config.each do |key, value|
+            if %w[SF_CONSUMER_KEY client_id client_secret password].include? key
+              LeapSalesforce.logger.warn "Secret key '#{key}' should be in non version" \
+          " controlled #{LeapSalesforce::CREDENTIAL_FILE} not in #{LEAP_CONFIG_FILE}"
+            end
+            LeapSalesforce.send("#{key}=", value)
+          end
+        else
+          LeapSalesforce.logger.warn "No config file found at #{LEAP_CONFIG_FILE} for Leap Salesforce"
+        end
+      end
+    end
+  end
+end

data/lib/leap_salesforce/parameters.rb

@@ -3,6 +3,9 @@
 require_relative 'users/users'
 require_relative 'soql_object'
 require 'logger'
+require_relative 'auth'
+# @return [String] Tutorial on creating an sfdx app
+CREATE_APP_LINK = 'https://trailhead.salesforce.com/content/learn/projects/automate-cicd-with-gitlab/enable-dev-hub-and-create-a-connected-app'
 
 # Adding parameters to set for authentication, environment and other common settings
 module LeapSalesforce
@@ -16,6 +19,10 @@ module LeapSalesforce
   @environment = nil
   @logger = Logger.new STDOUT
   @sfdx = false
+  # @access_token = nil
+  @instance_url = nil
+  # @return [String] File where Salesforce credentials are stored
+  CREDENTIAL_FILE = File.join('config', 'credentials', 'salesforce_oauth2.yml')
   class << self
     # @return [String] Environment to use for tests. This can be accessed to change the username used to login
     #   to test.salesforce with. This can be set on the command line with 'LEAP_ENV'
@@ -23,10 +30,25 @@ module LeapSalesforce
       ENV['LEAP_ENV'] || @environment
     end
 
-    # @return [TrueClass] If OAuth authentication is working, return true. Otherwise raise exception
+    # Verify connection to Salesforce environment
+    def salesforce_reachable?
+      RestClient.get(LeapSalesforce.general_url)
+    rescue SocketError
+      message = "Unable to connect to #{LeapSalesforce.general_url}. Potentially problem with" \
+      ' internet or proxy settings'.colorize :red
+      raise LeapSalesforce::SetupError, message
+    end
+
+    # @return [TrueClass] If OAuth authentication is working, return true.
+    #   Otherwise raise exception
     def oauth_working?
-      Soaspec::OAuth2.debug_oauth = true
-      Soaspec::OAuth2.new(LeapSalesforce.oauth_settings).access_token
+      salesforce_reachable?
+      if LeapSalesforce.sfdx
+        sfdx_auth_setup?
+      else
+        Soaspec::OAuth2.debug_oauth = true
+        Soaspec::OAuth2.new(LeapSalesforce.oauth_settings).access_token
+      end
     rescue StandardError
       raise LeapSalesforce::SetupError, "Cannot perform OAuth. See 'logs' folder for details of what was sent"
     else
@@ -35,6 +57,19 @@ module LeapSalesforce
       true
     end
 
+    # Checks whether sfdx is setup according to standard approach. Errors are
+    # logged
+    # @return [Boolean] Whether sfdx is setup correctly
+    def sfdx_auth_setup?
+      Auth.jwt_file?
+      return true if LeapSalesforce::Auth.sfdx_variables?
+
+      raise LeapSalesforce::SetupError, 'LeapSalesforce::Auth.access_token and ' \
+           'instance_url were not able to be retrieved by sfdx'
+    end
+
+    # OAuth parameters when using a custom Connected application not
+    # using sfdx
     # @return [Hash] OAuth2 parameters used in connecting to salesforce
     def oauth_settings
       settings = {

data/lib/leap_salesforce/rake/sfdx.rake

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# Convenience tasks that use sfdx according to common environment variables
+namespace :sfdx do
+  desc 'Login with credentials'
+  task :login do
+    puts `sfdx force:auth:jwt:grant --clientid $SF_CONSUMER_KEY --jwtkeyfile JWT/server.key --username $SF_USERNAME --setdefaultdevhubusername --setalias HubOrg`
+  end
+
+  task :display do
+    puts `sfdx force:org:display --targetusername samuel.garratt@brave-otter-ttxype.com`
+  end
+
+  desc 'Create dev environment'
+  task :create_dev do
+    puts `sfdx force:org:create --targetdevhubusername HubOrg --setdefaultusername --definitionfile config/project-scratch-def.json --setalias $SCRATCH_ORG_ALIAS --wait 10 --durationdays 7`
+  end
+
+  desc 'Open environment in browser'
+  task :open do
+    puts `sfdx force:org:open`
+  end
+
+  desc 'Delete dev environment'
+  task :delete_dev do
+    puts `sfdx force:org:delete --targetusername $SCRATCH_ORG_ALIAS --noprompt`
+  end
+end

data/lib/leap_salesforce/soql_data/soql_global_object_data.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
+require_relative 'tooling'
+
 # Methods for working with instances of global to soql objects, not global overall
 # See https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_sobject_describe.htm
 module SoqlGlobalObjectData
+  include LeapSalesforce::Tooling
   # @return [Hash] List of ids to delete when deleting a particular object
   attr_accessor :ids_to_delete
 
   # Override to handle removing dependent records
+  # @param [String] _id Id of record being deleted
   def remove_dependent_records(_id); end
 
   # Return key and value to look up for a provided hash
@@ -52,13 +56,14 @@ module SoqlGlobalObjectData
   # @return [String] SOQL query to filter results
   def soql_lookup_filter(lookup)
     limit = lookup.delete(:limit)
+    @default_filter ||= 'CreatedDate'
     conditional = ''
     lookup.each do |key, value|
       conditional_term = conditional.empty? ? 'WHERE' : 'AND'
       key_used = map_key key
       conditional += "#{conditional_term} #{key_used} #{condition_for(value)} "
     end
-    query = conditional + 'ORDER BY CreatedDate DESC NULLS FIRST'
+    query = conditional + "ORDER BY #{@default_filter} DESC NULLS FIRST"
     query += " LIMIT #{limit}" if limit
     query
   end
@@ -153,19 +158,19 @@ module SoqlGlobalObjectData
   # @param [Hash] data Key value pairs with data to update
   # @return [self] SoqlData object representing result of API update call
   def update(id, data)
+    enforce_type_for id
     must_pass = data.delete(:must_pass)
     data = data.transform_values do |value|
       value.is_a?(Time) ? value.salesforce_format : value
     end
     data.transform_keys! { |key| map_key(key) } # Map keys to valid field names
     SoqlHandler.new("Update #{id}").use
-
     update = new("Update #{self}, #{id} with '#{data}'", method: :patch,
                                                          suburl: "sobjects/#{soql_object_name}/#{id}", body: data)
     update.call
     return update unless must_pass
 
-    successful?
+    update.successful?
     update
   end
 
@@ -173,10 +178,11 @@ module SoqlGlobalObjectData
   # @example Delete a contact with a specified id, failing if the delete fails
   #   Contact.delete '0032v00002rgv2pAAA', must_pass: true
   #
-  # @param [String] id Id of element to remove
+  # @param [String, Symbol] id Id of element to remove
   # @param [Boolean] must_pass Whether to raise exception if call is not successful
   # @return [self] Exchange object making delete call
   def delete(id, must_pass: false)
+    enforce_type_for id
     SoqlData.ids_to_delete.reject! { |table, id_to_remove| table == self && id_to_remove == id } # Remove id from list to delete
     remove_dependent_records(id)
 
@@ -225,8 +231,10 @@ module SoqlGlobalObjectData
   # @param [Symbol, String] key Key to map to Table field name
   # @return [String] Field name of Salesforce entity to use
   def map_key(key)
-    if field_names.include? key.to_s
+    if field_names.include?(key.to_s)
       key.to_s
+    elsif field_names.include?(key.to_s.camelize)
+      key.to_s.camelize
     else
       return new.send("#{key}_element") if new.respond_to?("#{key}_element")
 
@@ -266,4 +274,15 @@ module SoqlGlobalObjectData
       [value[0], value[1..-1]]
     end
   end
+
+  private
+
+  # Raise error if incorrect type passed
+  # @param [String, Symbol] id Id to verify
+  def enforce_type_for(id)
+    return if [String, Symbol].include? id.class
+
+    raise ArgumentError,
+          "Id must be String or Symbol but was #{id.class} to delete"
+  end
 end

data/lib/leap_salesforce/soql_data/soql_handler.rb

@@ -7,12 +7,18 @@ require 'soaspec'
 # Credentials are stored either in 'config/credentials' folder or via environment variables
 # To check out SOQL SCHEMA go to workbench.developerforce.com. Use Sandbox and login
 class SoqlHandler < Soaspec::RestHandler
-  oauth2 LeapSalesforce.oauth_settings unless LeapSalesforce.sfdx
   if LeapSalesforce.sfdx
-    # @return [String]
+    # @return [String] Instance Url taken from sfdx
     def instance_url
-      # TODO: Get this
+      LeapSalesforce::Auth.instance_url
     end
+
+    # @return [String] Access token taken from sfdx
+    def access_token
+      LeapSalesforce::Auth.access_token
+    end
+  else
+    oauth2 LeapSalesforce.oauth_settings
   end
   base_url '<%= instance_url %>/services/data/v<%= api_version %>/'
 

data/lib/leap_salesforce/soql_data/tooling.rb

@@ -0,0 +1,15 @@
+module LeapSalesforce
+  # Methods to interact with tooling API.
+  # See https://developer.salesforce.com/docs/atlas.en-us.api_tooling.meta/api_tooling/intro_rest_resources.htm
+  module Tooling
+    def tooling_objects
+      new("Tooling sobjects",
+          method: :get, suburl: "tooling/sobjects")
+    end
+
+    def run_test_asynchronous
+      new('Test run async', method: :post,
+          suburl: 'tooling/runTestsAsynchronous/')
+    end
+  end
+end

data/lib/leap_salesforce/version.rb

@@ -2,5 +2,5 @@
 
 module LeapSalesforce
   # @return [String] Version of leap salesforce
-  VERSION = '0.1.18'
+  VERSION = '0.2.0'
 end

data/lib/leap_salesforce.rb

@@ -17,58 +17,51 @@ require 'rake'
 require 'factory_bot' # For mass production of data
 require 'faker' # For fake data
 require 'leap_salesforce/error'
+require 'leap_salesforce/loader'
 
-LEAP_CONFIG_FILE = '.leap_salesforce.yml'
-CREDENTIAL_FILE = File.join('config', 'credentials', 'salesforce_oauth2.yml')
+module LeapSalesforce
+  leap_logger = LeapSalesforce.logger
+  leap_logger.level = Logger::DEBUG
+  leap_logger.datetime_format = '%Y-%m-%d %H:%M:%S'
 
-leap_logger = LeapSalesforce.logger
-leap_logger.level = Logger::DEBUG
-leap_logger.datetime_format = '%Y-%m-%d %H:%M:%S'
+  LeapSalesforce::Loader.load_config_file
+  raise SetupError, 'LeapSalesforce.environment not set' if environment.nil? && !sfdx
 
-if File.exist? LEAP_CONFIG_FILE
-  leap_config = YAML.load_file LEAP_CONFIG_FILE
-  LeapSalesforce.soql_objects = leap_config.delete('soql_objects')
-  leap_config.each do |key, value|
-    if %w[client_id client_secret password].include? key
-      leap_logger.warn "Secret key '#{key}' should be in non version" \
-      " controlled #{CREDENTIAL_FILE} not in #{LEAP_CONFIG_FILE}"
+  if File.exist? CREDENTIAL_FILE
+    # Set credentials from credentials file for ConnectedApp
+    YAML.load_file(CREDENTIAL_FILE).each do |key, value|
+      send("#{key}=", value)
     end
-    LeapSalesforce.send("#{key}=", value)
   end
-else
-  leap_logger.warn 'No config file found for Leap Salesforce'
-end
+  # Either can be set
+  ENV['SF_CONSUMER_KEY'] ||= client_id
+  self.client_id ||= ENV['SF_CONSUMER_KEY']
 
-raise LeapSalesforce::SetupError, 'LeapSalesforce.environment not set' if LeapSalesforce.environment.nil?
+  config_folder_path = File.join(Dir.pwd, config_folder)
+  general_file = File.join(config_folder_path, 'general')
+  specific_environment_file = File.join(config_folder_path, 'environments',
+                                        environment)
+  require general_file if File.exist? "#{general_file}.rb"
+  require specific_environment_file if File.exist? "#{specific_environment_file}.rb"
 
-if LeapSalesforce.sfdx
-  # Assume authentication already made through 'sfdx force:auth:jwt:grant'
-  unless ENV['SF_USERNAME'] && ENV['SF_CONSUMER_KEY']
-    raise LeapSalesforce::SetupError,
-          'Please set SF_USERNAME and SF_CONSUMER_KEY environment variables'
-  end
-  `sfdx force:user:display -u #{ENV['SF_USERNAME']}`
-elsif File.exist? CREDENTIAL_FILE
-  # Set credentials from credentials file for ConnectedApp
-  YAML.load_file(CREDENTIAL_FILE).each do |key, value|
-    LeapSalesforce.send("#{key}=", value)
+  if sfdx
+    # Assume authentication already made through 'sfdx force:auth:jwt:grant'
+    unless ENV['SF_USERNAME'] && ENV['SF_CONSUMER_KEY']
+      raise SetupError,
+            'Please set SF_USERNAME and SF_CONSUMER_KEY environment variables'
+    end
+    Auth.jwt_file?
+  else
+    %w[client_id client_secret password].each do |param|
+      raise SetupError, "LeapSalesforce.#{param} not set" if send(param).nil?
+    end
   end
-end
 
-%w[client_id client_secret password].each do |param|
-  raise LeapSalesforce::SetupError, "LeapSalesforce.#{param} not set" if LeapSalesforce.send(param).nil?
-end
-
-config_folder = File.join(Dir.pwd, LeapSalesforce.config_folder)
-general_file = File.join(config_folder, 'general')
-specific_environment_file = File.join(config_folder, 'environments', LeapSalesforce.environment)
-require general_file if File.exist? "#{general_file}.rb"
-require specific_environment_file if File.exist? "#{specific_environment_file}.rb"
+  require 'leap_salesforce/soql_data/soql_data'
+  require 'leap_salesforce/limits'
 
-require 'leap_salesforce/soql_data/soql_data'
-require 'leap_salesforce/limits'
+  FileUtils.mkdir_p lib_folder unless Dir.exist? lib_folder
+  require_all lib_folder
 
-FileUtils.mkdir_p LeapSalesforce.lib_folder unless Dir.exist? LeapSalesforce.lib_folder
-require_all LeapSalesforce.lib_folder
-
-LeapSalesforce.objects_to_verify = SoqlData.descendants if LeapSalesforce.objects_to_verify.empty?
+  self.objects_to_verify = SoqlData.descendants if objects_to_verify.empty?
+end