panda_pal 5.6.9 → 5.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7746e5ec8e6a9422e44a880dda50b985b48706b727e48a02fc2918b75d904125
-  data.tar.gz: 3456caae1ed87a8accafcfa4145ca5ee403fe1bd8f9ac42c3796df8dc334a17c
+  metadata.gz: 7c935b2a3eae094ada04fdc46e45f25414c61b2e9afbf9c77d81ae611343548a
+  data.tar.gz: 96a098c934a92e921dc951ea0c492a0af5a5c2d8ebfbe57028a344a025c4e718
 SHA512:
-  metadata.gz: 0616e5eddcefae83d73bb8da9cb246baef0b06417ae1bbeea2545a1dccebf1d7e1b681931a449e00cc14e5ec3cb0d07c03adc7676048c0e29111701601017171
-  data.tar.gz: 384c9d6bdab817b224670c9d6e5fa080e791f9c2ed0442a0e8fa242cb5572ade7ad696a115b58f4c181bec8e2bed2b4fe39169d3a0eb0d796987306986b38549
+  metadata.gz: e63f7e0b91ce15a03e1baa5f64ec479fb28a921f1301daaac2c5376f3da8aea0728c0639f25836ef9e5e228fe7dd82424935df92511c50d3ad6ca0afa10c55c4
+  data.tar.gz: 3e8ffeff4dc35b093d8c2a2b243a1f5a496902508e3207a564285617b7465c803e7d875a21703e452c5afd53529ceb2f660f7e77bfdecd479178be9567f805c0

data/app/models/panda_pal/organization.rb

@@ -72,10 +72,6 @@ module PandaPal
       find_by_name(Apartment::Tenant.current)
     end
 
-    PandaPal.resolved_extensions_for(self).each do |ext|
-      include ext
-    end
-
     def create_api(logic, expiration: nil, uses: nil, host: nil)
       switch_tenant do
         logic = "current_organization.#{logic}" if logic.is_a?(Symbol)
@@ -102,6 +98,14 @@ module PandaPal
       switch_tenant if do_switch
     end
 
+    def platform_extensions(platform_type)
+      return self unless defined?(platform_type::OrgExtension)
+      return self if self.class < platform_type::OrgExtension
+
+      scl = platform_type.org_subclass
+      scl ? becomes(scl) : self
+    end
+
     if !PandaPal.lti_options[:platform].present? || PandaPal.lti_options[:platform].is_a?(String)
       platform_cls = Platform.resolve_platform_class(nil) rescue nil
       if platform_cls && defined?(platform_cls::OrgExtension)
@@ -109,6 +113,10 @@ module PandaPal
       end
     end
 
+    PandaPal.resolved_extensions_for(self).each do |ext|
+      include ext
+    end
+
     private
 
     def create_schema

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

@@ -28,54 +28,77 @@ module PandaPal
     module OrgExtension
       extend ActiveSupport::Concern
 
-      def install_lti(host: nil, context: :root_account, version: 'v1p3', exists: :error, dedicated_deployment: false)
-        raise "Automatically installing this LTI requires Bearcat." unless defined?(Bearcat)
+      included do
+        define_model_callbacks :lti_install
+      end
 
+      def _parse_lti_context(context)
         context = context.to_s
         context = 'account/self' if context == 'root_account'
         cid, ctype = context.split(/[\.\/]/).reverse
         ctype ||= 'account'
 
-        if version == 'v1p0'
-          existing_installs = _find_existing_installs(exists: exists) do |lti|
-            lti[:consumer_key] == self.key
-          end
+        [ctype, cid]
+      end
 
-          conf = {
-            name: PandaPal.lti_options[:title],
-            description: PandaPal.lti_options[:description],
-            consumer_key: self.key,
-            shared_secret: self.secret,
-            privacy_level: "public",
-            config_type: 'by_url',
-            config_url: PandaPal::LaunchUrlHelpers.resolve_route(:v1p0_config_url, host: host),
-          }
+      def install_lti(host: nil, context: :root_account, version: 'v1p3', exists: :error, dedicated_deployment: false)
+        raise "Automatically installing this LTI requires Bearcat." unless defined?(Bearcat)
 
-          bearcat_client.send(:"create_#{ctype}_external_tool", cid, conf)
-        elsif version == 'v1p3'
-          ekey = _ensure_lti_v1p3_key(exists: exists)
+        run_callbacks :lti_install do
+          ctype, cid = _parse_lti_context(context)
 
-          existing_installs = _find_existing_installs(exists: exists) do |lti|
-            lti[:developer_key_id] == (ekey[:id] % 10_000_000_000_000)
-          end
+          if version == 'v1p0'
+            existing_installs = _find_existing_installs(exists: exists) do |lti|
+              lti[:consumer_key] == self.key
+            end
 
