panda_pal 5.16.11 → 5.16.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee9158110a7d849ea8c7081ca5dad936f4249ae4900b27e7f22462b9712a8d93
-  data.tar.gz: ce723eedd0ced7e2c2bde8efa673e5dbae9233dabad7055a4899182e3babdc12
+  metadata.gz: eee3a364aa3be3e70d5ecadb4ea70c307c756eb196758bf44043b4dafb852a3c
+  data.tar.gz: ca42410eb19a2a8d5d253a32b3482e2273c5840632e6a00e577fa215e5ce2dad
 SHA512:
-  metadata.gz: 738958fdcaa04fb5facefb8f01fef401755c90d828d008ef2fb805eda475c70d5dfb078fc6e9736108f6120c6bb11917bf548f2c36f6184dc25d2bba6513ec01
-  data.tar.gz: f5c7b45e8c9757f7184f8e4411890c0afb5821b9a1f691236c0c885ae8dd80e371b5bb51b0adcb0360e5e23a2a88f7b606b0aa9c461115b09e838a255c737073
+  metadata.gz: dcefe8a6496762e334f3e08367a5b6b5d2eeb92c2142a39ec3f4f1cd6c6e375cd1812a8900443ffd2f7b50ea5571dfb0583b44f706cf5523246babf700bd7df0
+  data.tar.gz: d8615a3bb2dede06f53e1ab1a2d5f1fe648495c3415acaa6f9dcdf6dd44b6cd188f3ae2bcfe3fd623963534819d130fdd090fc35e0fe75be8abf36acb86be16e

data/app/controllers/panda_pal/lti_v1_p3_controller.rb

@@ -124,9 +124,7 @@ module PandaPal
     end
 
     def public_jwks
-      render json: {
-        keys: [JWT::JWK.new(PandaPal.lti_private_key).export]
-      }
+      render json: JWT::JWK::Set.new(PandaPal.jwk).export
     end
 
     protected

data/app/lib/panda_pal/deep_linking_helpers.rb

@@ -134,9 +134,8 @@ module PandaPal
         PandaPal::LtiConstants::DeepLinking::DATA => custom_deep_link_data,
       }
 
-      require 'json/jwt'
-      jwk = JSON::JWK.new(PandaPal.lti_private_key)
-      JSON::JWT.new(deep_link_jwt_payload).sign(jwk, :RS256).to_s
+      jwk = PandaPal.jwk
+      JWT.encode(deep_link_jwt_payload, jwk.signing_key, jwk[:alg], kid: jwk[:kid])
     end
   end
 end

data/app/models/panda_pal/platform/canvas.rb

@@ -168,13 +168,22 @@ module PandaPal
           lti_json["target_link_uri"]
         ]
 
+        canvas_ext = (lti_json["extensions"] || []).find { |ext| ext["platform"] == "canvas.instructure.com" }
+        placements = canvas_ext&.dig("settings", "placements") || []
+        placements.each do |p|
+          next unless p["target_link_uri"]
+          valid_redirect_uris << p["target_link_uri"].gsub(/\?.*$/, "")
+        end
+
+        valid_redirect_uris.uniq!
+
         prod_domain = PandaPal.lti_environments[:domain]
         if prod_domain.present?
           PandaPal.lti_environments.each do |env, domain|
             env = env.to_s
             next unless env.ends_with?("_domain")
             env = env.split('_')[0]
-            valid_redirect_uris << lti_json["target_link_uri"].gsub(prod_domain, domain)
+            valid_redirect_uris += valid_redirect_uris.map{|uri| uri.gsub(prod_domain, domain)}
           end
         end
 

data/lib/panda_pal/helpers/route_helper.rb

@@ -17,6 +17,6 @@ module PandaPal::Helpers::RouteHelper
     lti_options[:route_helper_key] = path.split('/').reject(&:empty?).join('_')
     post(path, options.dup, &block)
     get(path, options.dup, &block)
-    PandaPal::stage_placement(nav, lti_options)
+    PandaPal::stage_navigation(nav, lti_options)
   end
 end

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = '5.16.11'
+  VERSION = '5.16.13'
 end

data/lib/panda_pal.rb

@@ -5,6 +5,8 @@ require 'panda_pal/lti_constants'
 require 'oauth/request_proxy/rack_request'
 require 'oauth/request_proxy/action_dispatch_request'
 
+require 'jwt'
+
 Dir[File.dirname(__FILE__) +  "/panda_pal/concerns/**/*.rb"].each { |file| require file }
 
 module PandaPal
@@ -111,6 +113,14 @@ module PandaPal
     end.compact
   end
 
+  def self.jwk
+    @@jwk ||= JWT::JWK.new(lti_private_key, { use: 'sig', alg: 'RS256' })
+  end
+
+  def self.jwk=(v)
+    @@jwk = v
+  end
+
   private
 
   def self.normalize_ext_type(type)

data/panda_pal.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'browser', '2.5.0'
   s.add_dependency 'attr_encrypted', '~> 4.0.0'
   s.add_dependency 'secure_headers', '~> 6.1'
-  s.add_dependency 'json-jwt'
   s.add_dependency 'jwt'
   s.add_dependency 'httparty'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.16.11
+  version: 5.16.13
 platform: ruby
 authors:
 - Instructure CustomDev
@@ -93,20 +93,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.1'
-- !ruby/object:Gem::Dependency
-  name: json-jwt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement