qalam_lti_provider_engine 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f8241935a752778f3aaf18a334c18e0ca34f38942f1f08bbdcc937f77c9913e
-  data.tar.gz: 7a5ed02a9a13c728c8ffe34c1fd66e2c8b07b66da5541f3b55742886aa5e3879
+  metadata.gz: c44302d262a552ee530b6f28ee83e7477d2246ed17ef96ab947dd05f9ab8feab
+  data.tar.gz: 44f56ac3fd92498e8d879d144c9cb46b427cf4f34da6b3af45a9d638669cd00d
 SHA512:
-  metadata.gz: 738e91d04b9c70e04d10d575b2b8a497cf0fa064dd6cb0d39aadcc8226d6c13d1de35528edcb4b308a942466e0c0c37ac751f76c3f3e91f644a1b315d80c7972
-  data.tar.gz: b0aa71ce229a8dcb0a631029fd2fd15899b4c2daa3dc32d2c52f6777acd79ab7507aa2efc1749a3abded690a1e1c8ab75ff711dcca086b2aa740f68e74a7b57c
+  metadata.gz: d11a370ea40641bedfe3b509266b60f8147179e0ef82105d80b44eab4d6f6af877e20e928052614f0b65bafae8a909bd51ed371f08238991eff89859982a32f3
+  data.tar.gz: 5d10c95c500fb6198b99415a82163311272e19ced22b9e63db612d0f9b80fa34bf65eb6363cff0326cecdd35573199683f3a5e04f05c4283a2579d9da7ab7250

data/app/controllers/lti_provider/lti_controller.rb

@@ -4,11 +4,15 @@ require 'colorize'
 module LtiProvider
   class LtiController < LtiProvider::LtiApplicationController
     skip_before_action :require_lti_launch
+    # skip_before_action :verify_authenticity_token, only: :launch
 
     def launch
       provider = IMS::LTI::ToolProvider.new(params['oauth_consumer_key'], LtiProvider::Config.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
@@ -23,26 +27,34 @@ module LtiProvider
         end
         ### END ###
       else
-        return show_error "Unable to launch #{LtiProvider::XmlConfig.tool_title}. Please check your External Tools configuration and try again."
+        if params[:launch_tool] && 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."
+        end
       end
     end
 
     def cookie_test
+      @launch = Launch.where("created_at > ?", 5.minutes.ago).find_by_nonce(params[:nonce])
+
       if session[:cookie_test]
         # success!!! we've got a session!
         consume_launch
       else
-        render
+        if @launch.launch_tool && @launch.launch_tool == 'digital_library'
+          redirect_to main_app.root_path and return 
+        else
+          render and return
+        end
       end
     end
 
     def consume_launch
-      launch = Launch.where("created_at > ?", 5.minutes.ago).find_by_nonce(params[:nonce])
-
-      if launch
+      if @launch
         [:account_id, :course_name, :course_id, :canvas_url, :tool_consumer_instance_guid,
          :user_id, :user_name, :user_roles, :user_avatar_url, :launch_tool].each do |attribute|
-          session[attribute] = launch.public_send(attribute)
+          session[attribute] = @launch.public_send(attribute)
         end
 
         ### QALAM ###
@@ -52,11 +64,19 @@ module LtiProvider
         end
         ### END ###
         
-        launch.destroy
+        @launch.destroy
 
-        redirect_to main_app.root_path
+        if @launch.launch_tool && @launch.launch_tool == 'digital_library'
+          redirect_to main_app.root_path and return 
+        else
+          redirect_to main_app.root_path and return
+        end
       else
-        return show_error "The tool was not launched successfully. Please try again."
+        if @launch.launch_tool && @launch.launch_tool == 'digital_library'
+          redirect_to main_app.root_path and return 
+        else
+          return show_error "The tool was not launched successfully. Please try again."
+        end
       end
     end
 

data/lib/lti_provider/version.rb

@@ -1,3 +1,3 @@
 module LtiProvider
-  VERSION = "2.0.6"
+  VERSION = "2.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_lti_provider_engine
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Dave Donahue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: LtiProvider is a mountable engine for handling the LTI launch and exposing