panda_pal 5.4.4 → 5.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ec5567515a06e761a0cb06597380d4a10a9454f58f903466f5871757323dc7c
-  data.tar.gz: 418a9fe6dc99d53b6775b65c425db8c8c02aadf0adb2d92673934094bc26f3d7
+  metadata.gz: 2f1be48801ad434039bdca5a2a0a9f5c46ecb367487c773c66bc302cf1d218f7
+  data.tar.gz: fdc202caaf5132714191559b206809b553f49daf801f6c3e7f7dcba35bfa57e0
 SHA512:
-  metadata.gz: 067dbe50e329437ada560115134fe992b3522e4bf971e73c9a22a375dd3803e5aa4897b1cf4af66fc1e31d8f905233d601a910cadaca740cd0a21a8c5d495831
-  data.tar.gz: 1d5ffae5cd2f7a884799a23ae73e5d3935d2f64ff1397dc506a364c34de916e317f1098de64549f5e1c15fd033090a31646f171e3b779dcb45006a7251741460
+  metadata.gz: 10e708bb0f43c4ab219b0577237e221336ca5ca4759829757c009ea81e6e35528988e84f51d1bdaea2cae4a73d1d865fd896347171c7d27b1f6b9d9d4a9ece0c
+  data.tar.gz: f78cc8ee0232484e4133a9b3300c44748a310573be24b74813c2c57f35fbc1d174631e6d587a5be0c12fe5b9f1ea9ff5b51cbed463e83a0f6ddf0a8231484508

data/app/controllers/panda_pal/application_controller.rb

@@ -1,4 +1,12 @@
 module PandaPal
   class ApplicationController < ActionController::Base
+    around_action :share_controller_on_thread
+
+    def share_controller_on_thread
+      Thread.current[:controller] = self
+      yield
+    ensure
+      Thread.current[:controller] = nil
+    end
   end
 end

data/app/lib/panda_pal/launch_url_helpers.rb

@@ -17,10 +17,24 @@ module PandaPal
       end
     end
 
+    def self.url_for(options)
+      request = Thread.current[:controller]&.request
+      host = "#{request.scheme}://#{request.host_with_port}"
+      if options.is_a?(Symbol)
+        Rails.application.routes.url_helpers.send(options, host: host)
+      else
+        options[:host] ||= host
+        Rails.application.routes.url_helpers.url_for(options)
+      end
+    end
+
     def self.normalize_lti_launch_desc(opts)
       opts = opts.dup
       opts.delete(:route_helper_key)
       opts.delete(:auto_launch)
+      opts.each do |k, v|
+        opts[k] = v.call if v.is_a?(Proc)
+      end
       opts
     end
 

data/app/models/panda_pal/organization_concerns/task_scheduling.rb

@@ -99,6 +99,7 @@ module PandaPal
             'queue' => desc[:queue],
             'class' => ScheduledTaskExecutor.to_s,
             'args' => [name, desc[:key]],
+            'enabled' => !Rails.env.development?,
           }
         end
         schedule

data/db/migrate/20171205194657_remove_old_organization_settings.rb

@@ -18,6 +18,8 @@ class RemoveOldOrganizationSettings < PandaPal::MiscHelper::MigrationClass
       #PandaPal::Organization.connection.schema_cache.clear!
       #PandaPal::Organization.reset_column_information
       PandaPal::Organization.find_each do |o|
+        next unless o.old_settings.present?
+
         # Would like to just be able to do this:
         # o.settings = YAML.load(o.old_settings)
         # o.save!

data/lib/panda_pal/helpers.rb

@@ -2,5 +2,4 @@ module PandaPal::Helpers
   require_relative 'helpers/controller_helper'
   require_relative 'helpers/route_helper'
   require_relative 'helpers/secure_headers'
-  require_relative 'helpers/ability_mixin'
 end

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.4.4"
+  VERSION = "5.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.4.4
+  version: 5.4.7
 platform: ruby
 authors:
 - Instructure ProServe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -226,7 +226,6 @@ files:
 - lib/panda_pal.rb
 - lib/panda_pal/engine.rb
 - lib/panda_pal/helpers.rb
-- lib/panda_pal/helpers/ability_mixin.rb
 - lib/panda_pal/helpers/controller_helper.rb
 - lib/panda_pal/helpers/route_helper.rb
 - lib/panda_pal/helpers/secure_headers.rb

data/lib/panda_pal/helpers/ability_mixin.rb

@@ -1,85 +0,0 @@
-module PandaPal
-  module AbilityMixin
-    extend ActiveSupport::Concern
-
-    class_methods do
-      def self.role_permissions(labels)
-        roles = find_roles_by_label(labels)
-
-        if Rails.env.test? && roles.count == 0 && (labels || []).include?('Administrator')
-          return Hash.new(true)
-        end
-
-        final = {}
-        roles.find_each do |role|
-          role.permissions.each do |perm_name, perm|
-            final[perm_name] = false if final[perm_name].nil?
-            final[perm_name] = true if perm['enabled'] == true
-          end
-        end
-        final
-      end
-
-      def self.find_roles_by_label(labels)
-        raise "PandaPal AbilityMixin's support for Roles and Permissions requires that Roles be synced by CanvasSync" unless defined?(Role)
-
-        built_ins = []
-        labels = labels.split(',') if labels.is_a?(String)
-        custom_labels = Array(labels).reject do |l|
-          if role_is_default?(l)
-            built_ins << l
-          elsif l == 'Account Admin'
-            built_ins << 'AccountMembership'
-          else
-            next
-          end
-          true
-        end
-        Role.where(workflow_state: 'built_in', base_role_type: built_ins)
-            .or(Role.where.not(workflow_state: 'built_in').where(label: custom_labels))
-      end
-
-      def self.role_is_default?(role)
-        %w[TeacherEnrollment TaEnrollment StudentEnrollment DesignerEnrollment ObserverEnrollment].include? role
-      end
-    end
-
-    def is_lti_launch?
-      @controller.current_session.present?
-    end
-
-    def panda_pal_session
-      @panda_pal_session ||= @controller.current_session&.data || {}
-    end
-
-    def rails_session
-      @rails_session ||= @controller.session
-    end
-
-    def launch_params
-      @launch_params ||= panda_pal_session[:launch_params] || {}
-    end
-
-    # Roles and Permissions
-    def lti_roles
-      @lti_roles ||= LTIRoles::RoleManager.new(launch_params['ext_roles'] || '')
-    end
-
-    def canvas_permissions
-      panda_pal_session[:canvas_permissions] ||= self.class.role_permissions(launch_params['custom_canvas_role'])
-    end
-
-    def canvas_role_labels
-      labels = launch_params['custom_canvas_role']
-      labels.is_a?(String) ? labels.split(',') : []
-    end
-
-    def canvas_roles
-      self.class.find_roles_by_label(canvas_role_labels)
-    end
-
-    def launch_role_ids
-      panda_pal_session[:launch_role_ids] ||= canvas_roles.map(&:canvas_id)
-    end
-  end
-end