qalam_lti_provider_engine 2.0.9 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07bc159f241d267bd6e42067a210324f18198742dc3e4965959b6b95065aebe7
-  data.tar.gz: 5f962326d293321e6d9d229c6bd7fad1c57e4155efb03e416a540afaf30cda33
+  metadata.gz: ffc7781e66b1cae37477f81e36d212e3e52a115aa49e908a8954dda144d05ede
+  data.tar.gz: ee3ad8f02faa0314cea6192a5d264935d5b0ecb8d10b9622125acc4c635fd608
 SHA512:
-  metadata.gz: 215e7707f1858ce5cb1c3302b324ce2b9f0e513a1b7781d171b8179f1a7d1bc5378797f268dfffd4c179445a9396f7c58b51bc976f76ff2fc9a82165ac06f54d
-  data.tar.gz: a31aeb671814a4f142ebd99ccb2e19acb11334e5f35c7cfc384f50d80c7deca978f3a104239cf1d6de1328efac50f353498d233b16c7ef414799a43ffce3b44f
+  metadata.gz: d180b3146931ff792403020def0d9b562dedd791fd3ec5f869199736d11501390675b9003c4701b1f0354ce2477808ce23c8e565749df339b79858efcd57b86c
+  data.tar.gz: d5cd47670bef6e30fb0f4764e7c4c509aa21083edc8afd44aaffce076f2caad9d90dd0b2c67d0b96bd2816b2702b75a9fab5f0e4fc3b8e42b8a1998fc3dd8bd3

data/app/controllers/lti_provider/lti_controller.rb

@@ -4,23 +4,20 @@ require 'colorize'
 module LtiProvider
   class LtiController < LtiProvider::LtiApplicationController
     skip_before_action :require_lti_launch
-    # skip_before_action :verify_authenticity_token, only: :launch
+    skip_before_action :verify_authenticity_token, only: :launch, if: :digital_library?
 
     def launch
       tool_key = params['oauth_consumer_key']
-      tool_secret = ((ToolLtiKey.table_exists? && ToolLtiKey.find_by(key: tool_key, canvas_url: canvas_url_domain)&.secret) or (LtiProvider::Config.secret))
-
-      # puts tool_key.inspect.green
-      # puts LtiProvider::Config.secret.inspect.red
-      # puts (ToolLtiKey.table_exists? && ToolLtiKey.find_by(key: tool_key, canvas_url: canvas_url_domain)&.secret).inspect.red
-      # puts tool_secret.inspect.green
+      if canvas_url_domain && ToolLtiKey.table_exists?
+        tool_lti_key = ToolLtiKey.where(key: tool_key).where('lower(canvas_url) LIKE :q', q: "%#{canvas_url_domain.downcase}%" ).first
+        tool_secret = tool_lti_key&.secret or LtiProvider::Config.secret
+      else
+        tool_secret = LtiProvider::Config.secret
+      end
       
       provider = IMS::LTI::ToolProvider.new(tool_key, tool_secret, params)
       launch = Launch.initialize_from_request(provider, request)
 
-      # puts launch.inspect.red
-      # puts request.origin.inspect.green
-      # puts request.base_url.inspect.yellow
       if !launch.valid_provider?
         msg = "#{launch.lti_errormsg} Please be sure you are launching this tool from the link provided in Qalam."
         return show_error msg
@@ -34,7 +31,7 @@ module LtiProvider
         end
         ### END ###
       else
-        # if params[:launch_tool] && params[:launch_tool] == 'digital_library'
+        # if params[:qalam_url] && params[:launch_tool] == 'digital_library'
         #   redirect_to main_app.root_path and return 
         # else
           return show_error "Unable to launch #{LtiProvider::XmlConfig.tool_title}. Please check your External Tools configuration and try again."
@@ -109,5 +106,9 @@ module LtiProvider
           return domain
         end
       end
+
+      def digital_library? 
+        session[:qalam_url] ? true : false
+      end
   end
 end

data/lib/lti_provider/lti_application.rb

@@ -88,4 +88,4 @@ module LtiProvider
       render plain: "Unable to process request", status: 406
     end
   end
-end
+end

data/lib/lti_provider/lti_config.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'colorize'
 
 module LtiProvider
   module LtiConfig
@@ -13,12 +14,12 @@ module LtiProvider
     def self.setup!
       config = LtiProvider::Config
       if File.exists?(config_file)
-        Rails.logger.info "Initializing LTI key and secret using configuration in #{config_file}"
+        Rails.logger.info "Initializing LTI key and secret using configuration in #{config_file}".green
         load_config.each do |k,v|
           config.send("#{k}=", v)
         end
       elsif ENV['LTI_KEY'].present? && ENV['LTI_SECRET'].present?
-        Rails.logger.info "Initializing LTI key and secret using environment vars LTI_KEY and LTI_SECRET"
+        Rails.logger.info "Initializing LTI key and secret using environment vars LTI_KEY and LTI_SECRET".green
         config.key = ENV['LTI_KEY']
         config.secret = ENV['LTI_SECRET']
         config.require_canvas = !!ENV['LTI_REQUIRE_CANVAS']

data/lib/lti_provider/lti_xml_config.rb

@@ -1,3 +1,6 @@
+require 'yaml'
+require 'colorize'
+
 module LtiProvider
   module LtiXmlConfig
     def self.load_config
@@ -11,7 +14,7 @@ module LtiProvider
     def self.setup!
       config = LtiProvider::XmlConfig
       if File.exists?(config_file)
-        Rails.logger.info "Initializing LTI XML config using configuration in #{config_file}"
+        Rails.logger.info "Initializing LTI XML config using configuration in #{config_file}".green
         load_config.each do |k,v|
           config.send("#{k}=", v)
         end

data/lib/lti_provider/version.rb

@@ -1,3 +1,3 @@
 module LtiProvider
-  VERSION = "2.0.9"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_lti_provider_engine
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.1.0
 platform: ruby
 authors:
 - Dave Donahue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -47,6 +47,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement