qalam_lti_provider_engine 1.1.6 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 966db98bfcaa29cbf05e8b3b38f270f50cc4ea27480a2245dd08804f09f502a8
-  data.tar.gz: 2d7be0649b8c6cf2b2e34bf41224de7e31896255e58969adf109c78f9f108add
+  metadata.gz: 66602aec8f52d289ad48bfa0a262cedab1009769b1f6b481b53bcc7dcc4db5e4
+  data.tar.gz: b56291e0057f0379eb690f1eeb9ced57c6d10dbc409c5e0ebd1f3e03e6992c66
 SHA512:
-  metadata.gz: c52b467a447ca10b21669f601caf1e31bdbd9e2e00f6cd5f2f094d8424da8c706c93ca17d476797200cf46b3cd8da7cab66cfad9a0dd312a311e1d0147da213e
-  data.tar.gz: 5a2eb1b5611808ecc4a896c2e6e11a0e491ae3831fc6c74e0eb09bfd3aaa789c002c974be00d5f716beecc63f5cb00c143fdfd4041e6828081a6b458c0999cbe
+  metadata.gz: bf8c57dcec00e990c922726172ca55eb62089cecde2d9a3c32963e31a250be6378a715fd8b210bf8b629f1ce70db837770a8a569216dd28d955b1b8cf9f34893
+  data.tar.gz: e83b485d85dbb3f28186a7a6c806a4b36a5a37d389b2cb9e8fa430eea7a5cc37de44ca9c6c0f0c3ccb54565b3f1354bcc0ccd0876be8af6776ecab01e581bb1b

data/app/controllers/lti_provider/lti_controller.rb

@@ -10,11 +10,20 @@ module LtiProvider
       launch = Launch.initialize_from_request(provider, request)
       
       if !launch.valid_provider?
-        msg = "#{launch.lti_errormsg} Please be sure you are launching this tool from the link provided in Canvas."
+        msg = "#{launch.lti_errormsg} Please be sure you are launching this tool from the link provided in Qalam."
         return show_error msg
       elsif launch.save
         session[:cookie_test] = true
-        redirect_to cookie_test_path(nonce: launch.nonce, launch: params[:launch], timetable_date: params[:timetable_date], section_room: params[:section_room])
+
+        ### QALAM ###
+        if params[:timetable_date] && params[:section_room]
+          redirect_to cookie_test_path(nonce: launch.nonce, launch: params[:launch], timetable_date: params[:timetable_date], section_room: params[:section_room])
+        elsif params[:launch]
+          redirect_to cookie_test_path(nonce: launch.nonce, launch: params[:launch])
+        else
+          redirect_to cookie_test_path(nonce: launch.nonce)
+        end
+        ### END ###
       else
         return show_error "Unable to launch #{LtiProvider::XmlConfig.tool_title}. Please check your External Tools configuration and try again."
       end
@@ -23,7 +32,11 @@ module LtiProvider
     def cookie_test
       if session[:cookie_test]
         # success!!! we've got a session!
-        consume_launch
+        if params[:launch] or (params[:timetable_date] && params[:section_room])
+          qalam_consume_launch
+        else
+          consume_launch
+        end
       else
         render
       end
@@ -32,6 +45,24 @@ module LtiProvider
     def consume_launch
       launch = Launch.where("created_at > ?", 5.minutes.ago).find_by_nonce(params[:nonce])
 
+      if launch
+        [:account_id, :course_name, :course_id, :canvas_url, :tool_consumer_instance_guid,
+         :user_id, :user_name, :user_roles, :user_avatar_url].each do |attribute|
+          session[attribute] = launch.public_send(attribute)
+        end
+
+        launch.destroy
+
+        redirect_to main_app.root_path
+      else
+        return show_error "The tool was not launched successfully. Please try again."
+      end
+    end
+
+    ### QALAM ###
+    def qalam_consume_launch
+      launch = Launch.where("created_at > ?", 5.minutes.ago).find_by_nonce(params[:nonce])
+
       puts params.inspect.yellow
 
       if launch
@@ -55,6 +86,7 @@ module LtiProvider
         return show_error "The tool was not launched successfully. Please try again."
       end
     end
+    ### END ###
 
     def configure
       respond_to do |format|
@@ -69,5 +101,4 @@ module LtiProvider
         render plain: message
       end
   end
-end
-
+end

data/app/models/lti_provider/launch.rb

@@ -79,8 +79,7 @@ module LtiProvider
           "Consumer key not provided."
         elsif provider.consumer_secret.blank?
           "Consumer secret not configured on provider."
-        ### QALAM ###
-        elsif !provider.valid_request?(request) && false
+        elsif !provider.valid_request?(request)
           "The OAuth signature was invalid."
         elsif oauth_timestamp_too_old?(provider.request_oauth_timestamp)
           "Your request is too old."

data/lib/lti_provider/lti_application.rb

@@ -18,7 +18,7 @@ module LtiProvider
     end
 
     def prompt_for_launch
-      render plain: 'Please launch this tool from Canvas and then try again.'
+      render plain: 'Please launch this tool from Qalam and then try again.'
     end
 
     def canvas_url

data/lib/lti_provider/version.rb

@@ -1,3 +1,3 @@
 module LtiProvider
-  VERSION = "1.1.6"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_lti_provider_engine
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 2.0.1
 platform: ruby
 authors:
 - Dave Donahue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-22 00:00:00.000000000 Z
+date: 2021-07-25 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.15
+rubygems_version: 3.2.21
 signing_key: 
 specification_version: 4
 summary: LtiProvider is a mountable engine for handling the LTI launch and exposing