panda_pal 5.12.5 → 5.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 427b8c2fd4edd7d2f4e8e8ea329bb6a61aa1ca0c78623f18f0ebd77d14909cc0
-  data.tar.gz: 85d633457678c235b6755bb56d8085ed6712e3be042acfffff1d2a29c0b39806
+  metadata.gz: be64d2d47a1932b2f58c2cd9c1af70a794c59fa5d99e80595d08e24d013621fc
+  data.tar.gz: 8823800b73cd31a9e1d2b52c53974319e1aec59820145e58fe0f9fff88aec05c
 SHA512:
-  metadata.gz: 4752a6f25b0c938f32aa9ef3b15c24ec21418b7287d9ac7d55c5987de82d24369fd33bd7e95e9a2da26c7e35800402e439f6da55a339856ee0b1e9c542b1ce25
-  data.tar.gz: d09935e4b817e371922553acf5bca5532b77b48c408c9d6fb9c83477e79b8731d794839bd8b661aaa68c796851b1445823048e398364540f4a9fba04b56dc1c7
+  metadata.gz: c552dab8f057acf5a3e4f0431d4f0e3d4a8f951e79efefebe33319ff0eadb75ed4404f448d7e4b6680179df7eb9185afe71bcfd4b27c0bb882aa2da6dabeee7b
+  data.tar.gz: 71a5aedceac72a992da1081a1b77b3fee22f173080820a9467bbb6d1b52a048a6ad8f41423c7f19d65e7a8768f1afc24109cc55f96aced6b82f10efc54cfbe6f

data/app/models/panda_pal/platform.rb

@@ -5,10 +5,10 @@ module PandaPal
   class Platform
     require_relative "platform/canvas"
 
-    def public_jwks
+    def public_jwks(force: false)
       require "json/jwt"
 
-      jwk_json = Rails.cache.fetch("panda_pal/jwks/#{jwks_url}")
+      jwk_json = Rails.cache.fetch("panda_pal/jwks/#{jwks_url}").presence unless force
       jwk_json ||= begin
         response = HTTParty.get(jwks_url)
         response.success? ? response.body : nil

data/app/models/panda_pal/session.rb

@@ -24,7 +24,9 @@ module PandaPal
 
     def cache(key, &blk)
       data[:cache] ||= {}
-      data[:cache][key] ||= blk.call
+      return data[:cache][key] if data[:cache].key?(key)
+
+      data[:cache][key] = blk.call
     end
 
     def launch_params

data/lib/panda_pal/concerns/ability_helper.rb

@@ -4,6 +4,26 @@ module PandaPal::Concerns
   module AbilityHelper
     extend ActiveSupport::Concern
 
+    class_methods do
+      def cache_on_session(method_sym)
+        mthd = instance_method(mthd_sym)
+        pmthd_sym = :"_scache_#{mthd_sym}"
+
+        alias_method pmthd_sym, mthd_sym
+        private pmthd_sym
+
+        class_eval <<~RUBY
+          def #{method_sym}()
+            cache_on_session(:#{pmthd_sym}) do
+              #{pmthd_sym}()
+            end
+          end
+        RUBY
+
+        method_sym
+      end
+    end
+
     # @return PandaPal::Session
     def panda_pal_session
       unless defined?(@panda_pal_session) || @controller.present? || method(:panda_pal_session).owner == PandaPal::Concerns::AbilityHelper

data/lib/panda_pal/helpers/controller_helper.rb

@@ -75,7 +75,11 @@ module PandaPal::Helpers
       raise JSON::JWT::VerificationFailed, 'Unrecognized Organization' unless @organization.present?
       raise JSON::JWT::VerificationFailed, 'Organization does not trust platform' unless @organization.trusted_platform?(current_lti_platform)
 
-      decoded_jwt.verify!(current_lti_platform.public_jwks)
+      begin
+        decoded_jwt.verify!(current_lti_platform.public_jwks)
+      rescue JSON::JWK::Set::KidNotFound
+        decoded_jwt.verify!(current_lti_platform.public_jwks(force: true))
+      end
 
       raise JSON::JWT::VerificationFailed, 'State is invalid' unless current_session_data[:lti_oauth_nonce] == decoded_jwt['nonce']
 

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.12.5"
+  VERSION = "5.12.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.12.5
+  version: 5.12.8
 platform: ruby
 authors:
 - Instructure CustomDev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2025-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails