panda_pal 5.16.12 → 5.16.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0442d4ba09d95ef51337e42da67e084ced8399cdaa025772a8bb74efc5d7c772
-  data.tar.gz: 80999b109c85aab72981be87b5d61be2fd4bf1a42ac37d036bf6fcdb4f2d7c6d
+  metadata.gz: eee3a364aa3be3e70d5ecadb4ea70c307c756eb196758bf44043b4dafb852a3c
+  data.tar.gz: ca42410eb19a2a8d5d253a32b3482e2273c5840632e6a00e577fa215e5ce2dad
 SHA512:
-  metadata.gz: fb3aa209bef32fc3042ef04a25601fd9a768e64e9793632076d2f3ff8d5428aa4c7545ff9ab684071a7dda0c3aecc4cec8db58d5af005add8b815df21888046f
-  data.tar.gz: 4ead30f7c30fa32ff41e72e8389a9c46221c6d1ab8a4f7bd3c3a69565cf0d53fbf1d0001dfd7e14e289cd76e5303a003cd8d527a0c1a76f0ec636ce1a96f5e83
+  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/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = '5.16.12'
+  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.12
+  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