openstax_salesforce 3.1.0 → 4.3.0

data/lib/openstax/salesforce/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Salesforce
-    VERSION = "3.1.0"
+    VERSION = '4.3.0'
   end
 end

data/lib/openstax_salesforce.rb

@@ -1,11 +1,9 @@
 require "restforce"
 require "active_force"
-require "omniauth-salesforce"
 
 require "openstax/salesforce/active_force"
 
 require "openstax/salesforce/engine"
-require "openstax/salesforce/user_missing"
 require "openstax/salesforce/client"
 
 require "openstax/salesforce/remote/term_year"
@@ -20,7 +18,6 @@ require "openstax/salesforce/remote/campaign_member"
 
 module OpenStax
   module Salesforce
-
     def self.configure
       yield configuration
     end
@@ -31,40 +28,27 @@ module OpenStax
 
     # See `config/initializers/openstax_salesforce.rb` for documentation on options
     class Configuration
-      attr_accessor :layout
-      attr_accessor :authenticate_admin_proc
-      attr_accessor :salesforce_client_key
-      attr_accessor :salesforce_client_secret
-      attr_writer   :salesforce_login_site
-      attr_accessor :sandbox_oauth_token
-      attr_accessor :sandbox_refresh_token
-      attr_accessor :sandbox_instance_url
-      attr_accessor :check_sandbox_instance_url
-      attr_accessor :skip_automatic_omniauth_setup
-      attr_accessor :page_heading_proc
+      attr_writer :api_version, :login_domain
+      attr_accessor :username, :password, :security_token, :consumer_key, :consumer_secret
 
-      def salesforce_login_site
-        @salesforce_login_site || "https://login.salesforce.com"
+      def api_version
+        @api_version ||= '37.0'
       end
 
-      def salesforce_client_options
-        { site: salesforce_login_site }
+      def login_domain
+        @login_domain ||= 'test.salesforce.com'
       end
 
-      def salesforce_login_domain
-        Addressable::URI.parse(salesforce_login_site).host
+      def validate!
+        raise(IllegalState, "The Salesforce username is missing") if username.nil?
+        raise(IllegalState, "The Salesforce password is missing") if password.nil?
+        raise(IllegalState, "The Salesforce security token is missing") if security_token.nil?
+        raise(IllegalState, "The Salesforce consumer key is missing") if consumer_key.nil?
+        raise(IllegalState, "The Salesforce consumer secret is missing") if consumer_secret.nil?
       end
     end
 
-    def self.set_top_level_routes(router)
-      router.match '/auth/salesforce/callback',
-                   to: 'openstax/salesforce/settings#callback',
-                   via: [:get, :post]
-    end
-
-    def self.ready_for_api_usage?
-      OpenStax::Salesforce::User.any?
+    module Remote
     end
-
   end
 end

data/lib/tasks/openstax_salesforce_tasks.rake

@@ -1,8 +1,3 @@
-OPENSTAX_SALESFORCE_COPY_PATHS = [
-  'views',
-  'controllers'
-]
-
 namespace :openstax_salesforce do
   namespace :install do
     desc 'Copy initializers from openstax_salesforce to application'
@@ -18,30 +13,10 @@ namespace :openstax_salesforce do
     end
   end
 
-  namespace :copy do
-    OPENSTAX_SALESFORCE_COPY_PATHS.each do |path|
-      name = File.basename(path)
-      desc "Copy #{name} from openstax_salesforce to application"
-      task name.to_sym do
-        cp_r File.expand_path("../../../app/#{path}/openstax/salesforce", __FILE__),
-             "app/#{path}",
-             verbose: false
-        print "Copied #{name} from openstax_salesforce\n"
-      end
-    end
-  end
-
+  # TODO: Remove after all servers have been migrated
   desc 'Copy migrations from openstax_salesforce to application'
   task :install do
     Rake::Task['openstax_salesforce:install:initializers'].invoke
     Rake::Task['openstax_salesforce:install:migrations'].invoke
   end
-
-  desc 'Copy all customizable files from openstax_salesforce to application'
-  task :copy do
-    OPENSTAX_SALESFORCE_COPY_PATHS.each do |path|
-      Rake::Task["openstax_salesforce:copy:#{File.basename(path)}"].invoke
-    end
-  end
 end
-

metadata

@@ -1,45 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: openstax_salesforce
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.3.0
 platform: ruby
 authors:
 - JP Slavinsky
+- Dante Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: restforce
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: active_force
+  name: restforce
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +46,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-salesforce
+  name: openstax_active_force
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,49 +88,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,20 +101,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 description: Interface gem for accessing OpenStax's Salesforce instance
 email:
 - jps@kindlinglabs.com
@@ -174,15 +111,9 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/controllers/openstax/salesforce/application_controller.rb
-- app/controllers/openstax/salesforce/settings_controller.rb
-- app/helpers/openstax/salesforce/application_helper.rb
-- app/models/openstax/salesforce/user.rb
-- app/views/openstax/salesforce/settings/show.html.erb
-- config/initializers/omniauth.rb
 - config/initializers/openstax_salesforce.rb
