leap_salesforce 1.0.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50460046dd520df2e2b92b0384733e4b7785109d55f42c88d5dd9c81faad23c0
-  data.tar.gz: 1124dc04f4dea935ac48e21b1fccfb8b498b6675f1936164087cd35d75152f4d
+  metadata.gz: c7d7840f64baf2e945a29ab4f022f5ff2191b3443e9068f9cbd32afafb7520bb
+  data.tar.gz: fbe2a1d779b5605cd19c7eb79b2327fb673865170e2becc567bc587fa4d32798
 SHA512:
-  metadata.gz: 9674782b9b65f4c60fbac4e376594e7ff626c0a538f1f9e1b3ca745d2905bf9ef420a10f7c93d34ab433304cc3989d9329446efa30e2152923e7d07811f0f42c
-  data.tar.gz: f35b3686b4404083210e07cf71ab5ec7c21e132e04bb013dc9aadad245c9538f1152037b64995844b3323431e23bb0070f1195083424757377bf09c3b8d72f4f
+  metadata.gz: 861290a24fbb1575f0c3338690bd0aef6c65d3ee6a6d0e7a98c5b511e6bffc243891d927b08cd925fa819a09e9b9bcd523a6950729364c5597815f26b8f95bb9
+  data.tar.gz: c027b01dc9606cb88d388d25ba3b8895f05c9d5ae47b1377efc42022887b8fa160999c870e078f3434383a1249f24e66951c72b84dcbd5fcaf3398ca22bcd683

data/ChangeLog

