panda_pal 5.6.4 → 5.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a4824355877c5a36c29faacc0da32347ae94be1c52d3efce5aed163bd8ee8d7
-  data.tar.gz: 1742b3a3547d60758eb53f74ffab79b316061c4887073351924229a638da3399
+  metadata.gz: 93602adf64cc4da3ac738a5f4eb9ee536305486fa7ad6e5b5c4d9df418164003
+  data.tar.gz: c46d3210fae2f6268d5a0dc52c931aa263fd81b82e27ff6051cd313eee95b9d8
 SHA512:
-  metadata.gz: 9de12a4da426d281acc78dfb1588a7d2d33bce69d8de4c20d03eff3f12fcf8c4c0bf5aa6cd3e1951f1f061ea67a0e6a280b2c925dcc0619e27244858975e14ac
-  data.tar.gz: 8ccf4609b82b88456ecf5f245bca29e98aa916179c35da74a33a0eee57a4713f0dd9522e011999928df0267ce938d4a8f1f308a616b83da237c8d2f82bf691e0
+  metadata.gz: e59bcdeb6a9e9b023da8a35dcd9752e3e3fdb52007596cbcd9e04b949883ef2d9a384aa558922ec2fbb71d35d6865ef0c6db6b0da1496f83b559624ed46da8e8
+  data.tar.gz: 06f649deb6bc36c5da5b95a7794ab5acd00b128de01a2b449b04a276e9e81cf18fc700341bcc89b505732ceb87705a991b69de4b3580e12bf493875983c7af89

data/app/models/panda_pal/organization.rb

@@ -1,7 +1,29 @@
 module PandaPal
   module OrganizationConcerns; end
 
+  # Nwer versions of SymmetricEncryption introduced it's own version of attr_encrypted
+  # that is completely incompatible with the attr_encrypted Gem that PandaPal uses.
+  if defined?(::SymmetricEncryption::ActiveRecord::AttrEncrypted)
+    module SkipSymmetricEncAttrEncrypted
+      extend ActiveSupport::Concern
+
+      module ::SymmetricEncryption::ActiveRecord::AttrEncrypted::ClassMethods
+        alias_method :panda_pal_se_attr_encrypted, :attr_encrypted
+
+        def attr_encrypted(*args, **kwargs)
+          if self <= SkipSymmetricEncAttrEncrypted
+            super
+          else
+            panda_pal_se_attr_encrypted(*args, **kwargs)
+          end
+        end
+      end
+    end
+  end
+
   class Organization < ActiveRecord::Base
+    include SkipSymmetricEncAttrEncrypted if defined?(SkipSymmetricEncAttrEncrypted)
+
     include OrganizationConcerns::SettingsValidation
     include OrganizationConcerns::TaskScheduling if defined?(Sidekiq.schedule)
 

data/app/models/panda_pal/platform.rb

@@ -8,6 +8,8 @@ require 'httparty'
 module PandaPal
   class Platform
     def public_jwks
+      require "json/jwt"
+
       response = HTTParty.get(jwks_url)
       return nil unless response.success?
 
@@ -161,6 +163,14 @@ module PandaPal
         ], self)
       end
 
+      def root_account_info
+        Rails.cache.fetch("panda_pal/org:#{name}/root_account_info", expires_in: 24.hours) do
+          response = bearcat_client.account("self")
+          response = bearcat_client.account(response[:root_account_id]) if response[:root_account_id].present?
+          response
+        end
+      end
+
       if defined?(Bearcat)
         def bearcat_client
           return canvas_sync_client if defined?(canvas_sync_client)

data/config/initializers/apartment.rb

@@ -1,5 +1,10 @@
 require 'apartment/elevators/generic'
 
+begin
+  require "apartment-sidekiq"
+rescue LoadError
+end
+
 Apartment.configure do |config|
   config.excluded_models ||= []
   config.excluded_models |= ['PandaPal::Organization', 'PandaPal::Session']
@@ -25,7 +30,7 @@ module PandaPal::Plugins::ApartmentCache
       "tenant:#{Apartment::Tenant.current}/#{super}"
     end
   else
-    def namespaced_key(*args)
+    def namespaced_key(*args, **kwargs)
       "tenant:#{Apartment::Tenant.current}/#{super}"
     end
   end
@@ -66,7 +71,7 @@ if defined?(ActionCable)
         @tenant || 'public'
       end
 
-      def dispatch_websocket_message(*args)
+      def dispatch_websocket_message(*args, **kwargs)
         Apartment::Tenant.switch(tenant) do
           super
         end

data/lib/panda_pal/engine.rb

@@ -49,6 +49,12 @@ module PandaPal
       end
     end
 
+    initializer "panda_pal.serialze_symbols" do |app|
+      app.config.active_record.yaml_column_permitted_classes ||= []
+      app.config.active_record.yaml_column_permitted_classes |= [Symbol]
+    rescue
+    end
+
     initializer 'panda_pal.app_controller' do |app|
       OAUTH_10_SUPPORT = true
       ActiveSupport.on_load(:action_controller) do

data/lib/panda_pal/helpers/session_replacement.rb

@@ -85,16 +85,16 @@ module PandaPal::Helpers
     # nicely with webpack-dev-server live reloading (otherwise
     # you get an access error everytime it tries to live reload).
 
-    def redirect_with_session_to(*args)
-      redirect_to url_with_session(*args)
+    def redirect_with_session_to(*args, **kwargs)
+      redirect_to url_with_session(*args, **kwargs)
     end
 
-    def link_with_session_to(*args)
-      helpers.link_to url_with_session(*args)
+    def link_with_session_to(*args, **kwargs)
+      helpers.link_to url_with_session(*args, **kwargs)
     end
 
-    def session_url_for(*args)
-      url_for(build_session_url_params(*args))
+    def session_url_for(*args, **kwargs)
+      url_for(build_session_url_params(*args, **kwargs))
     end
 
     def url_with_session(location, *args, route_context: self, **kwargs)

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.6.4"
+  VERSION = "5.6.5"
 end

data/panda_pal.gemspec

@@ -32,10 +32,15 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rails", "~> 5.2"
   s.add_development_dependency 'pg'
-  s.add_development_dependency 'sidekiq'
+  s.add_development_dependency 'sidekiq', "< 7.0"
   s.add_development_dependency 'sidekiq-scheduler'
   s.add_development_dependency 'ros-apartment', '~> 2.11'
   s.add_development_dependency 'ros-apartment-sidekiq', '~> 1.2'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'factory_girl_rails'
+
+  s.add_development_dependency "redis", ">=4.2", "< 5.0"
+
+  # TODO See https://github.com/mikel/mail/issues/1489
+  s.add_development_dependency "mail", "2.7.1"
 end