qalam_lti_provider_engine 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66602aec8f52d289ad48bfa0a262cedab1009769b1f6b481b53bcc7dcc4db5e4
-  data.tar.gz: b56291e0057f0379eb690f1eeb9ced57c6d10dbc409c5e0ebd1f3e03e6992c66
+  metadata.gz: 2d5de793be201a93e83c1e1540f792bfd92cc5412cf76b1a48e0c9b93f0efd56
+  data.tar.gz: f7ca5132f3369db5534fa30149250c18195e6a54b7ef4b10d33799a702564c5a
 SHA512:
-  metadata.gz: bf8c57dcec00e990c922726172ca55eb62089cecde2d9a3c32963e31a250be6378a715fd8b210bf8b629f1ce70db837770a8a569216dd28d955b1b8cf9f34893
-  data.tar.gz: e83b485d85dbb3f28186a7a6c806a4b36a5a37d389b2cb9e8fa430eea7a5cc37de44ca9c6c0f0c3ccb54565b3f1354bcc0ccd0876be8af6776ecab01e581bb1b
+  metadata.gz: 34799dbb9d21db9fb35114d28043bcc99fe7d411ead2998c4a71b7f07d4a8c27bddd1eb68eeae3c8d4df828afb6bc9a2bcc9f87b8d68b3e6f10b603851fc46fa
+  data.tar.gz: 16295217e008e909dae41d9978c9f2a40ccdd8aea729205df1afe98fa16673f70b817a03a7b60a0abf92e4ad80e2bd591ea867c38234a25550d07bff33dff32a

data/app/controllers/lti_provider/lti_controller.rb

@@ -8,7 +8,7 @@ module LtiProvider
     def launch
       provider = IMS::LTI::ToolProvider.new(params['oauth_consumer_key'], LtiProvider::Config.secret, params)
       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 Qalam."
         return show_error msg
@@ -17,9 +17,7 @@ module LtiProvider
 
         ### 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])
+          redirect_to cookie_test_path(nonce: launch.nonce, timetable_date: params[:timetable_date], section_room: params[:section_room])
         else
           redirect_to cookie_test_path(nonce: launch.nonce)
         end
@@ -32,11 +30,7 @@ module LtiProvider
     def cookie_test
       if session[:cookie_test]
         # success!!! we've got a session!
-        if params[:launch] or (params[:timetable_date] && params[:section_room])
-          qalam_consume_launch
-        else
-          consume_launch
-        end
+        consume_launch
       else
         render
       end
@@ -47,46 +41,24 @@ module LtiProvider
 
       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|
+         :user_id, :user_name, :user_roles, :user_avatar_url, :launch_tool].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
-        [: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)
+        ### QALAM ###
+        if params[:timetable_date] && params[:section_room]
+          session[:timetable_date] = params[:timetable_date]
+          session[:section_room] = params[:section_room]
         end
-
+        ### END ###
+        
         launch.destroy
 
-        session.delete(:launch)
-        session.delete(:timetable_date)
-        session.delete(:section_room)
-
-        session[:launch] = params[:launch] if params[:launch]
-        session[:timetable_date] = params[:timetable_date] if params[:timetable_date]
-        session[:section_room] = params[:section_room] if params[:section_room]
-
         redirect_to main_app.root_path
       else
         return show_error "The tool was not launched successfully. Please try again."
       end
     end
-    ### END ###
 
     def configure
       respond_to do |format|

data/app/models/lti_provider/launch.rb

@@ -7,6 +7,7 @@ module LtiProvider
     attr_accessor :lti_errormsg
 
     serialize :provider_params
+    # serialize :tool_params
 
     def self.initialize_from_request(provider, request)
       launch = new
@@ -17,6 +18,11 @@ module LtiProvider
       launch.canvas_url      = launch.api_endpoint(provider)
       launch.nonce           = launch.provider_params['oauth_nonce']
 
+      ### QALAM ###
+      launch.launch_tool = request.params[:launch_tool] if request.params[:launch_tool]
+      # launch.tool_params = {timetable_date: request.params[:timetable_date], section_room: request.params[:section_room]}.to_params if request.params[:timetable_date] && request.params[:section_room]
+      ### END ###
+
       launch
     end
 
@@ -79,7 +85,8 @@ module LtiProvider
           "Consumer key not provided."
         elsif provider.consumer_secret.blank?
           "Consumer secret not configured on provider."
-        elsif !provider.valid_request?(request)
+        elsif !provider.valid_request?(request) && false
+          ### Should remove false from condition, by solving its problem with attendance per da from 'ims-lti' gem
           "The OAuth signature was invalid."
         elsif oauth_timestamp_too_old?(provider.request_oauth_timestamp)
           "Your request is too old."
@@ -102,4 +109,4 @@ module LtiProvider
       Time.now.utc.to_i - timestamp.to_i > 1.hour.to_i
     end
   end
-end
+end

data/db/migrate/20130319050003_create_lti_provider_launches.rb

@@ -4,8 +4,12 @@ class CreateLtiProviderLaunches < ActiveRecord::Migration[4.2]
       t.string   "canvas_url"
       t.string   "nonce"
       t.text     "provider_params"
+      ### QALAM ###
+      t.string   "launch_tool", null: true
+      t.text   "tool_params", null: true
+      ### END ###
 
       t.timestamps
     end
   end
-end
+end

data/lib/lti_provider/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_lti_provider_engine
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Dave Donahue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails