panda_pal 5.6.7 → 5.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c335f4ab51dec72916a2a630af60dbbed1f681bcd220cbf4585f5291127ca8ac
-  data.tar.gz: 3031b40de1ba6899077609843b1ed57d30cec38867f68f3c9c45281affea54c2
+  metadata.gz: 868d32b3e1b91a944db8d066378cdf2a130945e321679f72e8f3b126b11082b7
+  data.tar.gz: 73bce1c742d141276429bec08538ae1dc61785f43ea211da53389e3305f3072b
 SHA512:
-  metadata.gz: 7c225b256e06497ddc5ca6faf9604a28cb9290d0b37911ad39ac00e88beb2d3041541d758e55e992608db79ca9b5249c8aaf0ca69310b651f6635095fc7a2650
-  data.tar.gz: 7d2e7c371bd4bab83ee8c2e001d8affc48d0f5e88b2c21476b181c134a37de9db535c527b41812759eef0d0b96cc7d6bb3a427ef7187f5bc9d3efca145f59838
+  metadata.gz: 919ee52b9e3038f9f44141dbba685fd2051a6ce4b1e81ddba5f5ab90063e2979c8471f1e24714b961454f86589a282d645c6ad6628829b97494a8620c3619ca4
+  data.tar.gz: 7a3b5a810c65a57fd5ce42d9b805dbb58469972cfb94f54a93c5f74bce3a87fe40c3c76fa0fd63fc008e1effb791086c559e4fe59bec537b21c6baac13e614f8

data/app/models/panda_pal/api_call.rb

@@ -50,7 +50,10 @@ module PandaPal
         api_call_id: id,
         organization_id: Organization.current&.id,
       }
-      payload[:exp] = expiration.iso8601 if expiration.present?
+      if expiration.present?
+        expiration = DateTime.parse(expiration) if expiration.is_a?(String)
+        payload[:exp] = expiration.iso8601
+      end
       ::JWT.encode(payload, Rails.application.secret_key_base, 'HS256')
     end
 

data/app/models/panda_pal/organization_concerns/settings_validation.rb

@@ -74,8 +74,6 @@ module PandaPal
       end
 
       def validate_settings
-        return unless defined?(Rails::Console)
-
         validate_settings_level(settings || {}, settings_structure).each do |err|
           errors[:settings] << err
         end

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

@@ -28,7 +28,7 @@ module PandaPal
     module OrgExtension
       extend ActiveSupport::Concern
 
-      def install_lti(host: nil, context: :root_account, version: 'v1p1', exists: :error)
+      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)
 
         context = context.to_s
@@ -36,8 +36,101 @@ module PandaPal
         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
+
+          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),
+          }
+
+          bearcat_client.send(:"create_#{ctype}_external_tool", cid, conf)
+        elsif version == 'v1p3'
+          ekey = _ensure_lti_v1p3_key(exists: exists)
+
+          existing_installs = _find_existing_installs(exists: exists) do |lti|
+            lti[:developer_key_id] == (ekey[:id] % 10_000_000_000_000)
+          end
+
+          scope_tool = bearcat_client.send(:"create_#{ctype}_external_tool", cid, {
+            client_id: ekey[:id],
+          })
+
+          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!
+        else
+          raise "Unrecognized LTI Version #{version}"
+        end
+      end
+
+      def _ensure_lti_v1p3_key(exists:)
+        current_client_id = self.key.split('/')[0]
+
+        existing_keys = []
+        existing_keys += bearcat_client.get("api/v1/accounts/self/developer_keys?per_page=100").filter do |devkey|
+          devkey[:id].to_s == current_client_id
+        end
+        existing_keys += bearcat_client.get("api/v1/accounts/self/developer_keys?per_page=100", inherited: true).filter do |devkey|
+          devkey[:id].to_s == current_client_id
+        end
+
+        ekey = existing_keys[0]
+        # if ekey && exists == :error
+        #   raise "Tool with key #{self.key} already installed"
+        # end
+
+        lti_json_url = PandaPal::LaunchUrlHelpers.resolve_route(:v1p3_config_url, host: host)
+        lti_json = JSON.parse(HTTParty.get(lti_json_url, format: :plain).body)
+
+        if !ekey
+          # Create New
+          ekey = bearcat_client.post("api/lti/accounts/self/developer_keys/tool_configuration", {
+            developer_key: {
+              name: PandaPal.lti_options[:title],
+              redirect_uris: [
+                lti_json["target_link_uri"],
+              ].join("\n")
+            },
+            tool_configuration: {
+              settings: lti_json,
+            },
+          })
+        elsif exists == :replace || exists == :update
+          # Update Existing
+          ekey = bearcat_client.put("api/lti/developer_keys/#{ekey[:id]}/tool_configuration", {
+            developer_key: ekey[:developer_key],
+            tool_configuration: lti_json,
+          })
+        end
+
+        ekey = ekey[:developer_key] || ekey
+
+        if ekey[:developer_key_account_binding][:workflow_state] == "off"
+          bearcat_client.post("api/v1/accounts/self/developer_keys/#{ekey[:id]}/developer_key_account_bindings", {
+            developer_key_account_binding: {
+              workflow_state: "on",
+            },
+          })
+        end
+
+        ekey
+      end
+
+      def _find_existing_installs(exists:, &matcher)
         existing_installs = bearcat_client.send(:"#{ctype}_external_tools", cid).all_pages_each.filter do |cet|
