panda_pal 5.2.0 → 5.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 581c5acd9f7a7ade63f59c20f00f2dcbe7ee4e77670a6e5b98e3b29491f2edc9
-  data.tar.gz: d42d100b86c391585fa5f45d23368711487c78eff96916aa9868ba1e22f868c1
+  metadata.gz: dc40f9ca1d3a036a82a30105f8390bfe9faf57519ca977040921999c1e97221c
+  data.tar.gz: 01cca7d9851d83e6d2029291fde3f0baba97c1ba46e51287211b9769f803ae7f
 SHA512:
-  metadata.gz: 3ec8c2b412e14dcfc0398fbb496d68d62aec0b897a3f30b5471df867d32b3db8279bd774c0b620a074b204cbbcf5f51c4edb80cfc92285205849f77c11d68122
-  data.tar.gz: 397d0cfccec6719e1ca201925fd7b5d23e87dff5a4170169c9f7aafd741a2956c8540abcf19dcbbff672faa3e85c54d0e81bc73d033a5e7d5f1ba21d5437577e
+  metadata.gz: f41f229e1d8101ce9de5ba9d97ec3e8a3a96b5a11d5fa7972534df8e1d2226172db2e82c3af17f228cc48b1ceb0f8e71e6ded9ed08308c9124a45365e89cf8fa
+  data.tar.gz: 29dbfab39a1b5445d31975306af414e336f0a3965c2fd5426e90335963d4da50238c69c7232a66248ad4f7524b7fd3444fc01d2a535ba4e1414aa2f02267b1bc

data/app/lib/panda_pal/misc_helper.rb

@@ -1,5 +1,7 @@
 module PandaPal
   module MiscHelper
+    MigrationClass = Rails.version < '5.0' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+
     def self.to_boolean(v)
       if Rails.version < '5.0'
         ActiveRecord::Type::Boolean.new.type_cast_from_user("0")

data/config/initializers/apartment.rb

@@ -1,7 +1,8 @@
 require 'apartment/elevators/generic'
 
 Apartment.configure do |config|
