qalam_lti_provider_engine 2.0.1 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66602aec8f52d289ad48bfa0a262cedab1009769b1f6b481b53bcc7dcc4db5e4
-  data.tar.gz: b56291e0057f0379eb690f1eeb9ced57c6d10dbc409c5e0ebd1f3e03e6992c66
+  metadata.gz: b6ccfc573b45088fcf5f6f7a2baab432a14cd2dca48f112002571d38332d8a0c
+  data.tar.gz: e6bf0833f875d030751470feed9cb6b2c6370f62ce121ff7fe86cd8e2626a8aa
 SHA512:
-  metadata.gz: bf8c57dcec00e990c922726172ca55eb62089cecde2d9a3c32963e31a250be6378a715fd8b210bf8b629f1ce70db837770a8a569216dd28d955b1b8cf9f34893
-  data.tar.gz: e83b485d85dbb3f28186a7a6c806a4b36a5a37d389b2cb9e8fa430eea7a5cc37de44ca9c6c0f0c3ccb54565b3f1354bcc0ccd0876be8af6776ecab01e581bb1b
+  metadata.gz: c2e90003e78e5b64fe4ebd49c63de0e5fe115cde52a449e3bb3811065ca4c80f10fc121b094164befe58cf11dec3730214c831b1378b6578eaa32d766de5dbbb
+  data.tar.gz: ad8ccaf97941edabfabf5756c099c8d7cc57122ee5830adedf31377dd19fd7a0297c20bdaa644b596318afadb917ad4b7faf6af8652fe63eb69c44ba84943757

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/app/views/lti_provider/lti/cookie_test.html.erb

@@ -1,4 +1,4 @@
 <p>
   It appears your browser is blocking cookies.  You can try
-  <%= link_to "launching the tool in a new window", consume_launch_url(nonce: params[:nonce], url: params[:url]), target: '_blank' %>.
+  <%= link_to "launching the tool in a new window", consume_launch_url(nonce: params[:nonce]), target: '_blank' %>.
 </p>

data/config/lti_xml.yml.example

@@ -7,10 +7,29 @@ default: &default
   privacy_level: 'public' 
 
   # url defaults to lti_launch_url, but can be overridden in each of these
-  course_navigation:
+  account_navigation:
     text: 'Dummy'
     visibility: 'admins'
-  # account_navigation and user_navigation are also available with similar options
+    url: 'ssd'
+    enabled: true
+    default: 'enabled'
+    windowTarget: '_self'
+    custom_fields:
+      key1: 'value1'
+    labels:
+      en: 'Attendance'
+      ar: 'الحضور'
+  # course_navigation and user_navigation are also available with similar options
+
+  editor_button:
+    enabled: true
+    icon_url: ''
+    selection_width: ''
+    selection_height: ''
+    labels:
+      en: ''
+      ar: ''
+
 
 development:
   <<: *default

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/lti_application.rb

@@ -53,6 +53,28 @@ module LtiProvider
       session[:user_roles]
     end
 
+    ### QALAM ###
+    def launch_tool
+      session[:launch_tool]
+    end
+
+    def student_launch?
+      user_roles.split(',').include? 'urn:lti:role:ims/lis/Learner'
+    end
+
+    def teacher_launch?
+      user_roles.split(',').include? 'urn:lti:role:ims/lis/Instructor'
+    end
+
+    def account_admin_launch?
+      user_roles.split(',').include? 'urn:lti:instrole:ims/lis/Administrator'
+    end
+
+    def root_admin_launch?
+      user_roles.split(',').include? 'urn:lti:sysrole:ims/lis/SysAdmin'
+    end
+    ### END ###
+
     def not_acceptable
       render plain: "Unable to process request", status: 406
     end

data/lib/lti_provider/version.rb

@@ -1,3 +1,3 @@
 module LtiProvider
-  VERSION = "2.0.1"
+  VERSION = "2.0.5"
 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.5
 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-08-01 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