-          scope_tool = bearcat_client.send(:"create_#{ctype}_external_tool", cid, {
-            client_id: ekey[:id],
-          })
+            conf = {
+              name: PandaPal.lti_options[:title],
+              description: PandaPal.lti_options[:description],
+              consumer_key: self.key,
+              shared_secret: self.secret,
+              privacy_level: "public",
+              config_type: 'by_url',
+              config_url: PandaPal::LaunchUrlHelpers.resolve_route(:v1p0_config_url, host: host),
+            }
+
+            api_result = existing_installs[0] ? bearcat_client.send(:"edit_#{ctype}_external_tool", cid, existing_installs[0][:id], conf) : bearcat_client.send(:"create_#{ctype}_external_tool", cid, conf)
+
+            @new_lti_installation = api_result
+          elsif version == 'v1p3'
+            ekey = _ensure_lti_v1p3_key(exists: exists, host: host)
+
+            existing_installs = _find_existing_installs(context, exists: exists) do |lti|
+              lti[:developer_key_id] == (ekey[:id] % 10_000_000_000_000)
+            end
 
-          new_client_id = "#{ekey[:id]}"
-          new_client_id += "/#{scope_tool[:deployment_id]}" if dedicated_deployment
+            scope_tool = existing_installs[0]
 
-          self.key = new_client_id
-          self.secret = ekey[:api_key]
+            # Don't need to do an update if it already exists - Settings are stored on the LTI Key instead of the installation
+            unless scope_tool
+              scope_tool = bearcat_client.send(:"create_#{ctype}_external_tool", cid, {
+                client_id: ekey[:id],
+              })
 
-          save! if changed!
-        else
-          raise "Unrecognized LTI Version #{version}"
+              new_client_id = "#{ekey[:id]}"
+              new_client_id += "/#{scope_tool[:deployment_id]}" if dedicated_deployment
+
+              self.key = new_client_id
+              self.secret = ekey[:api_key]
+
+              save! if changed?
+            end
+
+            @new_lti_installation = scope_tool
+          else
+            raise "Unrecognized LTI Version #{version}"
+          end
         end
+
+        save!
       end
 
-      def _ensure_lti_v1p3_key(exists:)
+      def _ensure_lti_v1p3_key(exists:, host:)
         current_client_id = self.key.split('/')[0]
 
         existing_keys = []
@@ -111,7 +134,10 @@ module PandaPal
           # Update Existing
           ekey = bearcat_client.put("api/lti/developer_keys/#{ekey[:id]}/tool_configuration", {
             developer_key: ekey[:developer_key],
-            tool_configuration: lti_json,
+            # tool_configuration: lti_json,
+            tool_configuration: {
+              settings: lti_json,
+            },
           })
         end
 
@@ -128,26 +154,32 @@ module PandaPal
         ekey
       end
 
-      def _find_existing_installs(exists:, &matcher)
+      def _find_existing_installs(context, exists: nil, &matcher)
+        ctype, cid = _parse_lti_context(context)
+
         existing_installs = bearcat_client.send(:"#{ctype}_external_tools", cid).all_pages_each.filter do |cet|
           matcher.call(cet)
         end
 
-        if existing_installs.present?
+        if exists.present? && existing_installs.present?
           case exists
           when :error
             raise "Tool with key #{self.key} already installed"
           when :duplicate
+            []
           when :replace
             existing_installs.each do |install|
               bearcat_client.send(:"delete_#{ctype}_external_tool", cid, install[:id])
             end
+            []
+          when :update
+            existing_installs
           else
             raise "exists: #{exists} is not supported"
           end
+        else
+          existing_installs
         end
-
-        existing_installs
       end
 
       def reinstall_lti!(*args, **kwargs)
@@ -199,6 +231,10 @@ module PandaPal
         end
       end
 
+      def lti_installations(context= :root_account)
+        _find_existing_installs(context)
+      end
+
       def canvas_url
         PandaPal::Platform.find_org_setting([
           "canvas.base_url",

data/app/models/panda_pal/platform.rb

@@ -72,14 +72,13 @@ module PandaPal
       raise "Unknown platform '#{platform}'"
     end
 
-    def self.materialize_extension(org)
+    def self.org_subclass
       return nil unless defined?(self::OrgExtension)
+      oext = self::OrgExtension
 
-      ext_mod = self::OrgExtension
-      org = org.dup
-      org.extend(ext_mod)
-
-      org
+      @org_subclass ||= Class.new(PandaPal::Organization) do
+        include oext
+      end
     end
 
     protected

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.6.9"
+  VERSION = "5.6.10"
 end