panda_pal 5.4.5 → 5.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6de9e366030521aaa18328dbb06bfdb1ebb40a27493fab4c0168f85195f3838e
-  data.tar.gz: a08d0f4c61695f4898ec46d004e06e9115aee2759bef97499bd17501d18f14c2
+  metadata.gz: 54f85983099ebb935266fb0f7a5671dea933b70c02557af3af732dd63b81a603
+  data.tar.gz: 2566905d0ddd340582f5e2171278c5d2bcde892d374c024cb7deba29b06d711a
 SHA512:
-  metadata.gz: bd659d9a64acbb986f7481faf8962dff90cdfc1c9c2654462fff6f293e9757c3d87edc55337cc56cf1ab6ab0208f0b8be186d6ba3f81e01aaaa0705cbd6137e1
-  data.tar.gz: 0fc0ddb7daf4ec3636deedb6e47fa866b0511ca66d338d19c19817020f7ee8ab871c08b40ef37172678c52f14a0697f8fe41ef1374b6a1c9242b9f795dbeec55
+  metadata.gz: 9e52048202eda9ba571e496c909dc85cf961d89a45612d5fd5a80c085ee6fd4a83286058df4c0a953c3456ffea31927dfcfc14c77a628468492d6f0ca0bccb20
+  data.tar.gz: d893fc73823f914ae8590311333660a8100357db27fc2510c1663a36dc8bf905bff4fc0dae1db0091ad8ef9656dec24a46e16e8852d7788cf6cb3b26d27045e8

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/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/session_replacement.rb

@@ -61,7 +61,7 @@ module PandaPal::Helpers
     end
 
     def current_session_data
-      current_session.data
+      current_session.data&.with_indifferent_access
     end
 
     def session_changed?

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.5"
+  VERSION = "5.4.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.4.5
+  version: 5.4.8
 platform: ruby
 authors:
 - Instructure ProServe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-06-03 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