-  config.excluded_models = ['PandaPal::Organization', 'PandaPal::Session']
+  config.excluded_models ||= []
+  config.excluded_models |= ['PandaPal::Organization', 'PandaPal::Session']
 
   config.tenant_names = lambda {
     PandaPal::Organization.pluck(:name)
@@ -14,6 +15,21 @@ Rails.application.config.middleware.use Apartment::Elevators::Generic, lambda {
   end
 }
 
+module PandaPal::Plugins::ApartmentCache
+  private
+
+  if Rails.version >= '5.0'
+    def normalize_key(key, options)
+      "tenant:#{Apartment::Tenant.current}/#{super}"
+    end
+  else
+    def namespaced_key(*args)
+      "tenant:#{Apartment::Tenant.current}/#{super}"
+    end
+  end
+end
+ActiveSupport::Cache::Store.send(:prepend, PandaPal::Plugins::ApartmentCache)
+
 if defined?(ActionCable)
   module ActionCable
     module Channel
@@ -38,7 +54,7 @@ if defined?(ActionCable)
     end
   end
 
-  module ActionCableApartment
+  module PandaPal::Plugins::ActionCableApartment
     module Connection
       def tenant=(name)
         @tenant = name
@@ -56,18 +72,50 @@ if defined?(ActionCable)
     end
   end
 
-  ActionCable::Connection::Base.prepend(ActionCableApartment::Connection)
+  ActionCable::Connection::Base.prepend(PandaPal::Plugins::ActionCableApartment::Connection)
 end
 
-module ApartmentCache
-  private
+if defined?(Delayed)
+  module PandaPal::Plugins
+    class ApartmentDelayedJobsPlugin < ::Delayed::Plugin
+      callbacks do |lifecycle|
+        lifecycle.around(:enqueue) do |job, *args, &block|
+          current_tenant = Apartment::Tenant.current
 
-  def normalize_key(key, options)
-    "tenant:#{Apartment::Tenant.current}/#{super}"
-  end
+          #make sure enqueue on public tenant unless we are testing since delayed job is set to run immediately
+          Apartment::Tenant.switch!('public') unless Rails.env.test?
+          job.tenant = current_tenant
+          begin
+            block.call(job, *args)
+          rescue Exception => e
+            Rails.logger.error("Error enqueing job #{job.to_s} - #{e.backtrace}")
+          ensure
+            #switch back to prev tenant
+            Apartment::Tenant.switch!(current_tenant)
+          end
+        end
+
+        lifecycle.before(:perform) do |worker, *args, &block|
+          tenant = args.first.tenant
+          Apartment::Tenant.switch!(tenant) if tenant.present?
+          Rails.logger.debug("Running job with tenant #{Apartment::Tenant.current}")
+        end
+
+        lifecycle.around(:invoke_job) do |job, *args, &block|
+          begin
+            block.call(job, *args)
+          ensure
+            Apartment::Tenant.switch!('public')
+            Rails.logger.debug("Resetting Tenant back to: #{Apartment::Tenant.current}")
+          end
+        end
 
-  def namespaced_key(*args)
-    normalize_key(*args)
+        lifecycle.after(:failure) do |job, *args|
+          Rails.logger.error("Job failed on tenant: #{Apartment::Tenant.current}")
+        end
+      end
+    end
   end
+
+  Delayed::Worker.plugins << PandaPal::Plugins::ApartmentDelayedJobsPlugin
 end
-ActiveSupport::Cache::Store.send :prepend, ApartmentCache

data/db/migrate/20160412205931_create_panda_pal_organizations.rb

@@ -1,4 +1,4 @@
-class CreatePandaPalOrganizations < ActiveRecord::Migration
+class CreatePandaPalOrganizations < PandaPal::MiscHelper::MigrationClass
   def change
     create_table :panda_pal_organizations do |t|
       t.string :name

data/db/migrate/20160413135653_create_panda_pal_sessions.rb

@@ -1,4 +1,4 @@
-class CreatePandaPalSessions < ActiveRecord::Migration
+class CreatePandaPalSessions < PandaPal::MiscHelper::MigrationClass
   def change
     create_table :panda_pal_sessions do |t|
       t.string :session_key

data/db/migrate/20160425130344_add_panda_pal_organization_to_session.rb

@@ -1,4 +1,4 @@
-class AddPandaPalOrganizationToSession < ActiveRecord::Migration
+class AddPandaPalOrganizationToSession < PandaPal::MiscHelper::MigrationClass
   def change
     add_column :panda_pal_sessions, :panda_pal_organization_id, :integer
     add_index :panda_pal_sessions, :panda_pal_organization_id

data/db/migrate/20170106165533_add_salesforce_id_to_organizations.rb

@@ -1,4 +1,4 @@
-class AddSalesforceIdToOrganizations < ActiveRecord::Migration
+class AddSalesforceIdToOrganizations < PandaPal::MiscHelper::MigrationClass
   def change
     add_column :panda_pal_organizations, :salesforce_id, :string, unique: true
   end

data/db/migrate/20171205183457_encrypt_organization_settings.rb

@@ -1,4 +1,4 @@
-class EncryptOrganizationSettings < ActiveRecord::Migration
+class EncryptOrganizationSettings < PandaPal::MiscHelper::MigrationClass
   def up
     # don't rerun this if it was already run before we renamed the migration.
     existing_versions = execute ("SELECT * from schema_migrations where version = '30171205183457'")

data/db/migrate/20171205194657_remove_old_organization_settings.rb

@@ -1,4 +1,4 @@
-class RemoveOldOrganizationSettings < ActiveRecord::Migration
+class RemoveOldOrganizationSettings < PandaPal::MiscHelper::MigrationClass
   def current_tenant
     @current_tenant ||= PandaPal::Organization.find_by_name(Apartment::Tenant.current)
   end

data/lib/panda_pal/helpers/controller_helper.rb

@@ -3,7 +3,7 @@ require 'browser'
 module PandaPal::Helpers::ControllerHelper
   extend ActiveSupport::Concern
 
-  class SessionNotFound < StandardError; end
+  class SessionNonceMismatch < StandardError; end
 
   included do
     helper_method :link_nonce, :current_session
@@ -22,17 +22,16 @@ module PandaPal::Helpers::ControllerHelper
       payload = JSON.parse(panda_pal_cryptor.decrypt_and_verify(params[:session_token])).with_indifferent_access
       matched_session = PandaPal::Session.find_by(session_key: payload[:session_key])
 
-      if matched_session.present? && matched_session.data[:link_nonce] == params[:session_token]
+      if matched_session.present? && matched_session.data[:link_nonce] == payload[:nonce]
         @current_session = matched_session
         @current_session.data[:link_nonce] = nil
       end
+      raise SessionNonceMismatch, "Session Not Found" unless @current_session.present?
     elsif (session_key = params[:session_key] || session_key_header || flash[:session_key] || session[:session_key]).present?
       @current_session = PandaPal::Session.find_by(session_key: session_key) if session_key.present?
-    else
-      @current_session = PandaPal::Session.new(panda_pal_organization_id: current_organization.id)
     end
 
-    raise SessionNotFound, "Session Not Found" unless @current_session.present?
+    @current_session ||= PandaPal::Session.new(panda_pal_organization_id: current_organization.id)
 
     @current_session
   end
@@ -154,6 +153,8 @@ module PandaPal::Helpers::ControllerHelper
       current_session.panda_pal_organization_id == current_organization.id,
       Apartment::Tenant.current == current_organization.name
     ].all?
+  rescue SessionNonceMismatch
+    false
   end
 
   def safari_override
@@ -166,7 +167,8 @@ module PandaPal::Helpers::ControllerHelper
   # nicely with webpack-dev-server live reloading (otherwise
   # you get an access error everytime it tries to live reload).
 
-  def redirect_with_session_to(location, params = {}, route_context: self)
+  def redirect_with_session_to(location, params = {}, route_context: self, **rest)
+    params.merge!(rest)
     if Rails.env.development?
       redirect_to route_context.send(location, {
         session_key: current_session.session_key,

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.2.0"
+  VERSION = "5.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.5
 platform: ruby
 authors:
 - Instructure ProServe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails