qalam_lti_provider_engine 2.0.3 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95e9d007091c87b79f632ddeccc7ae2af1191a3731b5615938ec92e947c10be3
-  data.tar.gz: 2712ffda9664f3710ca997ac88c8faaec56211e9615eed7805abf0cd6b4df932
+  metadata.gz: c44302d262a552ee530b6f28ee83e7477d2246ed17ef96ab947dd05f9ab8feab
+  data.tar.gz: 44f56ac3fd92498e8d879d144c9cb46b427cf4f34da6b3af45a9d638669cd00d
 SHA512:
-  metadata.gz: 635f62a8ec30ed633858d77a6205c7ed08e29b2d5cdddf0f726dca76ac4090ce12e1674ee20ac06c7e5dff9ceb35d861acd807841d1fd0a32845d72b318de9bd
-  data.tar.gz: 592f214ce45df92ae17e78104925d2d47412023e1de0e95c9adefa2054f9ab99fa5ab8e9f1f14546861a6cff5a2ec1bb772e960a5b355f4a2f337c86a0a3a840
+  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/app/models/lti_provider/launch.rb

@@ -55,6 +55,82 @@ module LtiProvider
         tc.canvas_user_navigation!(LtiProvider::XmlConfig.user_navigation.symbolize_keys)
       end
 
+      ### QALAM ###
+
+      if LtiProvider::XmlConfig.course_home_sub_navigation
+        tc.canvas_course_home_sub_navigation!(LtiProvider::XmlConfig.course_home_sub_navigation.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.course_settings_sub_navigation
+        tc.canvas_course_settings_sub_navigation!(LtiProvider::XmlConfig.course_settings_sub_navigation.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.global_navigation
+        tc.canvas_global_navigation!(LtiProvider::XmlConfig.global_navigation.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.module_menu
+        tc.canvas_module_menu!(LtiProvider::XmlConfig.module_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.module_index_menu
+        tc.canvas_module_index_menu!(LtiProvider::XmlConfig.module_index_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.module_group_menu
+        tc.canvas_module_group_menu!(LtiProvider::XmlConfig.module_group_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.quiz_menu
+        tc.canvas_quiz_menu!(LtiProvider::XmlConfig.quiz_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.quiz_index_menu
+        tc.canvas_quiz_index_menu!(LtiProvider::XmlConfig.quiz_index_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.assignment_menu
+        tc.canvas_assignment_menu!(LtiProvider::XmlConfig.assignment_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.assignment_index_menu
+        tc.canvas_assignment_index_menu!(LtiProvider::XmlConfig.assignment_index_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.assignment_group_menu
+        tc.canvas_assignment_group_menu!(LtiProvider::XmlConfig.assignment_group_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.discussion_topic_menu
+        tc.canvas_discussion_topic_menu!(LtiProvider::XmlConfig.discussion_topic_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.discussion_topic_index_menu
+        tc.canvas_discussion_topic_index_menu!(LtiProvider::XmlConfig.discussion_topic_index_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.wiki_page_menu
+        tc.canvas_wiki_page_menu!(LtiProvider::XmlConfig.wiki_page_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.wiki_index_menu
+        tc.canvas_wiki_index_menu!(LtiProvider::XmlConfig.wiki_index_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.file_menu
+        tc.canvas_file_menu!(LtiProvider::XmlConfig.file_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.file_index_menu
+        tc.canvas_file_index_menu!(LtiProvider::XmlConfig.file_index_menu.symbolize_keys)
+      end
+
+      if LtiProvider::XmlConfig.editor_button
+        tc.canvas_editor_button!(LtiProvider::XmlConfig.editor_button.symbolize_keys)
+      end
+      
+      ### END ###
+
       if LtiProvider::XmlConfig.environments
         tc.set_ext_param(platform, :environments, LtiProvider::XmlConfig.environments.symbolize_keys)
       end

data/lib/lti_provider/version.rb

@@ -1,3 +1,3 @@
 module LtiProvider
-  VERSION = "2.0.3"
+  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.3
+  version: 2.0.7
 platform: ruby
 authors:
 - Dave Donahue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2021-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -22,7 +22,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,21 +32,21 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: ims-lti
+  name: qalam_ims_lti
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -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