qalam_lti_provider_engine 1.1.6 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 966db98bfcaa29cbf05e8b3b38f270f50cc4ea27480a2245dd08804f09f502a8
-  data.tar.gz: 2d7be0649b8c6cf2b2e34bf41224de7e31896255e58969adf109c78f9f108add
+  metadata.gz: a12df9097c8a33e018107f6fe2446bbd1a655f72988f05037a4680dccb65fa43
+  data.tar.gz: 70b02c5a7360a0469d1ebfa874fc4cafe425beea44027607257db7278a82d11f
 SHA512:
-  metadata.gz: c52b467a447ca10b21669f601caf1e31bdbd9e2e00f6cd5f2f094d8424da8c706c93ca17d476797200cf46b3cd8da7cab66cfad9a0dd312a311e1d0147da213e
-  data.tar.gz: 5a2eb1b5611808ecc4a896c2e6e11a0e491ae3831fc6c74e0eb09bfd3aaa789c002c974be00d5f716beecc63f5cb00c143fdfd4041e6828081a6b458c0999cbe
+  metadata.gz: d0cadd596322889662e35483eed0d7ad2b8abf1d77d84e401775affdeeea6e34f7719d85efda57496e297466d22bc0db181c2e2e5364d6a59595be076e05dd99
+  data.tar.gz: a650191d9d1b696adaa4d3ad2a53f0a5d0912b3e61fa2eed1d53990f055b970072d30c6377c58ba2c211e38b3ce25927b9e7efeaa05fcc476c636793e1376dea

data/app/controllers/lti_provider/lti_controller.rb

@@ -8,13 +8,20 @@ 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 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, timetable_date: params[:timetable_date], section_room: params[:section_room])
+        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
@@ -32,24 +39,21 @@ module LtiProvider
     def 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|
+         :user_id, :user_name, :user_roles, :user_avatar_url, :launch_tool].each do |attribute|
           session[attribute] = launch.public_send(attribute)
         end
 
+        ### 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."
@@ -69,5 +73,4 @@ module LtiProvider
         render plain: message
       end
   end
-end
-
+end

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,8 +85,8 @@ module LtiProvider
           "Consumer key not provided."
         elsif provider.consumer_secret.blank?
           "Consumer secret not configured on provider."
-        ### QALAM ###
         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."
@@ -103,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

@@ -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
@@ -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 = "1.1.6"
+  VERSION = "2.0.4"
 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.4
 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-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,7 +32,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: ims-lti
   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.15
+rubygems_version: 3.2.21
 signing_key: 
 specification_version: 4
 summary: LtiProvider is a mountable engine for handling the LTI launch and exposing