@@ -1,3 +1,17 @@
+Version 1.2.0
+* Ability to set security token on leap_salesforce user by setting an environment variable with the format
+  `ENV["#{key}_token"]``
+* Remove deprecated method of create_enum within soql_settings class
+
+Version 1.1.2
+* Fix user_id from session
+
+Version 1.1.1
+* Allow session information from SOAP login to be available with LeapSalesforce::Session class
+
+Version 1.1.0
+* Proper fix to work with activerecord 7 - requires ruby > 2.7
+
 Version 1.0.5
 * Fix
   * Stabilize using of active record by fixing version

data/README.md

@@ -104,6 +104,10 @@ Credentials are not stored in stored in source control. They can be setting thro
 * 'client_secret'
 * 'password'
 
+> Security tokens can be set for each user (adding to password in OAuth like in [this article](https://developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_calls_login.htm))
+> To do that set an environment variable as USER_KEY_token. E.g, so for a user with a key of :admin
+> the token would be set with the `admin_token` environment variable
+
 Tests can be run using the default `Rake` task.
 
 E.g.,

data/Rakefile

@@ -14,6 +14,7 @@ RSpec::Core::RakeTask.new(:spec)
 
 desc 'Check Salesforce OAuth2 authentication is working'
 task :check_oauth do
+  Soaspec::OAuth2.debug_oauth = true
   LeapSalesforce.oauth_working?
 end
 

data/bin/console

@@ -7,6 +7,7 @@ require 'leap_salesforce'
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-require 'pry'
+require 'irb'
+require 'irb/completion'
 
-Pry.start
+IRB.start(__FILE__)

data/config/general.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# Set environment variable to set a security token that will be sent for a user
+# ENV['admin_token'] = 'test'
+
 # Add users to LeapSalesforce context. First user is the default
 module LeapSalesforce
   Users.add User.new :admin, 'samuel.garratt@brave-otter-ttxype.com'

data/exe/leap_salesforce

@@ -36,6 +36,7 @@ module LeapSalesforce
         exit if oauth_setup.downcase == 'n'
       end
       query_for_parameters # TODO: for sfdx
+      has_ignore_file = File.exist?('.gitignore')
       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] }]
@@ -52,6 +53,10 @@ module LeapSalesforce
       puts `rake leaps:create_soql_objects`
       puts 'Creating enums'.colorize :yellow
       puts `rake leaps:create_enums`
+      return unless has_ignore_file
+
+      puts 'Your .gitignore is already present so not updated.
+Please ignore "config/credentials/" and "logs/"'.colorize :red
     end
   end
 end

data/leap_salesforce.gemspec

@@ -32,7 +32,7 @@ It reads the Metadata from Salesforce and creates the foundation for API tests.'
   spec.add_development_dependency 'semaphore_test_boosters'
   spec.add_development_dependency 'topoisomerase'
   spec.add_development_dependency 'yard-doctest'
-  spec.add_dependency 'activerecord', '6.1'
+  spec.add_dependency 'activerecord', '7'
   spec.add_dependency 'colorize'
   spec.add_dependency 'factory_bot'
   spec.add_dependency 'faker', '>= 2.0'

data/lib/leap_salesforce/ext/string.rb

@@ -2,6 +2,7 @@
 
 require 'nori/core_ext'
 require 'humanize'
+require 'active_support/isolated_execution_state'
 require 'active_support/core_ext/string'
 require 'date'
 require 'json'

data/lib/leap_salesforce/parameters.rb

@@ -76,14 +76,13 @@ module LeapSalesforce
     # using sfdx
     # @return [Hash] OAuth2 parameters used in connecting to salesforce
     def oauth_settings
-      settings = {
-        username: '<%= LeapSalesforce.api_user %>', password: LeapSalesforce.password,
+      {
+        username: '<%= LeapSalesforce.api_user %>',
+        password: '<%= LeapSalesforce.password + LeapSalesforce.security_token.to_s %>',
         client_id: LeapSalesforce.client_id,
         client_secret: LeapSalesforce.client_secret,
         token_url: "#{LeapSalesforce.general_url}/services/oauth2/token"
       }
-      settings[:security_token] = LeapSalesforce.security_token if LeapSalesforce.security_token
-      settings
     end
 
     # @return [String] General salesforce URL for logging in to
@@ -98,6 +97,8 @@ module LeapSalesforce
                   else
                     LeapSalesforce::Users.where(user)&.username
                   end
+      leaps_user = LeapSalesforce::Users.where username: @api_user
+      LeapSalesforce.security_token = leaps_user.security_token
       Soaspec::SpecLogger.info "Using user '#{@api_user}' for API"
     end
 

data/lib/leap_salesforce/session.rb

@@ -0,0 +1,41 @@
+require_relative 'auth'
+require 'savon'
+require 'json'
+
+module LeapSalesforce
+  # Holds information about a login session
+  class Session
+    # @return [String] Session id returned from SOAP API
+    attr_accessor :session_id
+    # @return [String] User id returned from SOAP API
+    attr_accessor :user_id
+    # @return [Hash] Login response
+    attr_accessor :login_response
+
+    def initialize(username, password, security_token = '')
+      login_body = LeapSalesforce::Session.soap_login username, password, security_token
+
+      self.session_id = login_body[:login_response][:result][:session_id]
+      self.user_id = login_body[:login_response][:result][:user_id]
+      self.login_response = login_body[:login_response]
+    end
+
+    class << self
+
+      # Login via SOAP API
+      def soap_login(username, password, security_token)
+        client = Savon.client do
+          endpoint "#{SoqlHandler.instance_url}/services/Soap/u/51.0"
+          namespace "urn:partner.soap.sforce.com"
+        end
+
+        response = client.call(:login, message:
+            {
+              username: username,
+              password: password + security_token
+            })
+        response.body
+      end
+    end
+  end
+end

data/lib/leap_salesforce/soql_data/soql_settings.rb

@@ -13,10 +13,4 @@ module SoqlSettings
   def soql_object_name
     @soql_object_name || to_s
   end
-
-  # @deprecated Not used, setting in '.leap_salesforce.yml' controls this now
-  def create_enum(_set)
-    LeapSalesforce.logger.warn "Method 'create_enum' called when it is deprecated" \
-    " from #{caller_locations[0]}"
-  end
 end

data/lib/leap_salesforce/users/user.rb

@@ -14,11 +14,16 @@ module LeapSalesforce
     #   readable format is required such as in a Cucumber test
     attr_accessor :description
 
-    # @param [String, Symbol] key Key used to identify a test user
-    # @param [String] username Name used to login with user. In email address format.
+    # @return [String] Security token of user. Recommend this be set through ENV variable
+    attr_accessor :security_token
+
+    # @param [String, Symbol] user_params[0] key Key used to identify a test user
+    # @param [String] user_params[1] username Name used to login with user. In email address format.
+    # @param [String] user_params[1] security_token Security token of user
     def initialize(*user_params, description: nil)
       self.key = user_params[0]
       self.username = user_params[1]
+      self.security_token = ENV["#{key}_token"] || nil
       self.description = description
     end
 

data/lib/leap_salesforce/version.rb

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

data/lib/leap_salesforce.rb

@@ -8,6 +8,7 @@ Soaspec.log_warnings = false            # Log any API warnings
 Soaspec::SpecLogger.progname = 'Leaps'  # Program name shown in logs
 Soaspec::OAuth2.request_message = false # Don't display message explaining OAuth request
 Soaspec::OAuth2.retry_limit = 1 # Retrying for OAuth token too many times results in user locked out
+require 'active_support/isolated_execution_state'
 require 'active_support/core_ext/integer/time' # Creating time objects
 require 'leap_salesforce/parameters' # Important to load this first
 require 'leap_salesforce/ext/string'
@@ -18,6 +19,7 @@ require 'factory_bot' # For mass production of data
 require 'faker' # For fake data
 require 'leap_salesforce/error'
 require 'leap_salesforce/loader'
+require 'leap_salesforce/session'
 
 # If variable is present within LeapSalesforce set it
 def load_variables_from(file)
@@ -81,3 +83,5 @@ module LeapSalesforce
 
   self.objects_to_verify = SoqlData.descendants if objects_to_verify.empty?
 end
+
+LeapSalesforce.api_user = LeapSalesforce::Users.list.first.username

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leap_salesforce
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.2.0
 platform: ruby
 authors:
 - IQA
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -333,6 +333,7 @@ files:
 - lib/leap_salesforce/rake.rb
 - lib/leap_salesforce/rake/setup.rake
 - lib/leap_salesforce/rake/sfdx.rake
+- lib/leap_salesforce/session.rb
 - lib/leap_salesforce/soql_data/common_enum_methods.rb
 - lib/leap_salesforce/soql_data/data_relationships.rb
 - lib/leap_salesforce/soql_data/meta_data_handler.rb
@@ -370,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Helps with setting up integrated automated test frameworks against Salesforce.