-          cet[:consumer_key] == self.key
+          matcher.call(cet)
         end
 
         if existing_installs.present?
@@ -54,19 +147,7 @@ module PandaPal
           end
         end
 
-        # TODO LTI 1.3 Support
-
-        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),
-        }
-
-        bearcat_client.send(:"create_#{ctype}_external_tool", cid, conf)
+        existing_installs
       end
 
       def reinstall_lti!(*args, **kwargs)

data/lib/panda_pal/engine.rb

@@ -49,6 +49,58 @@ module PandaPal
       end
     end
 
+    initializer "panda_pal.globals" do |app|
+      class ::Object
+        unless defined?(switch_tenant)
+          def switch_tenant(tenant, &block)
+            if block_given?
+              Apartment::Tenant.switch(tenant, &block)
+            else
+              Apartment::Tenant.switch!(tenant)
+            end
+          end
+        end
+
+        unless defined?(current_organization)
+          def current_organization
+            PandaPal::Organization.find_by_name(Apartment::Tenant.current)
+          end
+        end
+      end
+    end
+
+    initializer "panda_pal.autoswitch" do |app|
+      class ::Object
+        def _panda_pal_console_autoswitch_tenant
+          org = nil
+          if Rails.env.development?
+            org = PandaPal::Organization.find_by(name: 'local') || PandaPal::Organization.first
+          elsif PandaPal::Organization.count == 1
+            org = PandaPal::Organization.first
+          end
+
+          if org
+            org.switch_tenant
+            puts "PandaPal: Auto Switched to tenant '#{org.name}'"
+          end
+        rescue => err
+          puts "PadaPal: Error occurred auto-switching tenant: #{err}"
+        end
+      end
+
+      module Rails::ConsoleMethods
+        def self.included(base)
+          _panda_pal_console_autoswitch_tenant
+        end
+      end
+
+      if defined?(Pry)
+        Pry.hooks.add_hook(:before_session, "switch PandaPal tenant") do |output, binding, pry|
+          _panda_pal_console_autoswitch_tenant
+        end
+      end
+    end
+
     initializer "panda_pal.serialze_symbols" do |app|
       app.config.active_record.yaml_column_permitted_classes ||= []
       app.config.active_record.yaml_column_permitted_classes |= [Symbol]

data/lib/panda_pal/helpers.rb

@@ -1,4 +1,5 @@
 module PandaPal::Helpers
+  require_relative 'helpers/misc_helper'
   require_relative 'helpers/controller_helper'
   require_relative 'helpers/route_helper'
   require_relative 'helpers/secure_headers'

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.6.7"
+  VERSION = "5.6.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.6.7
+  version: 5.6.8
 platform: ruby
 authors:
 - Instructure ProServe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -309,7 +309,6 @@ files:
 - app/lib/lti_xml/canvas_platform.rb
 - app/lib/panda_pal/launch_url_helpers.rb
 - app/lib/panda_pal/lti_jwt_validator.rb
-- app/lib/panda_pal/misc_helper.rb
 - app/models/panda_pal/api_call.rb
 - app/models/panda_pal/organization.rb
 - app/models/panda_pal/organization_concerns/settings_validation.rb
@@ -335,6 +334,7 @@ files:
 - lib/panda_pal/engine.rb
 - lib/panda_pal/helpers.rb
 - lib/panda_pal/helpers/controller_helper.rb
+- lib/panda_pal/helpers/misc_helper.rb
 - lib/panda_pal/helpers/route_helper.rb
 - lib/panda_pal/helpers/secure_headers.rb
 - lib/panda_pal/helpers/session_replacement.rb