panda_pal 5.3.6.beta2 → 5.3.6.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1797969aa547664019c9091a2286fc7ed2958e749c392094db1818e3f2826984
-  data.tar.gz: 53049f9345f939d99f7083dbf49cd3a96f15f3282252a1b4a518aa16d589632d
+  metadata.gz: e5b8cdbd0f383e4034cdeffcb5af9f818b5930d2979eab7cfdf707c3029b1088
+  data.tar.gz: 5c97a2978caec6d498cb32e3c65a094c9c96f95a1ccc799e7149d99e7de55dc1
 SHA512:
-  metadata.gz: 5088fcf2d122b23da5a2f82ac3054d64fe6974c6c984d9c3726db910bb101b67816b92b8a4b43b47e818fbb85f3bd02a9487d0ca2fd322daeea7cc475bf67b41
-  data.tar.gz: 16d8ee8931f7911a00486f7c5fe0774a4cc80bc942b3477458df0e3bcb0dcc274f519789f10fb1b6e6c4d28419ef45649460c2c09104b95b81cf96c6478fe1bc
+  metadata.gz: df073ebfec0f0b72116935ec44f100870aa2af93f825de3d8fda52e7e4978b19eff3597c6fa9f402287a56e8cf85ad6ee4ec8aee004f5a3b3c143942c86921b8
+  data.tar.gz: b947596b1eec82c8b3ee3173af999f29897b9fc834dd75b2c67d88056b0f96b68ea1fa66732345522eea9a9e9eba738f400396fcb25ce06cafb5027b07016db0

data/app/controllers/panda_pal/lti_v1_p3_controller.rb

@@ -55,8 +55,7 @@ module PandaPal
       parsed_request_url = URI.parse(request_url)
 
       mapped_placements = PandaPal.lti_paths.map do |k, opts|
-        opts = opts.dup
-        opts.delete(:route_helper_key)
+        opts = LaunchUrlHelpers.normalize_lti_launch_desc(opts)
         opts.merge!({
           placement: k,
           target_link_uri: LaunchUrlHelpers.absolute_launch_url(k.to_sym, host: parsed_request_url, launch_handler: v1p3_resource_link_request_path),

data/app/lib/lti_xml/base_platform.rb

@@ -85,7 +85,7 @@ module LtiXml
     end
 
     def ext_params(options, k)
-      options.delete(:route_helper_key)
+      options = LaunchUrlHelpers.normalize_lti_launch_desc(options)
       options[:url] = PandaPal::LaunchUrlHelpers.absolute_launch_url(k.to_sym, host: parsed_request_url, launch_handler: nil)
       options
     end

data/app/lib/panda_pal/launch_url_helpers.rb

@@ -2,11 +2,10 @@ module PandaPal
   module LaunchUrlHelpers
     def self.absolute_launch_url(launch_type, host:, launch_handler: nil)
       opts = PandaPal.lti_paths[launch_type]
-      final_url = launch_url(opts, launch_type: launch_type)
-
-      is_direct = opts[:route_helper_key].present? || !launch_handler.present?
+      is_direct = opts[:no_redirect] || !launch_handler.present?
 
       if is_direct
+        final_url = launch_url(opts, launch_type: launch_type)
         return final_url if URI.parse(final_url).absolute?
         return [host.to_s, final_url].join
       else
@@ -17,6 +16,13 @@ module PandaPal
       end
     end
 
+    def self.normalize_lti_launch_desc(opts)
+      opts = opts.dup
+      opts.delete(:route_helper_key)
+      opts.delete(:no_redirect)
+      opts
+    end
+
     def self.launch_url(opts, launch_type: nil)
       url = launch_route(opts, launch_type: launch_type)
       url = resolve_url_symbol(url) if url.is_a?(Symbol)

data/lib/panda_pal.rb

@@ -81,6 +81,7 @@ module PandaPal
 
   def self.validate_lti_navigation(errors = [])
     @@lti_navigation.each do |k, v|
+      next if v[:route_helper_key]
       errors << "lti navigation '#{k}' does not have a Route!" unless (LaunchUrlHelpers.launch_url(k) rescue nil)
     end
     errors

data/lib/panda_pal/helpers/route_helper.rb

@@ -9,6 +9,7 @@ module PandaPal::Helpers::RouteHelper
     path = "#{base_path}/#{nav.to_s}"
 
     lti_options = options.delete(:lti_options) || {}
+    lti_options[:no_redirect] = options.delete(:no_redirect)
     lti_options[:route_helper_key] = path.split('/').reject(&:empty?).join('_')
     post(path, options.dup, &block)
     get(path, options.dup, &block)

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.3.6.beta2"
+  VERSION = "5.3.6.beta3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.3.6.beta2
+  version: 5.3.6.beta3
 platform: ruby
 authors:
 - Instructure ProServe