-- config/routes.rb
 - db/migrate/0_install_openstax_salesforce.rb
+- db/migrate/1_drop_openstax_salesforce_users.rb
 - lib/openstax/salesforce/active_force.rb
 - lib/openstax/salesforce/client.rb
 - lib/openstax/salesforce/engine.rb
@@ -196,59 +127,9 @@ files:
 - lib/openstax/salesforce/remote/term_year.rb
 - lib/openstax/salesforce/remote/tutor_course_period.rb
 - lib/openstax/salesforce/spec_helpers.rb
-- lib/openstax/salesforce/spec_helpers/salesforce_proxy.rb
-- lib/openstax/salesforce/user_missing.rb
 - lib/openstax/salesforce/version.rb
 - lib/openstax_salesforce.rb
 - lib/tasks/openstax_salesforce_tasks.rake
-- spec/client_spec.rb
-- spec/dummy/README.md
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/bin/setup
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/test.log
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/factories/user.rb
-- spec/openstax/salesforce/controllers/application_controller_spec.rb
-- spec/openstax/salesforce/controllers/settings_controller_spec.rb
-- spec/openstax/salesforce/remote/opportunity_spec.rb
-- spec/openstax/salesforce/remote/term_year_spec.rb
-- spec/openstax/salesforce/remote/tutor_course_period_spec.rb
-- spec/openstax/salesforce/spec_helpers_spec.rb
-- spec/rails_helper.rb
-- spec/routing_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/openstax/openstax_salesforce
 licenses:
 - MIT
@@ -272,52 +153,4 @@ rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Interface gem for accessing OpenStax's Salesforce instance
-test_files:
-- spec/spec_helper.rb
-- spec/client_spec.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/bin/rake
-- spec/dummy/bin/setup
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/boot.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config.ru
-- spec/dummy/README.md
-- spec/dummy/Rakefile
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/404.html
-- spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/test.log
-- spec/openstax/salesforce/spec_helpers_spec.rb
-- spec/openstax/salesforce/controllers/settings_controller_spec.rb
-- spec/openstax/salesforce/controllers/application_controller_spec.rb
-- spec/openstax/salesforce/remote/term_year_spec.rb
-- spec/openstax/salesforce/remote/opportunity_spec.rb
-- spec/openstax/salesforce/remote/tutor_course_period_spec.rb
-- spec/factories/user.rb
-- spec/routing_spec.rb
-- spec/rails_helper.rb
+test_files: []

data/app/controllers/openstax/salesforce/application_controller.rb

@@ -1,7 +0,0 @@
-module OpenStax::Salesforce
-  class ApplicationController < ActionController::Base
-    protect_from_forgery with: :exception
-
-    before_action { OpenStax::Salesforce.configuration.authenticate_admin_proc.call(self) }
-  end
-end

data/app/controllers/openstax/salesforce/settings_controller.rb

@@ -1,20 +0,0 @@
-module OpenStax::Salesforce
-  class SettingsController < OpenStax::Salesforce::ApplicationController
-    layout OpenStax::Salesforce.configuration.layout
-
-    def show
-    end
-
-    def callback
-      OpenStax::Salesforce::User.save_from_omniauth!(request.env["omniauth.auth"])
-      redirect_to root_path
-    end
-
-    def destroy_user
-      OpenStax::Salesforce::User.destroy_all
-      ActiveForce.clear_sfdc_client! # since user is now gone, any client invalid
-      redirect_to root_path
-    end
-
-  end
-end

data/app/helpers/openstax/salesforce/application_helper.rb

@@ -1,11 +0,0 @@
-module OpenStax::Salesforce
-  module ApplicationHelper
-    def config
-      OpenStax::Salesforce.configuration
-    end
-
-    def page_heading(context, text)
-      config.page_heading_proc.call(context, text)
-    end
-  end
-end

data/app/models/openstax/salesforce/user.rb

@@ -1,31 +0,0 @@
-module OpenStax::Salesforce
-  class User < ActiveRecord::Base
-    validates :uid, presence: true
-    validates :oauth_token, presence: true
-    validates :refresh_token, presence: true
-    validates :instance_url, presence: true
-
-    after_save :ensure_only_one_record
-
-    def self.save_from_omniauth!(auth)
-      where(uid: auth[:uid]).first_or_initialize.tap do |user|
-        user.uid = auth.uid
-        user.name = auth.info.name
-        user.oauth_token = auth.credentials.token
-        user.refresh_token = auth.credentials.refresh_token
-        user.instance_url = auth.credentials.instance_url
-        user.save!
-      end
-    end
-
-    def ensure_only_one_record
-      self.class.where.not(id: id).destroy_all
-    end
-
-    def refresh_oauth_token!
-      OpenStax::Salesforce::Remote::Contact.count
-      valid_token = ActiveForce.sfdc_client.options[:oauth_token]
-      update_attribute(:oauth_token, valid_token) if self.oauth_token != valid_token
-    end
-  end
-end